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

389 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kendrick Chan
6ea59d4882 Merge branch '44-change-mqtt-event-start_rating-to-fulfilled' into 'master' 
Resolve "Change MQTT event start_rating to fulfilled"

Closes #44

See merge request jankstudio/resq!41
 2018-03-08 02:07:03 +00:00
Kendrick Chan
d182c64b1f Rename start_rating MQTT event to fulfilled 2018-03-08 10:04:31 +08:00
Kendrick Chan
b3136c971a Merge branch '43-fix-invoice-computation-bug' into 'master' 
Resolve "Fix invoice computation bug"

Closes #43

See merge request jankstudio/resq!40
 2018-03-07 19:14:17 +00:00
Kendrick Chan
4120677cb0 Add service type to invoice criteria calls #43 2018-03-08 03:13:27 +08:00
Kendrick Chan
31f57d1b83 Merge branch '41-fix-500-error-for-api-get-rider' into 'master' 
Resolve "Fix 500 error for api get rider"

Closes #41

See merge request jankstudio/resq!39
 2018-03-07 18:10:52 +00:00
Kendrick Chan
f5c7d17d2f Add MQTT event sending #41 2018-03-08 02:09:58 +08:00
Kendrick Chan
002b82fb5e Merge branch '41-fix-500-error-for-api-get-rider' into 'master' 
Resolve "Fix 500 error for api get rider"

Closes #41

See merge request jankstudio/resq!38
 2018-03-07 14:12:39 +00:00
Kendrick Chan
7ef92bad99 Change getOutlet to getHub for get rider call #41 2018-03-07 22:11:55 +08:00
Kendrick Chan
0147d8a004 Merge branch '40-rider-edit-bug' into 'master' 
Resolve "Rider edit bug"

Closes #40

See merge request jankstudio/resq!37
 2018-03-07 14:08:05 +00:00
Kendrick Chan
4811d7d1cf Fix edit rider by initializing has_schedule #40 2018-03-07 22:07:12 +08:00
Kendrick Chan
12755502a7 Merge branch '39-rider-add-bug' into 'master' 
Resolve "Rider add bug"

Closes #39

See merge request jankstudio/resq!36
 2018-03-07 13:47:10 +00:00
Kendrick Chan
e987f22fa6 Initialize array for rider schedule #39 2018-03-07 21:46:17 +08:00
Kendrick Chan
bc9bd729f9 Merge branch '38-api-register-bug-title-required' into 'master' 
Resolve "API register bug, title required"

Closes #38

See merge request jankstudio/resq!35
 2018-03-07 13:31:20 +00:00
Kendrick Chan
ec0e7c1654 Add default value for customer title #38 2018-03-07 21:29:22 +08:00
Ramon Gutierrez
848e038360 Merge branch '34-jo-cancel-needs-prompt-for-reason' into 'master' 
Resolve "JO Cancel needs prompt for 'reason'"

Closes #34

See merge request jankstudio/resq!34
 2018-03-01 19:28:44 +00:00
Ramon Gutierrez
03f6b40ed3 Add mandatory cancellation reason to prompt #34 2018-03-02 03:26:47 +08:00
Kendrick Chan
38a1fad607 Merge branch '33-bulk-fixes-for-uat-handover' into 'master' 
Resolve "Bulk fixes for UAT handover"

Closes #33

See merge request jankstudio/resq!33
 2018-02-28 23:53:24 +00:00
Kendrick Chan
eabee25db9 Fix job order related bugs #33 2018-03-01 07:39:17 +08:00
Kendrick Chan
36e4219f99 Add support for mode of payment dropdown #33 2018-03-01 07:28:59 +08:00
Kendrick Chan
4093dc65ce Add time to transaction date #33 2018-03-01 07:09:31 +08:00
Kendrick Chan
f779c50b8e Add user fields to job order form #33 2018-03-01 07:02:17 +08:00
Kendrick Chan
c36b0d5f43 Comment out Recompute button in job order #33 2018-03-01 04:16:39 +08:00
Kendrick Chan
ad04131515 Add Tier 1 and Tier 2 notes #33 2018-03-01 04:15:44 +08:00
Kendrick Chan
d942299be1 Change customer active flag to default to true #33 2018-03-01 04:06:52 +08:00
Kendrick Chan
6011902239 Display plate number in job order form #33 2018-03-01 04:04:03 +08:00
Kendrick Chan
6997eba162 Replace Jumpstart / Troubleshoot label in service type with General Service #33 2018-03-01 03:56:31 +08:00
Kendrick Chan
4e5780e7cf Add customer add button in job order #33 2018-03-01 03:50:14 +08:00
Kendrick Chan
de722414df Merge branch '32-fix-ticket-bug' into 'master' 
Resolve "Fix ticket bug"

