Commit graph

924 commits

Author SHA1 Message Date
63dd85da17 Change rejection report user created by to rejection user #191 2019-03-04 01:51:20 +08:00
d791374b29 Separate and create detailed rejection report #190 2019-03-01 22:43:59 +08:00
71ed134e78 Output csv for rejection report #184 2019-02-26 03:07:56 +08:00
924c00c41f Fix date start and end filtering for rejection report #184 2019-02-24 02:29:50 +08:00
2c8f626aa6 Load data for rejection report in json format #184 2019-02-24 02:09:38 +08:00
Ramon Gutierrez
8b6066bb38 Update template path for rejection report form #184 2019-02-24 00:49:48 +08:00
f59476c2d3 Add routes, acl and template changes for rejection report #184 2019-02-23 23:31:46 +08:00
Ramon Gutierrez
623c80421a Add route and processing for hub rejections #183 2019-02-12 00:14:15 +08:00
e2ccf1bbc1 Add functionality to save facilitated by fields #181 2019-02-10 20:48:46 +08:00
7ae9fe4e2d Add facilitated by dropdowns for job order form #181 2019-02-09 21:44:35 +08:00
f0d94e034f Add first_name, last_name, and mobile_number fields to warranty #177 2019-01-30 22:12:36 +08:00
1bd5c30875 Fix assign rider so cancelled job orders cannot be assigned #175 2019-01-28 03:16:50 +08:00
4b24454549 Fix dispatch, so cancelled job orders cannot be assigned to a hub #175 2019-01-28 02:44:05 +08:00
dbc161d9c9 Fix warranty claim api bug #173 2019-01-22 22:54:04 +08:00
2f30d0c7c3 Update warranty api controller to handle sku instead of model / size for batteries #172 2019-01-21 02:09:16 +08:00
85121a973d Update battery api controller, routes and test scripts #172 2019-01-20 17:51:34 +08:00
296dedd732 Remove debug error logs #171 2019-01-19 23:45:34 +08:00
bc9cf2a74f Modify claim warranty api call #171 2019-01-10 02:26:42 +08:00
e4cedd9e4d Add get all warranties api call #171 2019-01-10 00:02:24 +08:00
4c9dba09ba Fix resend confirmation code issue #169 2018-11-13 04:23:17 +08:00
fac78e558d Add plate number warranty API call #166 2018-11-06 01:55:51 +08:00
6771b86d6c Change APIController to abstract class from interface #166 2018-11-06 01:30:52 +08:00
d78e30c9c2 Add battery model and size to warranty and change warranty routes #166 2018-11-06 01:14:19 +08:00
4867f1b6bb Finish warranty api calls #164 2018-10-26 00:58:32 +08:00
9fcae0f05b Add vehicle and battery apis #164 2018-10-25 13:35:27 +08:00
959d2c6efc Add warranty entity, refactor controller, and fix bugs #164 2018-10-24 22:20:45 +08:00
0d41b46ee9 Refactor api bundle to use security to handle authentication #164 2018-10-23 02:11:21 +08:00
2b9499861b Add catalyst api bundle and test controller #164 2018-10-15 01:19:29 +08:00
77d6d146c0 Add CSAT field to form and entity #163 2018-10-03 01:08:08 +08:00
b2d680ae64 Support test phone number for iphone / android testing #162 2018-09-28 09:46:52 +08:00
bad555fbd1 Change closest hub display limit to 50 #162 2018-09-23 15:08:59 +08:00
49977c1501 Merge branch '162-phase-2-changes' into 'master'
Set closest hubs limit to 30 #162

Closes #162

See merge request jankstudio/resq!188
2018-09-12 23:32:32 +00:00
9d5f880a14 Set closest hubs limit to 30 #162 2018-09-13 07:29:39 +08:00
root
4464edc803 Support new rider app has_motolite and flag_coolant format 2018-09-10 00:08:38 +08:00
root
d84a156a02 Add support for has_motolite and flag_coolant in change service rider api call 2018-09-08 19:28:15 +08:00
3ad32605fe Add support for coolant and non-coolant overheat service #162 2018-09-07 03:27:56 +08:00
1c53556713 Highlight mobile app sourced job orders in dispatch table #162 2018-09-03 15:57:03 +08:00
root
e7fd6cb9d1 Fix battery image issue for under warranty 2018-09-02 23:19:03 +08:00
root
45a84d1cc8 Fix edit invoice bug for rider api 2018-08-27 03:57:44 +08:00
30e08259db Add apple push notification service #162 2018-08-15 15:09:04 +08:00
e3a0e8e23c Have hub reassign and rider reassign send mqtt events to rider and user app #162 2018-08-15 12:59:57 +08:00
4b635631ba Change mqtt event when rider cancels to outlet_assign #162 2018-08-15 11:24:26 +08:00
f720ccd940 Add mqtt send for outlet_assign event #162 2018-08-15 10:43:54 +08:00
dbe152598f Merge branch 'master' of gitlab.com:jankstudio/resq into 162-phase-2-changes 2018-08-14 23:58:41 +08:00
2aa765d186 Allow rating of -1 for cancel rating for rider rating user api call #162 2018-08-14 23:58:00 +08:00
root
bbeb3be10d Make sure batt_id is null in change service rider api call 2018-08-14 23:45:27 +08:00
root
0cc667dbec Merge branch 'master' of https://gitlab.com/jankstudio/resq
Conflicts:
	utils/mqtt_sender/mqtt_sender.py
