rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Warranty MR" #1478

Open
korina.cordero wants to merge 77 commits from 563-warranty-mr into master-fix
pull from: 563-warranty-mr
merge into: rgutierrez:master-fix
Conversation 2 Commits 77 Files changed 58 +6787 -1463
korina.cordero commented 2021-05-19 02:45:45 +00:00 (Migrated from gitlab.com)
Copy link

Closes #563

Closes #563
korina.cordero commented 2021-05-19 02:52:50 +00:00 (Migrated from gitlab.com)
Copy link

added 77 commits

  • 09d04a8a - Add hub criteria object. #543
  • 4efef6d3 - Add HubSelector service. #543
  • 156742ea - Add functions for the queries in HubSelector. #543
  • 9a6ca7ae - Add inventory manager service to HubSelector. #543
  • d812e347 - Fix compilation error. #543
  • de742906 - Rename inventory flag. Fix find function. #543
  • 498c88ce - Add jo type, date, and inventory filters. #543
  • 0f245e90 - Fixes to issues found during testing. #543
  • 1abaad17 - Add HubDistributor service. #543
  • 01153288 - Add arranging of hubs, based on job orders assigned to hub. #543
  • 50e15cd7 - Update hub_jo_count when hub is assigned or reassigned via admin panel. #543
  • c69a18d8 - Add command to reset hub jo count in redis. #543
  • 0ecc55cf - Have admin panel use the HubSelector service when getting closest hubs. #543
  • 2db7c679 - Add entity for logging of filtered hubs. #543
  • 4966e7e0 - Add logging for filtered hubs. #543
  • a5aef93c - Add logging of hub if hub has no available rider. #543
  • 789d376d - Merge branch 'master' of gitlab.com:jankstudio/resq into 543-autoassign-revisions
  • 6bc24c47 - Remove checking for jo type in newRequestJobOrder. #543
  • 60a4d0bb - Add script to get the warranty file from storage. #549
  • 699c135f - Add script to get file from motiv. #549
  • 9e1d8554 - Fix load serials script to save everything. #549
  • 00c65d1e - Add checking for empty sku. #551
  • c97755cc - Allow setting of battery information to null. #551
  • a13c3649 - Fix issues found during testing of warranty creation. #551
  • f7983e4c - Add hub round robin to requestJobOrder. #543
  • 17f80019 - Merge branch 'master' of gitlab.com:jankstudio/resq into 543-autoassign-revisions
  • f24f3e2b - Add notification number to hub. #552
  • 3a5d57e3 - Merge branch '543-autoassign-revisions' of gitlab.com:jankstudio/resq into...
  • 3c907067 - Add sending of SMS to hub if hub gets filtered out for no stock. #553
  • 01cdd7ef - Add checking for mobile number. #553
  • 12798e00 - Add payment methods to hub entity and form. #554
  • 0717df5f - Add saving of payment methods for hub. Fix issues found with notification number. #554
  • 63b98903 - Add payment method filter. #554
  • 140ea8c7 - Add emergency filter. #554
  • 4337864c - Add filter for rider availability. #554
  • 50f58960 - Removing logging of no rider out of controller and into service. #554
  • 09614a12 - Merge branch '554-additional-hub-filters' into 'master'
  • 24806d8b - Merge branch '551-check-for-null-sku-for-warranty' of...
  • 18b04174 - Add logging for creation of warranty. #555
  • 22047911 - Add logging for register. #555
  • 726ace32 - Add monolog to composer #556
  • 5432355e - Merge branch '556-enable-logging-via-monolog' into 'master'
  • d6357b32 - Fix send sms bug causing 500 error #556
  • 22cd4c13 - Merge branch '556-enable-logging-via-monolog' into 'master'
  • c6a0b96c - Add action field to WarrantyAPILog. #555
  • 42c2b526 - Merge branch 'master' of gitlab.com:jankstudio/resq into 555-log-warranty-data-sent-via-api
  • 7ec5ba43 - Add source to WarrantyAPILog. #555
  • d2cae08f - Add logging for warranty creation in mobile API. #555
  • c1d54ec6 - Add logging when warranty is created via admin panel. #555
  • e2356679 - Add logging for warranty creation for rider API and JO fulfillment. #555
  • c0a877e3 - Add logging when creating warranty from command. #555
  • 5c825ed9 - Merge branch 'master' of gitlab.com:jankstudio/resq into 551-check-for-null-sku-for-warranty
  • 87a9ec72 - Composer update. #551
  • b2e23e8e - Changed filename format for the file to retrieve. #551
  • f9654025 - Added logging if blob download encounters errors. Add bulk download script. #551
  • 0713bd94 - Merge branch '551-check-for-null-sku-for-warranty' into 'master'
  • 63bc3a1a - Merge branch 'master' of gitlab.com:jankstudio/resq into 555-log-warranty-data-sent-via-api
  • 5d5ccb66 - Merge branch '555-log-warranty-data-sent-via-api' into 'master'
  • 59f29b22 - Add entities for the customer tag and promo log. #558
  • 601b23af - Add CRUD for customer tag. #558
  • 6ac92eba - Add customer tags to customer form. #558
  • bbc06479 - Add tag details. #558
  • c41c8247 - Add the customer tag to JO form. #558
  • f1c45af2 - Add computation for customer tags in invoice. #558
  • 23ca110a - Fix the saving of warranty data. #555
  • df053166 - Add logging when one time discount has been availed. Add removal of promo from...
  • 03360a2a - Add logging when one time discount has been availed for mobile. Add removal of...
  • 441553f9 - Merge branch '555-log-warranty-data-sent-via-api' into 'master'
  • d99bfedb - Add promo logger service. #558
  • 02bf16e7 - Add checking if invoice has items before getting customer tags. #558
  • 273cd0bd - Merge branch '558-add-entities-and-ui-for-one-time-promo' into 'master'
  • d02f0f7d - Add checking for sku. #551
  • 2f918c49 - Merge branch '551-check-for-null-sku-for-warranty' into 'master'
  • c2be8296 - Fix edit link for JO. #559
  • 292aae5f - Merge branch '559-wrong-link-to-edit-jo-form-in-dashboard-popup' into 'master'
  • 317fd0fd - Display category name if sku is null. #560
  • 26293e42 - Merge branch '560-display-category-name-if-sku-is-null-in-mobile' into 'master'

