Commit graph

306 commits

Author SHA1 Message Date
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