2018-08-14 13:52:30 +08:00
b5c67f1c91 Revert typecasting for now #162 2018-08-13 14:50:44 +08:00
root
b3eb68346f Revert to regular json_encode because auto int conversion sucks 2018-08-13 14:34:47 +08:00
051521679e Disable sending of MQTT message to user app when user cancels via api #162 2018-08-13 05:08:09 +08:00
fa659226bc Mark JO as rider rated when post rider rating api call is used #162 2018-08-13 05:01:33 +08:00
f47e280b37 Display latest JO without rider rating in rider status api call #162 2018-08-13 04:49:21 +08:00
ff8e4090ae Merge branch 'master' of gitlab.com:jankstudio/resq into 162-phase-2-changes 2018-08-13 04:14:14 +08:00
1a44d28290 Create query for last fulfilled job order for rider status api call #162 2018-08-13 04:13:50 +08:00
fcaa8c3537 Merge branch '162-phase-2-changes' into 'master'
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!169
2018-08-10 14:17:25 +00:00
7237441ec3 Add rider rating flag to JO and modify jo get invoice api call #162 2018-08-10 22:06:52 +08:00
root
e87ed1a72d Fix get rider status api call bug 2018-08-10 15:31:02 +08:00
6c63036eea Add dummy has_warranty_doc to rider api jo data #162 2018-08-10 11:08:26 +08:00
93da2003f0 Add privacy flags in get user info api call #162 2018-08-10 10:21:02 +08:00
a74e73f99c Add skeleton method for hub arrive rider api call #162 2018-08-10 08:54:23 +08:00
bbc6989a66 Add jo invoice user api call #162 2018-08-10 08:06:29 +08:00
5b323e155b Add event log entries for user api JO calls #162 2018-08-09 05:39:13 +08:00
57eef0a0a4 Replace filler confirmation code with randomly generated one in user api #162 2018-08-09 05:15:50 +08:00
28b298dbb4 Add event log entries for rider api events #162 2018-08-09 04:53:09 +08:00
df709aa353 Add delivery_address and delivery_instructions to rider status user api call #162 2018-08-09 03:36:27 +08:00
f2d83dca43 Add in transit status job orders to open list #162 2018-08-09 02:46:58 +08:00
b4b18e5d3d Have rider api cancel job order requeue the job order for reassignment instead #162 2018-08-09 02:06:33 +08:00
7faaf403bf Add delivery_address and delivery_instructions fields for request jo api call 2018-08-08 04:05:10 +08:00
cd73d7de9e Fix rider image URL 2018-08-05 00:28:28 +08:00
165e59e1a1 Fix job order switch service bug 2018-08-03 14:29:26 +08:00
root
021a6df352 Fix job order cancel bug 2018-07-30 17:13:12 +08:00
c3d2ed3496 Add new command for fulfilling old job orders #160 2018-07-26 19:10:09 +08:00
5ed3a2e447 Refactor fulfill jo to belong in entity #159 2018-07-26 02:58:19 +08:00
098df69949 Refactor cancel job order process #159 2018-07-25 23:03:32 +08:00
9ae9a550d0 Add mode_of_payment field to change service call in rider API #159 2018-07-23 02:07:56 +08:00
2925ec3df3 Add trade_in_type output to get job order call in rider api #159 2018-07-21 04:34:23 +08:00
863bf56453 Add trade_in_type to job order so rider app can differentiate #159 2018-07-21 04:05:51 +08:00
root
d455a20e70 Pad mobile number with '63' before sending to rider API 2018-07-20 17:24:02 +08:00
b586f6486d Fix cancel bug #159 2018-07-19 09:48:02 +08:00
af45301e98 Inject MQTTClient in cancel jo api call #155 2018-07-09 16:26:52 +08:00
584652d31d Unrequire batt_id and trade_in for change service rider api call and add or_num #153 2018-07-05 15:49:22 +08:00
052f3dfe62 Add or number to JobOrder entity #153 2018-07-05 15:19:44 +08:00
2a814a1976 Remove debug for sql statement #152 2018-07-02 17:17:10 +08:00
53b34a874c Add time to date_schedule field of get job order rider api call #151 2018-07-02 02:32:54 +08:00
322e26afd1 Add mqtt event sending in api controller jo cancel call #151 2018-07-02 01:45:08 +08:00
cbdc2fd24e Add sendRiderEvent call for MQTTClient service #151 2018-07-02 00:22:15 +08:00
efb7d75913 Fix and refactor how invoice is updated for job order open edit #150 2018-06-22 02:30:22 +08:00
2e91da2bb9 Merge branch '143-add-missing-fields-in-jo-pdf' into 'master'
Resolve "Add missing fields in JO PDF"

Closes #143

See merge request jankstudio/resq!150
2018-06-18 10:18:02 +00:00
Ramon Gutierrez
c6cb9b4d98 Change assignedby to processedby for dispatcher name field #143 2018-06-18 18:13:25 +08:00
7b994ab2c3 Merge branch '143-add-missing-fields-in-jo-pdf' into 'master'
Resolve "Add missing fields in JO PDF"

Closes #143