Compare with previous version

added 77 commits <ul><li>09d04a8a - Add hub criteria object. #543</li><li>4efef6d3 - Add HubSelector service. #543</li><li>156742ea - Add functions for the queries in HubSelector. #543</li><li>9a6ca7ae - Add inventory manager service to HubSelector. #543</li><li>d812e347 - Fix compilation error. #543</li><li>de742906 - Rename inventory flag. Fix find function. #543</li><li>498c88ce - Add jo type, date, and inventory filters. #543</li><li>0f245e90 - Fixes to issues found during testing. #543</li><li>1abaad17 - Add HubDistributor service. #543</li><li>01153288 - Add arranging of hubs, based on job orders assigned to hub. #543</li><li>50e15cd7 - Update hub_jo_count when hub is assigned or reassigned via admin panel. #543</li><li>c69a18d8 - Add command to reset hub jo count in redis. #543</li><li>0ecc55cf - Have admin panel use the HubSelector service when getting closest hubs. #543</li><li>2db7c679 - Add entity for logging of filtered hubs. #543</li><li>4966e7e0 - Add logging for filtered hubs. #543</li><li>a5aef93c - Add logging of hub if hub has no available rider. #543</li><li>789d376d - Merge branch &#39;master&#39; of gitlab.com:jankstudio/resq into 543-autoassign-revisions</li><li>6bc24c47 - Remove checking for jo type in newRequestJobOrder. #543</li><li>60a4d0bb - Add script to get the warranty file from storage. #549</li><li>699c135f - Add script to get file from motiv. #549</li><li>9e1d8554 - Fix load serials script to save everything. #549</li><li>00c65d1e - Add checking for empty sku. #551</li><li>c97755cc - Allow setting of battery information to null. #551</li><li>a13c3649 - Fix issues found during testing of warranty creation. #551</li><li>f7983e4c - Add hub round robin to requestJobOrder. #543</li><li>17f80019 - Merge branch &#39;master&#39; of gitlab.com:jankstudio/resq into 543-autoassign-revisions</li><li>f24f3e2b - Add notification number to hub. #552</li><li>3a5d57e3 - Merge branch &#39;543-autoassign-revisions&#39; of gitlab.com:jankstudio/resq into...</li><li>3c907067 - Add sending of SMS to hub if hub gets filtered out for no stock. #553</li><li>01cdd7ef - Add checking for mobile number. #553</li><li>12798e00 - Add payment methods to hub entity and form. #554</li><li>0717df5f - Add saving of payment methods for hub. Fix issues found with notification number. #554</li><li>63b98903 - Add payment method filter. #554</li><li>140ea8c7 - Add emergency filter. #554</li><li>4337864c - Add filter for rider availability. #554</li><li>50f58960 - Removing logging of no rider out of controller and into service. #554</li><li>09614a12 - Merge branch &#39;554-additional-hub-filters&#39; into &#39;master&#39;</li><li>24806d8b - Merge branch &#39;551-check-for-null-sku-for-warranty&#39; of...</li><li>18b04174 - Add logging for creation of warranty. #555</li><li>22047911 - Add logging for register. #555</li><li>726ace32 - Add monolog to composer #556</li><li>5432355e - Merge branch &#39;556-enable-logging-via-monolog&#39; into &#39;master&#39;</li><li>d6357b32 - Fix send sms bug causing 500 error #556</li><li>22cd4c13 - Merge branch &#39;556-enable-logging-via-monolog&#39; into &#39;master&#39;</li><li>c6a0b96c - Add action field to WarrantyAPILog. #555</li><li>42c2b526 - Merge branch &#39;master&#39; of gitlab.com:jankstudio/resq into 555-log-warranty-data-sent-via-api</li><li>7ec5ba43 - Add source to WarrantyAPILog. #555</li><li>d2cae08f - Add logging for warranty creation in mobile API. #555</li><li>c1d54ec6 - Add logging when warranty is created via admin panel. #555</li><li>e2356679 - Add logging for warranty creation for rider API and JO fulfillment. #555</li><li>c0a877e3 - Add logging when creating warranty from command. #555</li><li>5c825ed9 - Merge branch &#39;master&#39; of gitlab.com:jankstudio/resq into 551-check-for-null-sku-for-warranty</li><li>87a9ec72 - Composer update. #551</li><li>b2e23e8e - Changed filename format for the file to retrieve. #551</li><li>f9654025 - Added logging if blob download encounters errors. Add bulk download script. #551</li><li>0713bd94 - Merge branch &#39;551-check-for-null-sku-for-warranty&#39; into &#39;master&#39;</li><li>63bc3a1a - Merge branch &#39;master&#39; of gitlab.com:jankstudio/resq into 555-log-warranty-data-sent-via-api</li><li>5d5ccb66 - Merge branch &#39;555-log-warranty-data-sent-via-api&#39; into &#39;master&#39;</li><li>59f29b22 - Add entities for the customer tag and promo log. #558</li><li>601b23af - Add CRUD for customer tag. #558</li><li>6ac92eba - Add customer tags to customer form. #558</li><li>bbc06479 - Add tag details. #558</li><li>c41c8247 - Add the customer tag to JO form. #558</li><li>f1c45af2 - Add computation for customer tags in invoice. #558</li><li>23ca110a - Fix the saving of warranty data. #555</li><li>df053166 - Add logging when one time discount has been availed. Add removal of promo from...</li><li>03360a2a - Add logging when one time discount has been availed for mobile. Add removal of...</li><li>441553f9 - Merge branch &#39;555-log-warranty-data-sent-via-api&#39; into &#39;master&#39;</li><li>d99bfedb - Add promo logger service. #558</li><li>02bf16e7 - Add checking if invoice has items before getting customer tags. #558</li><li>273cd0bd - Merge branch &#39;558-add-entities-and-ui-for-one-time-promo&#39; into &#39;master&#39;</li><li>d02f0f7d - Add checking for sku. #551</li><li>2f918c49 - Merge branch &#39;551-check-for-null-sku-for-warranty&#39; into &#39;master&#39;</li><li>c2be8296 - Fix edit link for JO. #559</li><li>292aae5f - Merge branch &#39;559-wrong-link-to-edit-jo-form-in-dashboard-popup&#39; into &#39;master&#39;</li><li>317fd0fd - Display category name if sku is null. #560</li><li>26293e42 - Merge branch &#39;560-display-category-name-if-sku-is-null-in-mobile&#39; into &#39;master&#39;</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/667/diffs?diff_id=187681969&start_sha=3f2467f8f783ea31eb384e7bb90d0df5e39bab6d)
korina.cordero commented 2021-05-19 02:53:05 +00:00 (Migrated from gitlab.com)
Copy link

