Commit graph

433 commits

Author SHA1 Message Date
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
1b648607a8 Merge branch '135-fix-fuel-pricing' into 'master'
Resolve "Fix fuel pricing"

Closes #135

See merge request jankstudio/resq!123
2018-06-04 00:12:47 +00:00
499bc1cd3c Add more debug information for fuel service #135 2018-06-04 08:11:52 +08:00
e70bd8c39f Merge branch '135-fix-fuel-pricing' into 'master'
Resolve "Fix fuel pricing"

Closes #135

See merge request jankstudio/resq!122
2018-06-04 00:00:41 +00:00
3bfc8c5c5b Add debug info for refuel #135 2018-06-04 07:59:35 +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
c322ffe016 Make rider session auto active #131 2018-05-24 16:24:11 +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
ed30224c09 Capitalize plate number for customer vehicle entity #129 2018-05-23 19:17:19 +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
87c6ca1926 Add rider session entity #119 2018-05-22 20:59:13 +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
8035dc254c Add LPG to fuel type #115 2018-05-19 15:11:15 +08:00
6dd052e84e Sort vehicle fetching by make #114 2018-05-19 12:52:29 +08:00
7f7707d827 Force ipv4 resolv for calls to google maps api #113 2018-05-07 22:57:42 +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
757ec209ad Fix OPL formula in discount calculation #96 2018-04-19 11:00:33 +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
836c026402 Add match against support for dql #89 2018-04-10 23:37:18 +08:00
315a369a3b Hide error_log debugging in job order controller #89 2018-04-10 20:13:09 +08:00
5b5fbd7555 Add general service - under warranty service type #88 2018-04-09 22:30:00 +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
a510a9ce58 Merge branch '80-jo-adding-for-post-types-bug' into 'master'
Resolve "JO adding for post types bug"

Closes #80

See merge request jankstudio/resq!69
2018-04-08 18:01:24 +00:00
af6765f662 Add post replacement and recharge in invoice creator #80 2018-04-09 02:00:37 +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
6918d44468 Fix customer import bug #75 2018-04-06 13:40:15 +08:00
803410fb8c Fix bug for under warranty job order #74 2018-04-06 04:48:44 +08:00
f076827879 Add special cases to import customer command #73 2018-04-06 03:40:52 +08:00
36ac62a2ad Add better debugging messages when vehicle has no match in db #73 2018-04-06 00:25:19 +08:00
0ced0735a3 Save new battery on fulfill jo action #71 2018-04-05 13:53:30 +08:00
2895bb772e Minor fix in import customer command #70 2018-04-05 02:47:12 +08:00
b8602a5c28 Update import commands to new format #70 2018-04-05 01:53:45 +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
9e59ecb994 Add customer job order history table in customer form #69 2018-04-04 04:28:55 +08:00
4321f70e94 Add job order event / status history #68 2018-04-04 03:51:39 +08:00
8818459689 Add TNV as a warranty class #67 2018-04-03 23:44:03 +08:00
b009199df3 Add all other batteries to compatible battery dropdown #67 2018-04-03 22:35:27 +08:00