See merge request jankstudio/resq!149
2018-06-18 09:25:04 +00:00
Ramon Gutierrez
65f147886e Add null checks for remaining pdf fields #143 2018-06-18 17:23:35 +08:00
104d60082e Merge branch '143-add-missing-fields-in-jo-pdf' into 'master'
Resolve "Add missing fields in JO PDF"

Closes #143

See merge request jankstudio/resq!147
2018-06-18 07:30:54 +00:00
Ramon Gutierrez
f41dafd293 Change null check format for getPromo #143 2018-06-18 15:21:09 +08:00
Ramon Gutierrez
c9d6b232ee Add null check for promo type #143 2018-06-18 15:20:23 +08:00
7a7aee4dd6 Merge branch '143-add-missing-fields-in-jo-pdf' into 'master'
Resolve "Add missing fields in JO PDF"

Closes #143

See merge request jankstudio/resq!146
2018-06-18 06:55:00 +00:00
2fa2ad964e Add phone_id and update device_push_id field for mobile session #148 2018-06-17 17:03:34 +08:00
7f4f1e440e Add mode of payment field for request jo api call #146 2018-06-17 14:01:45 +08:00
3f616a8283 Add dummy location support API #147 2018-06-17 11:23:06 +08:00
Ramon Gutierrez
352dcf2809 Add missing fields to jo pdf #143 2018-06-17 00:34:25 +08:00
778436844c Set date cancel for all jo cancel operations #137 2018-06-12 06:01:11 +08:00
1101e61f5f Fix order of arguments in substr call to phone number #137 2018-06-12 02:30:18 +08:00
0d2e84da06 Fix date cancel null bug for service history api call #138 2018-06-11 15:45:39 +08:00
0fdb942134 Merge branch '95-jo-print' into 'master'
Resolve "JO print"

Closes #95

See merge request jankstudio/resq!135
2018-06-10 08:13:52 +00:00
7789ec7ec6 Removed priv_promo being required in privacy settings api call #136 2018-06-07 03:10:25 +08:00
7aef4c72cf Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!131
2018-06-05 20:29:57 +00:00
43f618a838 Add in progress case #133 2018-06-06 04:29:15 +08:00
007d64c08a Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!129
2018-06-05 20:05:56 +00:00
6b40b456fb Fix payment bug for rider api #133 2018-06-06 04:05:24 +08:00
32722fa479 Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!128
2018-06-05 19:58:58 +00:00
8760963570 Fix rider image bug #133 2018-06-06 03:58:26 +08:00
d521d5ff8e Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!127
2018-06-05 19:52:32 +00:00
8fb28c2710 Add case for in transit #133 2018-06-06 03:51:55 +08:00
fec66d3725 Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!126
2018-06-05 19:48:12 +00:00
bee2d83605 Add in transit to list of pending jos for ios app #133 2018-06-06 03:47:20 +08:00
9dccf7005e Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!125
2018-06-05 19:28:52 +00:00
fbe6c42e50 Add mqtt send event to fulfilled, cancelled and driver arrived #133 2018-06-06 03:26:24 +08:00
61681e9344 Merge branch '135-fix-fuel-pricing' into 'master'
Resolve "Fix fuel pricing"

Closes #135

See merge request jankstudio/resq!124
2018-06-04 00:16:34 +00:00
54f04a9ae2 Add debug information #135 2018-06-04 08:15:53 +08:00
07dbaed89e Merge branch '135-fix-fuel-pricing' into 'master'
Resolve "Fix fuel pricing"

Closes #135

See merge request jankstudio/resq!121
2018-06-03 23:49:21 +00:00
8b5141385c Add customer vehicle to invoice criteria #135 2018-06-04 07:48:29 +08:00
6c77e77e2a Add filter for flag_mobile in app API #134 2018-06-04 05:49:26 +08:00
220a78d275 Add flag_mobile UI and controller functionality for vehicle and vehicle manufacturer #134 2018-06-04 05:21:33 +08:00
de14863e2f Add flag_mobile fields in vehicle and vehicle manufacturer #134 2018-06-04 04:16:40 +08:00
f4d4a6e3a0 Add mqttclient service to send mqtt events #133 2018-06-04 03:28:37 +08:00
2be0abb716 Fix bug with missing entity manager for rider api calls #132 2018-05-28 20:16:26 +08:00
70af6935ef Fix typo error in setAvailable #132 2018-05-28 18:44:07 +08:00
0000318495 Modify rider availability on login and logout from rider api #132 2018-05-28 18:09:25 +08:00
a6b56e2fca Return hub data when logging in rider api #132 2018-05-28 17:00:50 +08:00
3d186481ca Add payment and available api calls for rider app #132 2018-05-27 06:29:56 +08:00
ed8ed03136 Make sure change status calls for rider api are being saved #132 2018-05-27 06:03:20 +08:00
bcc606f52a Add change service rider api call #132 2018-05-27 05:55:54 +08:00
0e42e68b08 Add get batteries call to rider api #132 2018-05-27 03:29:31 +08:00
393fc525c0 Add get promos call for rider api #132 2018-05-27 01:52:12 +08:00
e93fec2811 Merge branch 'master' into 111-sms-feature-for-security-code
Conflicts:
	src/Controller/APIController.php