marked this merge request as ready

marked this merge request as **ready**
This pull request has changes conflicting with the target branch.
  • composer.json
  • composer.lock
  • config/acl.yaml
  • config/packages/prod/monolog.yaml
  • config/packages/test/monolog.yaml
  • config/routes/customer_tag.yaml
  • config/services.yaml
  • src/Command/GenerateWarrantyFromJobOrderCommand.php
  • src/Command/ResetHubJoCountCommand.php
  • src/Controller/APIController.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 563-warranty-mr:563-warranty-mr
git checkout 563-warranty-mr

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master-fix
git merge --no-ff 563-warranty-mr
git checkout 563-warranty-mr
git rebase master-fix
git checkout master-fix
git merge --ff-only 563-warranty-mr
git checkout 563-warranty-mr
git rebase master-fix
git checkout master-fix
git merge --no-ff 563-warranty-mr
git checkout master-fix
git merge --squash 563-warranty-mr
git checkout master-fix
git merge --ff-only 563-warranty-mr
git checkout master-fix
git merge 563-warranty-mr
git push origin master-fix
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API

   
AU

Marshall Battery Feature

  
Bug

Bug

  
CRM Enhancements

   
Mobile API

   
Nice to have

   
Phase 2

Local Phase 2

No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: rgutierrez/resq#1478
No description provided.
Delete branch "563-warranty-mr"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?