Closes #32

See merge request jankstudio/resq!32
 2018-02-28 18:40:26 +00:00
Kendrick Chan
fbdcd6f31f Initialize job_order to null if not found #32 2018-03-01 02:39:18 +08:00
Kendrick Chan
5cb38e8907 Use getName static method for NameValue values #32 2018-03-01 02:34:51 +08:00
Kendrick Chan
6d78c37435 Merge branch '29-handle-under-warranty-with-invoice-generator' into 'master' 
Resolve "Handle under warranty with invoice generator"

Closes #29

See merge request jankstudio/resq!31
 2018-02-27 17:43:43 +00:00
Kendrick Chan
1dd51a8dd3 Add support for invoice generation for under warranty #29 2018-02-28 01:42:09 +08:00
Ramon Gutierrez
d3f01a1303 Merge branch '31-change-timeline-date-format-to-12-hour' into 'master' 
Resolve "Change timeline date format to 12-hour"

Closes #31

See merge request jankstudio/resq!30
 2018-02-27 15:46:46 +00:00
Ramon Gutierrez
cb7fffe49f Change timeline date format to 12-hour #31 2018-02-27 23:46:08 +08:00
Ramon Gutierrez
8974a68260 Merge branch '30-add-acl-checking-on-job-order-list-views' into 'master' 
Resolve "Add ACL checking on Job Order list views"

Closes #30

See merge request jankstudio/resq!29
 2018-02-27 15:44:27 +00:00
Ramon Gutierrez
9cef8b4246 Fix acl checking on unlock buttons #30 2018-02-27 23:42:54 +08:00
Ramon Gutierrez
6262f933bc Add missing acl checks on list methods #30 2018-02-27 23:42:44 +08:00
Ramon Gutierrez
0b193947c5 Merge branch '26-job-order-view-all' into 'master' 
Resolve "Job order view all"

Closes #26

See merge request jankstudio/resq!28
 2018-02-27 15:32:31 +00:00
Ramon Gutierrez
ab116d35ce Add view all job orders tier #26 2018-02-27 23:31:02 +08:00
Kendrick Chan
13adca3721 Add service type to invoice criteria #29 2018-02-27 12:17:29 +08:00
Ramon Gutierrez
2de5344288 Merge branch '28-missing-unlock-route-for-open-tier-job-order-list' into 'master' 
Resolve "Missing unlock route for open tier job order list"

Closes #28

See merge request jankstudio/resq!27
 2018-02-26 22:44:33 +00:00
Ramon Gutierrez
6c85108393 Add missing unlock_route tier param to open job order views #28 2018-02-27 06:43:47 +08:00
Ramon Gutierrez
034153ff72 Merge branch '13-job-order-reassignment' 2018-02-27 06:37:34 +08:00
Ramon Gutierrez
ea4906d207 Merge branch 'master' into '13-job-order-reassignment' 
# Conflicts:
#   src/Controller/JobOrderController.php
 2018-02-26 22:36:18 +00:00
Ramon Gutierrez
c3199d80c4 Add job order cancel functionality #13 2018-02-27 06:32:15 +08:00
Kendrick Chan
c0dda9b2e4 Merge branch '14-job-order-unlock' into 'master' 
Resolve "Job order unlock"

Closes #14

See merge request jankstudio/resq!26
 2018-02-26 22:31:13 +00:00
Kendrick Chan
dddfbef619 Fix fulfillment table bug #14 2018-02-27 06:28:31 +08:00
Kendrick Chan
befe05a307 Merge branch '14-job-order-unlock' into 'master' 
Resolve "Job order unlock"

Closes #14

See merge request jankstudio/resq!25
 2018-02-26 22:23:09 +00:00
Kendrick Chan
6cd6fccb8c Add unlock processor and assignor feature for job order #14 2018-02-27 06:21:43 +08:00
Ramon Gutierrez
d0d8bb07e0 Add open role to job order #13 2018-02-27 05:53:55 +08:00