2018-05-25 10:42:13 +08:00
955f0e4d46 Add rising tide sms service #111 2018-05-25 01:36:34 +08:00
be5a66e68a Add mobile api privacy settings call #130 2018-05-23 22:40:44 +08:00
7d3873022e Add mobile api resend code #130 2018-05-23 22:04:53 +08:00
82fc9f3948 Make mobile api use vehicle model formatting method #128 2018-05-23 19:06:47 +08:00
00f602e0d7 Add status change calls for rider api #119 2018-05-23 09:34:59 +08:00
d5fb5222ca Add rider api get job order call #119 2018-05-23 07:28:57 +08:00
5b94b1a592 Add login and logout features for rider api #119 2018-05-23 03:03:56 +08:00
9d8a3fe6e4 Add session register rider api call #119 2018-05-22 20:59:24 +08:00
9e6ff4ee15 Add rider username and password to forms and database #119 2018-05-22 20:57:50 +08:00
Ramon Gutierrez
5699903d14 Add pdf generation for job orders #95 2018-05-21 20:55:00 +08:00
7e53a4d6de Add rider rating comment feature #120 2018-05-21 01:23:59 +08:00
5e0023e215 Add cancel reason to mobile event for cancel JO #122 2018-05-20 23:18:06 +08:00
3727ae1fed Fix typo bug for session #122 2018-05-20 23:02:06 +08:00
429dc99b29 Add cancel event and have mobile sendEvent send to all sessions of a job order #122 2018-05-20 22:45:41 +08:00
5498119ab3 Add setMaxResults(1) to assure single result in dupe customer query #116 2018-05-20 14:22:51 +08:00
8b8d819910 Check for existing customers for the same number and merge for mobile API #116 2018-05-20 13:48:06 +08:00
365de1c66d Set customer mobile phone on update info #118 2018-05-20 01:54:41 +08:00
05959d5734 Add service_type to rider status #110 2018-05-02 21:39:45 +08:00
4652a82fff Support new services #110 2018-05-02 21:12:49 +08:00
ae153c60b0 Add image_url to get estimate api call #107 2018-05-01 21:01:38 +08:00
2f68a184e7 Add setDateFulfill when jo is fulfilled #107 2018-04-29 14:25:34 +08:00
921aa9bb66 Fix date fulfilled typo / bug #107 2018-04-29 14:21:30 +08:00
1b3c0409df Add workaround for battery images in mobile app #107 2018-04-29 12:12:22 +08:00
b5274be3b5 Allow super admin to do rider assignment even when locked to other user #106 2018-04-27 04:20:47 +08:00
3d053c8fee Add phone number search for jo open list #105 2018-04-25 18:08:34 +08:00
4dd708a8ac Add customer name and mobile phone searching for view all jo list #98 2018-04-25 01:39:21 +08:00
7ff058864a Add search by plate number on customer list #100 2018-04-25 00:33:42 +08:00
aea22c7e11 Allow fulfilled job orders to be cancelled #103 2018-04-24 23:57:45 +08:00
14976361b9 Rename variable stype_id to service_type for more consistency #104 2018-04-24 20:08:12 +08:00
32d6c7238c Add update device id api call #104 2018-04-21 00:00:53 +08:00
bb3ac8ecd4 Add jo history api call and fix estimate and request jo to use new criteria system #104 2018-04-20 23:39:19 +08:00
88c7da7b2a Remove set status on open edit submit #102 2018-04-19 09:31:04 +08:00
57c9da8adf Add search for first name or last name in open job order list #94 2018-04-18 13:49:40 +08:00
abe1b8bb3d Add open edit JO feature #93 2018-04-18 11:51:45 +08:00
04448c03a0 Increase limit of nearest hubs to 20 #91 2018-04-13 22:41:33 +08:00
2ecb3b142a Change job order all and open search to sarch for plate number #91 2018-04-12 22:24:31 +08:00
42f3048d12 Optimize incoming jo customer vehicle search #89 2018-04-10 23:37:34 +08:00
315a369a3b Hide error_log debugging in job order controller #89 2018-04-10 20:13:09 +08:00
23fbaf1e13 Fix mode of payment bug in jo incoming #86 2018-04-09 21:17:20 +08:00
1a60b6d632 Fix bug in jo submission for create jo from cv #84 2018-04-09 13:17:28 +08:00
e1c4a9e40d Fix jo incoming from cv to display and handle invoice editing properly #83 2018-04-09 12:41:10 +08:00
c29de550d5 Make sure job order reassign hub / rider sets prossesed by and assigned by properly #82 2018-04-09 01:15:47 +08:00
5bbfff6dd4 Limit JO incoming search to plate number #78 2018-04-07 10:11:38 +08:00
3642b2225e Fix permission bug in customer link showing #77 2018-04-06 17:49:41 +08:00
e383a66e8f Add pdf workaround #76 2018-04-06 16:04:31 +08:00
0ced0735a3 Save new battery on fulfill jo action #71 2018-04-05 13:53:30 +08:00
c5fe392cae Modify invoice creator to properly compute for trade-ins based on size #70 2018-04-04 21:23:26 +08:00
ef85141587 Add trade-in prices in entity, controller and templates #70 2018-04-04 17:43:04 +08:00
4321f70e94 Add job order event / status history #68 2018-04-04 03:51:39 +08:00
b009199df3 Add all other batteries to compatible battery dropdown #67 2018-04-03 22:35:27 +08:00
190ab8ceaf Add schedule and adjust schedule date to display date and time always #67 2018-04-03 21:38:45 +08:00
69bf01fa27 Make customer add and edit forward back to edit form #62 2018-04-01 02:44:15 +08:00
e371d9900d Allow user to create JO from customer vehicle #62 2018-04-01 02:22:24 +08:00
f6145d45f1 Merge branch '52-migrate-contact-and-job-order-scripts' into 'master'
Resolve "Migrate contact and job order scripts"

