rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions
2214 commits 749 branches 8 tags 145 MiB
Commit graph

2214 commits

This branch
This branch
All branches
Author SHA1 Message Date
Korina Cordero
b212fa99bc Recommit warranty computation changes. #512 2020-10-02 03:15:07 +00:00
Kendrick Chan
f9f3ac6099 Merge branch '512-cmb-warranty-expiration-computation' into '488-cmb-live' 
Add WarrantyHandler directory. #512

See merge request jankstudio/resq!598
 2020-10-02 02:23:02 +00:00
Korina Cordero
0660e67ec2 Add WarrantyHandler directory. #512 2020-10-02 02:22:00 +00:00
Kendrick Chan
e53bb8f69b Revert "Merge branch '512-cmb-warranty-expiration-computation' into '488-cmb-live'" 
This reverts merge request !594
 2020-10-01 15:09:43 +00:00
Kendrick Chan
6106b01964 Merge branch '514-cmb-refactor-realtime-map' into '488-cmb-live' 
Initialize rider availability in dashboard map #514

See merge request jankstudio/resq!597
 2020-10-01 14:33:11 +00:00
Kendrick Chan
3d96299c23 Initialize rider availability in dashboard map #514 2020-10-01 22:31:48 +08:00
Kendrick Chan
adadb611b8 Merge branch '514-cmb-refactor-realtime-map' into '488-cmb-live' 
Change mqtt session to persistent #514

See merge request jankstudio/resq!596
 2020-10-01 14:11:54 +00:00
Kendrick Chan
00091ccc57 Change mqtt session to persistent #514 2020-10-01 21:56:27 +08:00
Kendrick Chan
d2d371ccf7 Merge branch '512-cmb-warranty-expiration-computation' into '488-cmb-live' 
Resolve "CMB - warranty expiration computation"

See merge request jankstudio/resq!594
 2020-10-01 08:19:16 +00:00
Korina Cordero
d3bcc1176c Fix warranty computation. #512 2020-10-01 06:32:05 +00:00
Kendrick Chan
792fc73d90 Merge branch '509-cmb-jo-form-for-rider-assignment' into '488-cmb-live' 
Resolve "CMB - JO form for rider assignment"

See merge request jankstudio/resq!593
 2020-10-01 01:26:33 +00:00
Korina Cordero
4e2757ac56 Disable the advance order checkbox. #509 2020-09-30 08:16:47 +00:00
Korina Cordero
931a212005 Add assign advance order screens. #509 2020-09-30 08:13:23 +00:00
Korina Cordero
c4bf772f70 Add assign advance order to acl, menu, and route. #509 2020-09-29 10:57:07 +00:00
Korina Cordero
55ac665938 Add edit advance JO. #509 2020-09-29 07:55:35 +00:00
Korina Cordero
a030ec6679 Add routes and templates for advance order. #509 2020-09-29 04:27:11 +00:00
Korina Cordero
18a2be4aa9 Merge branch '508-cmb-remove-tier-2-notes-from-form' into '488-cmb-live' 
Resolve "CMB - remove tier 2 notes from form"

See merge request jankstudio/resq!590
 2020-09-28 04:05:54 +00:00
Korina Cordero
59c71d2638 Removed Tier 1 and Tier 2 Notes from walkin and onestep forms. #508 2020-09-28 04:01:14 +00:00
Korina Cordero
7dc1eb2a5c Merge branch '506-cmb-remove-fax-number' into '488-cmb-live' 
Resolve "CMB - remove fax number"

See merge request jankstudio/resq!589
 2020-09-28 03:39:25 +00:00
Korina Cordero
2b42eb08a4 Remove fax number from onestep and walkin forms. #506 2020-09-28 03:32:12 +00:00
Korina Cordero
dc2252f3e1 Merge branch '505-cmb-label-changes-for-carfix-details-and-landline' into '488-cmb-live' 
Change labels for landline ad CarFix Details. #505

See merge request jankstudio/resq!588
 2020-09-28 02:42:46 +00:00
Korina Cordero
b7291e94b1 Change labels for landline ad CarFix Details. #505 2020-09-25 03:16:33 +00:00
Kendrick Chan
1986423230 Merge branch '501-cmb-jo-in-view-open-should-disappear-only-when-completed' into '488-cmb-live' 
JO stays in View Open list until JO has status of completed. #501

See merge request jankstudio/resq!587
 2020-09-18 07:41:10 +00:00
Korina Cordero
7e637bdfc0 JO stays in View Open list until JO has status of completed. #501 2020-09-18 07:16:15 +00:00
Kendrick Chan
e0f41c57c1 Merge branch '498-cmb-rearrange-columns' into '488-cmb-live' 
Add JO ID and status to header to JO form. #498

See merge request jankstudio/resq!586
 2020-09-18 06:41:59 +00:00
