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

Resolve "Add new events to JO Details and JO Events Reports" #1542

Merged
korina.cordero merged 3 commits from 618-add-new-events-to-jo-details-and-jo-events-reports into master-fix 2021-08-24 09:56:35 +00:00
Conversation 7 Commits 3 Files changed 1 +219 -3
korina.cordero commented 2021-08-24 07:00:22 +00:00 (Migrated from gitlab.com)
Copy link

Closes #618

Closes #618
korina.cordero commented 2021-08-24 07:00:23 +00:00 (Migrated from gitlab.com)
Copy link

assigned to @korina.cordero

assigned to @korina.cordero
korina.cordero commented 2021-08-24 07:11:19 +00:00 (Migrated from gitlab.com)
Copy link

added 39 commits

Compare with previous version

added 39 commits <ul><li>973c56ae - Add new API calls. #612</li><li>072a2df5 - Fixes found during testing. #612</li><li>0a6985f6 - Merge branch &#39;master-fix&#39; of gitlab.com:jankstudio/resq into 612-rider-revamp</li><li>d78a5ebf - Add rider current job order field. #612</li><li>55c8c393 - Add routes for capi rider. #617</li><li>44606588 - Create rider api session entity. Add register for new rider controller. #617</li><li>722ec653 - Add login and logout. #617</li><li>604f3aa2 - Merge branch &#39;612-rider-revamp&#39; of gitlab.com:jankstudio/resq into 617-migrate-rider-api</li><li>fc7151be - Add getJobOrder. #617</li><li>b6f840f5 - Add acceptJobOrder. #617</li><li>1554f173 - Add delivery status to job order. #617</li><li>5ea4ac01 - Add cancelJobOrder. #617</li><li>bcd55901 - Add arrive and hubDepart. #617</li><li>7671b79d - Add preHubArrive and preHubDepart. #617</li><li>bbe0a804 - Add startJobOrder and payment. #617</li><li>bbee3c4b - Add available, postHubArrive, postHubDepart. #617</li><li>27c8cd1f - Add changeService, getPromos, getBatteries. #617</li><li>dd344665 - Fixes found during testing. #617</li><li>84ced62f - Modify login. #617</li><li>4f58f38f - Rename rider controller. #617</li><li>62c78939 - Modify rider api routes. #617</li><li>b5218a34 - Modify capi user checking. #617</li><li>973ba8ff - Add api user link in Rider entity and metadata field for API User #617</li><li>e7fb5014 - Fix new rider api login #617</li><li>5dee6d04 - Fix new rider api login data return #617</li><li>4a9de8e4 - Fix api role edit #617</li><li>7483c353 - Link api user to rider entity directly without need for metadata #617</li><li>c85ad3ab - Change rider api getRiderFromCAPI to get from direct association instead of metadata #617</li><li>ea2f0e63 - Add command to create api users from existing riders. #617</li><li>ff5e747d - Set rider&#39;s api user. #617</li><li>25954afe - Set api role for rider api user. #617</li><li>fc513a97 - Fix rider api user command to only create an api user for riders without it #617</li><li>d863158d - Add validation to login. #617</li><li>7cd8f2f0 - Renamed delivery status for consistency. #617</li><li>cf12d09e - Shift from using active jo to current jo for rider related stuff #617</li><li>b4337227 - Change mqtt channel for rider app #617</li><li>473ace4f - Separate setting of delivery status from calling cancel on JO when cancelling a JO. #617</li><li>7a57ce0f - Fix not sending of rider event. #617</li><li>940329de - Set rider&#39;s current job order and availability status when reassigning job order. #617</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/731/diffs?diff_id=234153377&start_sha=fafb5206bdec0fa2132cdfafff4cd84da590e25c)
korina.cordero commented 2021-08-24 07:38:30 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>db4345aa - Add new events to JO events report. #618</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/731/diffs?diff_id=234171364&start_sha=940329de2827ff85348ffdd5b41f4ea813e25d26)
korina.cordero commented 2021-08-24 08:59:02 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>6937ffdd - Add new events to JO details report. #618</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/731/diffs?diff_id=234240871&start_sha=db4345aa717831f9a08046bb0280a95e0f7201dc)
korina.cordero commented 2021-08-24 09:17:41 +00:00 (Migrated from gitlab.com)
Copy link

marked this merge request as ready

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

added 2 commits

  • e2710343 - 1 commit from branch master-fix
  • 55172332 - Merge branch 'master-fix' of gitlab.com:jankstudio/resq into...

Compare with previous version

added 2 commits <ul><li>e2710343 - 1 commit from branch <code>master-fix</code></li><li>55172332 - Merge branch &#39;master-fix&#39; of gitlab.com:jankstudio/resq into...</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/731/diffs?diff_id=234256015&start_sha=6937ffdd6abadd34cab1564e5205f4aca1137ad3)
jankstudio commented 2021-08-24 09:56:35 +00:00 (Migrated from gitlab.com)
Copy link

mentioned in commit 82a49aa7ca

mentioned in commit 82a49aa7ca26588338779b7b689d6d31b2fe1d28
jankstudio (Migrated from gitlab.com) merged commit 82a49aa7ca into master-fix 2021-08-24 09:56:35 +00:00
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#1542
No description provided.
Delete branch "618-add-new-events-to-jo-details-and-jo-events-reports"

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?