Closes #52

See merge request jankstudio/resq!50
2018-03-21 19:24:48 +00:00
1e2df32443 Add migration script and initial sql dump for customer and customer vehicle #52 2018-03-22 03:23:11 +08:00
29e9c7864e Add job order counters to open job order form #55 2018-03-15 14:06:55 +08:00
13f7676b6b Fixed ... shortening for tables in batteries and vehicles #51 2018-03-14 22:29:12 +08:00
ce6627e21a Add active flag in rider form #49 2018-03-14 21:51:24 +08:00
48f30f4dd9 Remove access check for ajax call on vehicle manufacturer #48 2018-03-14 19:34:15 +08:00
30b67386a6 Add migration tool for batteries and vehicles #UAT 2018-03-13 03:37:40 +08:00
9ad5f2557b Implement counters and fix rider flow #UAT 2018-03-12 18:32:59 +08:00
ecd9ee0dcf Remove service type display in jo process list #UAT 2018-03-12 02:40:15 +08:00
bc4a2ac7f7 Add promo detail field in job order #UAT 2018-03-12 01:36:11 +08:00
f807c7041e Add email field to customer #UAT 2018-03-12 00:15:51 +08:00
017a8bb30d Add landmark field #UAT 2018-03-11 04:01:14 +08:00
a7ffb58fc8 Fix ticket functionality related to contact numbers #UAT 2018-03-11 02:44:44 +08:00
5c18619e80 Fix contact number related bugs #UAT 2018-03-11 02:36:13 +08:00
caf981e4a6 Fix and refactor customer controller and template #UAT 2018-03-10 21:47:27 +08:00
5769e1c366 Replace contact numbers with individual numbers in customer entity, controllers, and templates #UAT 2018-03-10 14:18:07 +08:00
99401b95e6 Add OR Name to job order entity and controller (incoming) and templates #UAT 2018-03-10 02:21:55 +08:00
8d1554a4b9 Add transaction origin / source to job order templates, controllers and entity #UAT 2018-03-10 01:44:43 +08:00
eab86ec007 Rename Processing to Dispatch #UAT 2018-03-09 23:49:32 +08:00
b37dbd5986 Add driver_assigned event #45 2018-03-08 11:56:25 +08:00
d182c64b1f Rename start_rating MQTT event to fulfilled 2018-03-08 10:04:31 +08:00
4120677cb0 Add service type to invoice criteria calls #43 2018-03-08 03:13:27 +08:00
f5c7d17d2f Add MQTT event sending #41 2018-03-08 02:09:58 +08:00
7ef92bad99 Change getOutlet to getHub for get rider call #41 2018-03-07 22:11:55 +08:00
4811d7d1cf Fix edit rider by initializing has_schedule #40 2018-03-07 22:07:12 +08:00
e987f22fa6 Initialize array for rider schedule #39 2018-03-07 21:46:17 +08:00
Ramon Gutierrez
03f6b40ed3 Add mandatory cancellation reason to prompt #34 2018-03-02 03:26:47 +08:00
eabee25db9 Fix job order related bugs #33 2018-03-01 07:39:17 +08:00
36e4219f99 Add support for mode of payment dropdown #33 2018-03-01 07:28:59 +08:00
ad04131515 Add Tier 1 and Tier 2 notes #33 2018-03-01 04:15:44 +08:00
fbdcd6f31f Initialize job_order to null if not found #32 2018-03-01 02:39:18 +08:00
5cb38e8907 Use getName static method for NameValue values #32 2018-03-01 02:34:51 +08:00
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
1dd51a8dd3 Add support for invoice generation for under warranty #29 2018-02-28 01:42:09 +08:00
Ramon Gutierrez
cb7fffe49f Change timeline date format to 12-hour #31 2018-02-27 23:46:08 +08:00
Ramon Gutierrez
6262f933bc Add missing acl checks on list methods #30 2018-02-27 23:42:44 +08:00
Ramon Gutierrez
ab116d35ce Add view all job orders tier #26 2018-02-27 23:31:02 +08: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
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
dddfbef619 Fix fulfillment table bug #14 2018-02-27 06:28:31 +08:00
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
Ramon Gutierrez
84b57d82d6 Merge branch '25-customer-form-changes' into 'master'
Resolve "Customer form changes"

Closes #25

See merge request jankstudio/resq!23
2018-02-26 19:51:15 +00:00
Ramon Gutierrez
8baa8734bc Add title and active fields to customer form and list #25 2018-02-27 03:50:28 +08:00
ec6ca96f7d Merge branch '27-handling-jumpstart-on-invoice-computation-for-job-order' into 'master'
Resolve "Handling jumpstart on invoice computation for job order"

Closes #27

