Commit graph

664 commits

Author SHA1 Message Date
Ramon Gutierrez
c9d6b232ee Add null check for promo type #143 2018-06-18 15:20:23 +08:00
Ramon Gutierrez
352dcf2809 Add missing fields to jo pdf #143 2018-06-17 00:34:25 +08:00
afd7f61da3 Merge branch '137-make-sure-number-is-reflected-in-control-center-for-mobile-app-users' into 'master'
Resolve "Make sure number is reflected in control center for mobile app users"

Closes #137

See merge request jankstudio/resq!140
2018-06-11 22:02:01 +00:00
778436844c Set date cancel for all jo cancel operations #137 2018-06-12 06:01:11 +08:00
f5b220f55b Merge branch '137-make-sure-number-is-reflected-in-control-center-for-mobile-app-users' into 'master'
Resolve "Make sure number is reflected in control center for mobile app users"

Closes #137

See merge request jankstudio/resq!139
2018-06-11 18:30:59 +00:00
1101e61f5f Fix order of arguments in substr call to phone number #137 2018-06-12 02:30:18 +08:00
24687364f2 Merge branch '140-display-compatible-batteries-in-edit-vehicle' into 'master'
Resolve "Display compatible batteries in edit vehicle"

Closes #140

See merge request jankstudio/resq!138
2018-06-11 15:25:35 +00:00
2d29ced74c Add compatible battery list for vehicle edit screen #140 2018-06-11 23:24:55 +08:00
8a67d23490 Merge branch '109-fix-error-message-when-logging-in' into 'master'
Resolve "Fix error message when logging in"

Closes #109

See merge request jankstudio/resq!137
2018-06-11 14:30:40 +00:00
f78d6da6b3 Fix error message appearing for login #109 2018-06-11 22:25:39 +08:00
c46d43b001 Merge branch '138-fix-api-service-history-bug' into 'master'
Resolve "Fix api service history bug"

Closes #138

See merge request jankstudio/resq!136
2018-06-11 07:47:20 +00: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
b8ab24eccc Merge branch '136-fix-privacy-required-fields' into 'master'
Resolve "Fix privacy required fields"

Closes #136

See merge request jankstudio/resq!132
2018-06-06 19:11:01 +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
3c552b6c82 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!130
2018-06-05 20:25:09 +00:00
352ca77130 Add debug info for mqtt client #133 2018-06-06 04:24:30 +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
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
a8e73e35ab Merge branch '134-white-list-capability-for-cars-for-mobile-app' into 'master'
Resolve "White list capability for cars for mobile app"

Closes #134

See merge request jankstudio/resq!120
2018-06-03 21:52:03 +00: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
78a2cf4b36 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!119
2018-06-03 19:29:40 +00:00
f4d4a6e3a0 Add mqttclient service to send mqtt events #133 2018-06-04 03:28:37 +08:00
c0d52c3800 Merge branch '132-more-rider-api-calls' into 'master'
Resolve "More rider api calls"

Closes #132

See merge request jankstudio/resq!118
2018-05-28 12:17:28 +00:00
2be0abb716 Fix bug with missing entity manager for rider api calls #132 2018-05-28 20:16:26 +08:00
041657caad Merge branch '132-more-rider-api-calls' into 'master'
Resolve "More rider api calls"

Closes #132

See merge request jankstudio/resq!117
2018-05-28 10:44:53 +00:00
70af6935ef Fix typo error in setAvailable #132 2018-05-28 18:44:07 +08:00
379eadac69 Merge branch '132-more-rider-api-calls' into 'master'
Resolve "More rider api calls"

Closes #132

See merge request jankstudio/resq!116
2018-05-28 10:11:13 +00:00
0000318495 Modify rider availability on login and logout from rider api #132 2018-05-28 18:09:25 +08:00
8121517ab1 Merge branch '132-more-rider-api-calls' into 'master'
Resolve "More rider api calls"

Closes #132

See merge request jankstudio/resq!115
2018-05-28 09:02:32 +00:00