Kendrick Chan
9606e9aa1c Merge branch '500-cmb-add-debit-card-to-mode-of-payment' into '488-cmb-live' 
Add debit card to the mode of payment. #500

See merge request jankstudio/resq!585
 2020-09-18 06:41:52 +00:00
Kendrick Chan
075db2312d Merge branch '499-cmb-customer-info-disappears-if-jo-is-advance-order' into '488-cmb-live' 
Remove obj.isAdvanceOrder from the New Customer toggle. #499

See merge request jankstudio/resq!584
 2020-09-18 06:41:39 +00:00
Korina Cordero
a863a5e34b Add JO ID and status to header to JO form. #498 2020-09-18 06:40:15 +00:00
Korina Cordero
86519d79c5 Add debit card to the mode of payment. #500 2020-09-18 06:29:37 +00:00
Korina Cordero
566c5added Remove obj.isAdvanceOrder from the New Customer toggle. #499 2020-09-18 06:24:18 +00:00
Kendrick Chan
012c486602 Merge branch '497-cmb-display-cancellation-reason-in-jo' into '488-cmb-live' 
Add cancellation reason to JO form. #497

See merge request jankstudio/resq!581
 2020-09-17 09:25:22 +00:00
Kendrick Chan
5ef05b3770 Merge branch '498-cmb-rearrange-columns' into '488-cmb-live' 
Fix edit icon for open and behind schedule. #498

See merge request jankstudio/resq!583
 2020-09-17 08:19:06 +00:00
Korina Cordero
25c399eeb2 Revert back to btn-reassign-hub. #498 2020-09-17 08:14:53 +00:00
Korina Cordero
d286ace684 Fix edit icon for open and behind schedule. #498 2020-09-17 08:02:27 +00:00
Kendrick Chan
094ccbe163 Merge branch '498-cmb-rearrange-columns' into '488-cmb-live' 
Rearranged the columns for the View pages. #498

See merge request jankstudio/resq!582
 2020-09-17 07:38:51 +00:00
Korina Cordero
6dd3068e70 Rearranged the columns for the View pages. #498 2020-09-17 07:37:22 +00:00
Korina Cordero
6f5246d3e0 Add cancellation reason to JO form. #497 2020-09-17 07:04:03 +00:00
Kendrick Chan
8068a662f6 Check active jo before removing it for rider #488 2020-09-16 22:22:26 +08:00
Kendrick Chan
331d483606 Send the mqtt event for cancel directly #488 2020-09-16 21:31:07 +08:00
Kendrick Chan
7152b0f610 Add message to cancel mqtt event #488 2020-09-16 21:15:08 +08:00
Kendrick Chan
1e23764452 Initialize jo_data as null in RAPI call #488 2020-09-16 20:23:36 +08:00
Kendrick Chan
2c4167a093 Set job_order field to null if no ongoing in RAPI call #488 2020-09-16 20:18:07 +08:00
Kendrick Chan
97d8b9e147 Merge branch '495-cmb-rider-cannot-start-second-jo-after-completion-of-first-jo' into '488-cmb-live' 
Resolve "CMB - rider cannot start second JO after completion of first JO"

See merge request jankstudio/resq!580
 2020-09-16 08:38:20 +00:00
Kendrick Chan
928d5412e5 Merge branch '496-cmb-clear-rider-s-active-jo-when-jo-is-cancelled' into '488-cmb-live' 
Clear rider's active job order when JO is cancelled via rider app and admin panel. #496

See merge request jankstudio/resq!579
 2020-09-16 08:38:05 +00:00
Korina Cordero
8bcd9b9546 Merge branch '496-cmb-clear-rider-s-active-jo-when-jo-is-cancelled' of gitlab.com:jankstudio/resq into 495-cmb-rider-cannot-start-second-jo-after-completion-of-first-jo 2020-09-16 08:08:12 +00:00
Korina Cordero
2b07a89544 Make explicit setting of active JO to null. #496 2020-09-16 08:07:10 +00:00
Korina Cordero
9ad9de61c7 Set rider's active job order to null after JO completion. #495 2020-09-16 08:05:05 +00:00
Korina Cordero
dbb05b16d9 Clear rider's active job order when JO is cancelled via rider app and admin panel. #496 2020-09-16 07:50:45 +00:00
Kendrick Chan
5661bb4daf Merge branch '490-cmb-add-labels-to-jo-pictures-and-should-be-able-to-click-on-pictures' into '488-cmb-live' 
Fix labels for Odometer Reading and Proof of Payment. #490

See merge request jankstudio/resq!578
 2020-09-16 06:15:06 +00:00
Korina Cordero
32f2b21dbf Fix labels for Odometer Reading and Proof of Payment. #490 2020-09-16 06:13:43 +00:00