See merge request jankstudio/resq!24
2018-02-26 19:44:50 +00:00
d4e28cd332 Add service type to invoice computation #27 2018-02-27 03:43:30 +08:00
Ramon Gutierrez
d77dbcd209 Sort compatible battery list by highest price #24 2018-02-27 02:46:52 +08:00
Ramon Gutierrez
cae5a5bbac Add reference job order selector to incoming form #24 2018-02-27 02:37:29 +08:00
Ramon Gutierrez
d8e5117c2e Add related tickets table to form #22 2018-02-26 18:37:07 +08:00
Ramon Gutierrez
50347027a3 Add job order ticket form blocks #21 2018-02-26 17:52:38 +08:00
Ramon Gutierrez
7cc7c81d98 Add plate number to tickets #21 2018-02-26 15:33:38 +08:00
2039ec9b3a Add job order cancel API call #20 2018-02-22 00:43:45 +08:00
6ec9f76d4d Add post rider rating API #18 2018-02-21 21:53:06 +08:00
Ramon Gutierrez
db2904f4de Add fulfillment job order list and form #15 2018-02-19 23:28:50 +08:00
Ramon Gutierrez
e124b0cebd Fix job order form to use hubs instead of outlets #17 2018-02-19 14:11:56 +08:00
Ramon Gutierrez
d4cc431bac Associate job orders with hubs instead of outlets, filter assigning list to user assigned hubs only #17 2018-02-19 13:51:07 +08:00
Ramon Gutierrez
fb0b66de3d Add user hub assignments #17 2018-02-18 17:46:10 +08:00
Ramon Gutierrez
6d1a45ddf9 Add sap_code to battery entity/form #16 2018-02-18 17:17:47 +08:00
Ramon Gutierrez
5cadd27ffb Add branch name to hub column on rider table #12 2018-02-18 17:08:45 +08:00
Ramon Gutierrez
a4ae8f4726 Add rider schedule entry to rider form #8 2018-02-18 16:34:30 +08:00
Ramon Gutierrez
277a709ead Apply auto refresh to job order list views #6 2018-02-17 16:50:30 +08:00
Ramon Gutierrez
49aaa90e37 Return only compatible batteries on job order form #1 2018-02-17 14:47:03 +08:00
0f546ac593 Add assignor locking for job order assigning #7 2018-02-16 16:02:16 +08:00
93b62a37a2 Add rider details in API rider status call 2018-02-07 21:47:29 +08:00
21b7727278 Add rider status API call 2018-02-07 15:23:20 +08:00
ed75a3936a Make API output for invoice item price decimal 2018-02-07 13:41:51 +08:00
ad8100fb26 Add API calls for estimate and job order request 2018-02-07 03:18:16 +08:00
9d04ff7879 Add API call for get estimate 2018-02-07 01:40:13 +08:00
7ea7e238cc Add hub branch in outlest list table 2018-02-06 16:15:09 +08:00
Ramon Gutierrez
f3ad3fe807 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-05 13:20:24 +08:00
3b4c81f03c Fix job order processing bugs 2018-02-05 13:17:12 +08:00
Ramon Gutierrez
887823eee0 Add invoice display, prevent editing on anything other than incoming tier 2018-02-05 13:14:55 +08:00
Ramon Gutierrez
46ebd223a2 Regenerate invoice when changing promo 2018-02-05 03:45:28 +08:00
b012c29752 Fix bug in processor display on job orders processing list 2018-02-05 01:58:46 +08:00
1125eba1bc Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-05 01:24:07 +08:00
a3d793087d Fix invoice generation computations 2018-02-05 01:23:38 +08:00
Ramon Gutierrez
884cd7b7f1 Add image file to battery, update cleanup task for orphaned images 2018-02-04 23:10:32 +08:00
141212d4e6 Rename owner to processor in job order list 2018-02-04 19:43:09 +08:00
1d0aaa211a Display owner in job order list 2018-02-04 19:41:46 +08:00
006db8a286 Add pessimistic locking for job order processing 2018-02-04 18:49:16 +08:00
Ramon Gutierrez
5c306c1723 Redirect add ticket to edit customer page if applicable 2018-02-04 17:14:11 +08:00
Ramon Gutierrez
5d05043034 Redirect ticket form back to customer update path if applicable 2018-02-04 17:11:28 +08:00
Ramon Gutierrez
dd5fbf7cd6 Restore using isset instead of in_array for number and vehicle whitelisting on customer 2018-02-04 16:55:06 +08:00
Ramon Gutierrez
2b0f97a678 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-04 16:46:35 +08:00
Ramon Gutierrez
ff4ec511e4 Remove date_confirmed from mobile number + fix index bug on deletion of existing customer vehicle 2018-02-04 16:46:23 +08:00
c9af452629 Add API call to list ongoing job orders 2018-02-04 13:44:27 +08:00
b210401150 Change id to cv_id in list vehicles 2018-02-04 12:54:14 +08:00
3dff90da90 Add id to list vehicles for API 2018-02-04 12:13:59 +08:00
59d76c3975 Add locking version in job order entities and place TODOs in controller 2018-02-04 04:00:38 +08:00
Ramon Gutierrez
8ad354c8c3 Make contact number nullable on ticket, fix update behavior to retain old name and number values even if customer is associated 2018-02-02 03:21:14 +08:00
9841d5c215 Fix delete number / vehicle bug in customer 2018-02-02 03:06:00 +08:00
fac3c409c4 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-02 02:48:22 +08:00
ddb642a95f Refactor customer form and fix bugs 2018-02-02 02:48:00 +08:00
Ramon Gutierrez
92035b99bf Use new invoice generation behavior on job order form 2018-02-02 02:31:22 +08:00
Ramon Gutierrez
6c79281ff0 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-01 23:14:56 +08:00
Ramon Gutierrez
fb5d36aca6 Add promo selection to job order invoice form 2018-02-01 23:14:49 +08:00
85a0f972c7 Fix Customer bug when no vehicle or mobile number is selected 2018-02-01 23:11:57 +08:00
Ramon Gutierrez
ef2dccdf57 Automatically set status for job orders when submitting form, set hub as mandatory on outlets 2018-02-01 17:11:09 +08:00
Ramon Gutierrez
2ec8a369f6 Add crud for promos, discountapply name value collection 2018-02-01 15:07:43 +08:00
Ramon Gutierrez
8a2e75f999 Move getting collection data outside of loops 2018-02-01 15:06:56 +08:00
Ramon Gutierrez
9e7e937835 Add backend for saving warranty class on job order 2018-02-01 00:47:35 +08:00
Ramon Gutierrez
b6786895bd Update battery search labels to not include product code 2018-02-01 00:46:24 +08:00
Ramon Gutierrez
8f4b745025 Update list columns and fields based on feedback 2018-01-31 23:56:25 +08:00
Ramon Gutierrez
83cd3a008b Replace warranty personal with warranty private 2018-01-31 20:25:47 +08:00
Ramon Gutierrez
d0d83531bb Add fuel type and vehicle status condition name value collections 2018-01-31 15:30:04 +08:00
Ramon Gutierrez
d0d0c04c5d Add subject field to tickets 2018-01-31 12:04:52 +08:00
Ramon Gutierrez
6be23b27c5 Add user profile form 2018-01-31 06:14:46 +08:00
Ramon Gutierrez
72112ebe6c Initial commit for ticketing system 2018-01-31 05:59:48 +08:00
Ramon Gutierrez
40a4e96632 Change time format on job order list 2018-01-31 04:02:29 +08:00
Ramon Gutierrez
28e5f97ad4 Remove leftover error_log for job order status 2018-01-31 03:02:51 +08:00
Ramon Gutierrez
b21c563102 Record assigning user and datetime for job orders 2018-01-31 02:46:00 +08:00
Ramon Gutierrez
c0ecc1114c Initial commit for assigning screens for job orders 2018-01-31 02:31:04 +08:00
Ramon Gutierrez
8a2c84bdfd Add mobile number to customer vehicle search string for job order 2018-01-30 23:38:48 +08:00
Ramon Gutierrez
4884ef893f Highlight scheduled job orders on processing list 2018-01-30 23:38:01 +08:00
Ramon Gutierrez
29a838b1a8 Change destination marker image, add backend functionality for job order processing stage 2018-01-30 22:05:32 +08:00
Ramon Gutierrez
2b4c289ba9 Filter nearest outlets by open and close times 2018-01-30 19:47:39 +08:00
Ramon Gutierrez
d86b9f33a0 Fix sort by hub issue for rider list + add hub selection to outlets 2018-01-30 16:08:04 +08:00
Ramon Gutierrez
161778cfef Add plate number field to rider 2018-01-30 14:57:16 +08:00
Ramon Gutierrez
d97cbeaa45 Fix controller to save customer notes 2018-01-30 14:28:08 +08:00
d53d51f499 Fix comment on date format 2018-01-30 01:50:38 +08:00
ae46f9068c Add more API calls 2018-01-30 00:02:59 +08:00
189b2e9a01 Add more API calls 2018-01-29 22:02:28 +08:00
b18d02f521 Add new API calls: info get, info update, status 2018-01-29 10:12:14 +08:00
fea805e385 Make api json_encode result use JSON_FORCE_OBJECT 2018-01-29 08:36:08 +08:00
e3a41febc5 Rename mobile session setDateConfirm to setDateConfirmed 2018-01-28 13:51:57 +08:00
e56929dbcc Refactor API controller for ease of use 2018-01-28 13:38:06 +08:00
f5cce11738 Add routes and initial controller for API calls 2018-01-28 05:18:56 +08:00
Ramon Gutierrez
798dd5e599 Only display km values for distance 2018-01-18 01:39:50 +08:00
Ramon Gutierrez
86f69e8056 Fix outlet row highlighting bug, format distance and duration into friendly time 2018-01-18 01:37:15 +08:00
Ramon Gutierrez
a614366a5a Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-18 01:18:49 +08:00
Ramon Gutierrez
4a216996ae Add job order processing form 2018-01-18 01:18:37 +08:00
84c8606894 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-17 23:54:22 +08:00
7811c8a66e Add validations and checks for outlet 2018-01-17 23:54:00 +08:00
Ramon Gutierrez
139cbdfc3d Initial commit for job order list (processing) 2018-01-17 23:53:54 +08:00
Ramon Gutierrez
2e0efa0b35 Rename incoming.html.twig to form.html.twig to keep standard 2018-01-17 23:14:18 +08:00
14b432a11e Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-17 22:51:45 +08:00
1f4ae0e386 Improve output of map tools 2018-01-17 22:51:13 +08:00
Ramon Gutierrez
627f850bfb Initial commit for saving incoming job order form 2018-01-17 22:37:31 +08:00
Ramon Gutierrez
3132812308 Add invoice ui elements and form submission to incoming job order form 2018-01-17 20:42:09 +08:00
53e71e1db0 Convert distance test into service 2018-01-17 18:12:04 +08:00
Ramon Gutierrez
53292697a2 Apply missing warranty expiration fix to updates on customer form 2018-01-17 16:06:54 +08:00
929187f45c Fix blank warranty bug for customer form and add typehinting for date/time fields 2018-01-17 15:09:26 +08:00
Ramon Gutierrez
36627d713d Initial commit for job order tier 1 / incoming form 2018-01-17 07:21:04 +08:00
Ramon Gutierrez
7790bdde33 Remove unused params from rider form template 2018-01-17 02:05:20 +08:00
Ramon Gutierrez
834ecddbb7 Set year range to current + 1, change customer vehicle year selection to dropdown 2018-01-16 17:53:16 +08:00
Ramon Gutierrez
e67e5f3f16 Initial commit for rider image upload, add FileUploader service 2018-01-16 17:27:43 +08:00
Ramon Gutierrez
0bd009d74f Add crud saving for rider 2018-01-16 06:21:45 +08:00
Ramon Gutierrez
ed24ace9b6 Remove obsolete values array on edit form 2018-01-16 06:11:55 +08:00
Ramon Gutierrez
278a37bc53 Initial commit for rider crud 2018-01-16 06:06:52 +08:00
Ramon Gutierrez
7739b23a7d Fix customer crud form saving 2018-01-16 05:34:29 +08:00
Ramon Gutierrez
a450f5ada8 Initial commit for customer crud forms 2018-01-16 02:25:40 +08:00
e4d9c47eb5 Add guzzle to composer 2018-01-15 16:26:32 +08:00
6737099278 Create test controller for st_distance functionality in database 2018-01-15 02:39:23 +08:00
20756296e6 Add hub crud screens and functionality 2018-01-14 23:33:20 +08:00
183d04ca48 Fix outlet add form bug 2018-01-14 22:57:16 +08:00
b496767bd1 Fix total row count computation to work with filters for outlet list 2018-01-14 22:46:16 +08:00
b3c056ab23 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-14 22:23:13 +08:00
8e404dbd91 Finish outlet list and update forms 2018-01-14 22:17:28 +08:00
Ramon Gutierrez
8860e6a483 Optimize how object vars are passed to crud forms 2018-01-14 21:13:42 +08:00
Ramon Gutierrez
732a2b8545 Change method names for create and update 2018-01-14 15:49:50 +08:00
Ramon Gutierrez
0c3da71a57 Apply where filters to pagination query 2018-01-14 15:32:18 +08:00
a83e3dee5b Fix outlet add new 2018-01-14 02:46:08 +08:00
180a2d4bf9 Add initial outlet screens and other menu and acl entries 2018-01-13 00:28:12 +08:00
1fefaf4b09 Optimize vehicle controller by removing unnecessary acl generator 2018-01-13 00:27:24 +08:00
Ramon Gutierrez
be949249d9 Initial commit for customer crud, add asserts/get/setters to entities 2018-01-12 08:38:12 +08:00
Ramon Gutierrez
e8d978dae4 Add crud and validation for battery entity 2018-01-12 06:47:32 +08:00
Ramon Gutierrez
3107e0d3e9 Add controlllers for vehicle entities 2018-01-12 03:16:07 +08:00
Ramon Gutierrez
537c97c611 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-12 03:15:31 +08:00
Ramon Gutierrez
b198848a47 Check if acls is populated before doing foreach 2018-01-12 03:14:35 +08:00
7f6beb2b99 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-12 03:09:39 +08:00
3ef273e145 Build proof of concept test for google map geocoding 2018-01-12 03:09:01 +08:00
Ramon Gutierrez
e780c56aa2 Add crud, asserts, getters and setters for auxilliary battery entities 2018-01-11 23:53:56 +08:00
Ramon Gutierrez
009289b282 Add ACL security checks for role views and controllers 2018-01-11 15:34:53 +08:00
9961510e40 Add ACL security checks for user views and controllers 2018-01-11 03:04:09 +08:00
9bb3542c78 Add Role ACL to add and update forms 2018-01-10 13:48:25 +08:00
Ramon Gutierrez
aece8408e8 Use server side form submission and validation for role crud 2018-01-10 04:42:13 +08:00
Ramon Gutierrez
027f017d6f Use server side form submission and validation for user crud 2018-01-10 04:29:51 +08:00
Ramon Gutierrez
0b5862e4d4 Fix invalid edit/delete paths on crud lists 2018-01-09 02:03:48 +08:00
Ramon Gutierrez
98df96a0ff Move pagination/sorting/filtering to server side for role crud and fix datatables webstorage issue 2018-01-08 22:39:15 +08:00
Ramon Gutierrez
e6ca66ccc9 Move pagination/sorting/filtering to server side for user crud 2018-01-08 20:55:24 +08:00
Ramon Gutierrez
9859242400 Add basic user crud 2018-01-07 19:21:37 +08:00
Ramon Gutierrez
aaeb6df92d Add basic crud operations to roles 2018-01-07 14:22:09 +08:00
fbbcd89f8d Add ACL access voter service 2018-01-07 10:05:56 +08:00
Ramon Gutierrez
b38af2e4b5 Add role list view, initial routing and methods for crud 2018-01-07 05:44:11 +08:00
b25345a46d Add ACL generator component with test controller and route 2018-01-07 00:49:18 +08:00
3b878948bf Initial commit 2018-01-06 21:26:46 +08:00