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

Resolve "Warranty changes for sku" #1477

Open
korina.cordero wants to merge 2 commits from 562-warranty-changes-for-sku into master-fix
pull from: 562-warranty-changes-for-sku
merge into: rgutierrez:master-fix
Conversation 3 Commits 2 Files changed 20 +804 -93
korina.cordero commented 2021-05-18 08:53:50 +00:00 (Migrated from gitlab.com)
Copy link

Closes #562

Closes #562
korina.cordero commented 2021-05-18 10:06:10 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 4d1859af - Add warranty changes for empty sku, warranty creation logging, and warranty serial loading. #562

Compare with previous version

added 1 commit <ul><li>4d1859af - Add warranty changes for empty sku, warranty creation logging, and warranty serial loading. #562</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/666/diffs?diff_id=187185450&start_sha=3f2467f8f783ea31eb384e7bb90d0df5e39bab6d)
korina.cordero commented 2021-05-18 10:06:30 +00:00 (Migrated from gitlab.com)
Copy link

marked this merge request as ready

marked this merge request as **ready**
korina.cordero commented 2021-05-18 10:19:02 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 3488d5f9 - Add category name in response if sap battery is null. #562

Compare with previous version

added 1 commit <ul><li>3488d5f9 - Add category name in response if sap battery is null. #562</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/666/diffs?diff_id=187195074&start_sha=4d1859afa4574cd38af99a7ba80cfd641dd47710)
This pull request has changes conflicting with the target branch.
  • config/services.yaml
  • src/Command/GenerateWarrantyFromJobOrderCommand.php
  • src/Controller/APIController.php
  • src/Controller/CAPI/CustomerWarrantyController.php
  • src/Controller/CAPI/WarrantyController.php
  • src/Controller/WarrantyController.php
  • src/Ramcar/WarrantySource.php
  • src/Service/JobOrderHandler/ResqJobOrderHandler.php
  • src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
  • src/Service/WarrantyHandler.php
View command line instructions

Checkout

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

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 562-warranty-changes-for-sku
git checkout 562-warranty-changes-for-sku
git rebase master-fix
git checkout master-fix
git merge --ff-only 562-warranty-changes-for-sku
git checkout 562-warranty-changes-for-sku
git rebase master-fix
git checkout master-fix
git merge --no-ff 562-warranty-changes-for-sku
git checkout master-fix
git merge --squash 562-warranty-changes-for-sku
git checkout master-fix
git merge --ff-only 562-warranty-changes-for-sku
git checkout master-fix
git merge 562-warranty-changes-for-sku
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#1477
No description provided.
Delete branch "562-warranty-changes-for-sku"

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?