|
|
1b3c0409df
|
Add workaround for battery images in mobile app #107
|
2018-04-29 12:12:22 +08:00 |
|
|
|
d7f4f30cc0
|
Merge branch '106-allow-super-admin-to-do-rider-assignment-regardless-of-locking' into 'master'
Resolve "Allow super admin to do rider assignment regardless of locking"
Closes #106
See merge request jankstudio/resq!88
|
2018-04-26 20:21:38 +00:00 |
|
|
|
b5274be3b5
|
Allow super admin to do rider assignment even when locked to other user #106
|
2018-04-27 04:20:47 +08:00 |
|
|
|
82742bab7d
|
Merge branch '105-make-open-jo-searchable-by-phone-number' into 'master'
Resolve "Make open JO searchable by phone number"
Closes #105
See merge request jankstudio/resq!87
|
2018-04-25 10:10:17 +00:00 |
|
|
|
3d053c8fee
|
Add phone number search for jo open list #105
|
2018-04-25 18:08:34 +08:00 |
|
|
|
388b8233c9
|
Merge branch '98-search-by-phone-number-jo' into 'master'
Resolve "Search by phone number (JO)"
Closes #98
See merge request jankstudio/resq!86
|
2018-04-24 17:40:27 +00:00 |
|
|
|
4dd708a8ac
|
Add customer name and mobile phone searching for view all jo list #98
|
2018-04-25 01:39:21 +08:00 |
|
|
|
7822797280
|
Merge branch '100-search-by-plate-number-customer' into 'master'
Resolve "Search by plate number (Customer)"
Closes #100
See merge request jankstudio/resq!85
|
2018-04-24 16:34:33 +00:00 |
|
|
|
7ff058864a
|
Add search by plate number on customer list #100
|
2018-04-25 00:33:42 +08:00 |
|
|
|
4ac54bfe21
|
Merge branch '103-add-cancel-button-for-fulfilled-jo-in-view-all' into 'master'
Resolve "Add cancel button for fulfilled JO in view all"
Closes #103
See merge request jankstudio/resq!84
|
2018-04-24 15:59:05 +00:00 |
|
|
|
aea22c7e11
|
Allow fulfilled job orders to be cancelled #103
|
2018-04-24 23:57:45 +08:00 |
|
|
|
23dbe7552c
|
Merge branch '104-fix-items-for-ios-user-app' into 'master'
Resolve "Fix items for iOS user app"
Closes #104
See merge request jankstudio/resq!83
|
2018-04-24 12:09:43 +00: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 |
|
|
|
4ca630659b
|
Merge branch '96-bug-in-employee-discount-computation' into 'master'
Resolve "Bug in employee discount computation"
Closes #96
See merge request jankstudio/resq!82
|
2018-04-19 03:01:32 +00:00 |
|
|
|
757ec209ad
|
Fix OPL formula in discount calculation #96
|
2018-04-19 11:00:33 +08:00 |
|
|
|
7b577ccb43
|
Merge branch '101-bug-jo-2099-referenced-jo-cannot-select-hub' into 'master'
Resolve "Bug JO 2099, referenced jo, cannot select hub"
Closes #101
See merge request jankstudio/resq!81
|
2018-04-19 02:37:09 +00:00 |
|
|
|
392396e64a
|
Fix js bug when dispatching jo with reference jo #101
|
2018-04-19 10:36:12 +08:00 |
|
|
|
9f74f62a9b
|
Merge branch '102-bug-jo-2690-make-sure-open-edit-does-not-touch-status' into 'master'
Resolve "Bug JO 2690, make sure open edit does not touch status"
Closes #102
See merge request jankstudio/resq!80
|
2018-04-19 01:33:31 +00:00 |
|
|
|
88c7da7b2a
|
Remove set status on open edit submit #102
|
2018-04-19 09:31:04 +08:00 |
|
|
|
54f5995238
|
Merge branch '94-search-by-phone-name' into 'master'
Resolve "Search by phone / name"
Closes #94
See merge request jankstudio/resq!79
|
2018-04-18 05:51:30 +00:00 |
|
|
|
57c9da8adf
|
Add search for first name or last name in open job order list #94
|
2018-04-18 13:49:40 +08:00 |
|
|
|
782b1e8c00
|
Add customer name in jo open list #94
|
2018-04-18 13:49:26 +08:00 |
|
|
|
99251b8b1c
|
Merge branch '93-edit-jo-feature' into 'master'
Resolve "Edit jo feature"
Closes #93
See merge request jankstudio/resq!78
|
2018-04-18 04:09:31 +00:00 |
|
|
|
abe1b8bb3d
|
Add open edit JO feature #93
|
2018-04-18 11:51:45 +08:00 |
|
root
|
d036460a3f
|
Set profiler to only exceptions because of size constraint #bug
|
2018-04-18 08:57:03 +08:00 |
|
|
|
9ad3508061
|
Merge branch '91-jo-list-search-by-plate-number' into 'master'
Resolve "JO list search by plate number"
Closes #91
See merge request jankstudio/resq!77
|
2018-04-13 14:42:30 +00:00 |
|
|
|
04448c03a0
|
Increase limit of nearest hubs to 20 #91
|
2018-04-13 22:41:33 +08:00 |
|
|
|
283583d16a
|
Merge branch '91-jo-list-search-by-plate-number' into 'master'
Resolve "JO list search by plate number"
Closes #91
See merge request jankstudio/resq!76
|
2018-04-12 14:26:05 +00:00 |
|
|
|
2ecb3b142a
|
Change job order all and open search to sarch for plate number #91
|
2018-04-12 22:24:31 +08:00 |
|
root
|
da5936a559
|
Add latest sql dump for migration #migrate
|
2018-04-12 16:35:28 +08:00 |
|
root
|
73eba785e8
|
Add final migration sql script from jankstudio to production #migrate
|
2018-04-11 23:06:05 +08:00 |
|
root
|
61fea81d69
|
Add latest backup sql #uat
|
2018-04-11 14:56:22 +08:00 |
|
|
|
46844695ec
|
Merge branch '89-optimize-search-for-customer-vehicle-in-incoming-jo' into 'master'
Resolve "Optimize search for customer vehicle in incoming JO"
Closes #89
See merge request jankstudio/resq!75
|
2018-04-10 15:38:35 +00: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 |
|
|
|
cf6c72c230
|
Merge branch '88-add-general-services-under-warranty-service-type' into 'master'
Resolve "Add "general services - under warranty" service type"
Closes #88
See merge request jankstudio/resq!74
|
2018-04-09 14:30:49 +00:00 |
|
|
|
5b5fbd7555
|
Add general service - under warranty service type #88
|
2018-04-09 22:30:00 +08:00 |
|
|
|
32a6c979d8
|
Merge branch '86-fix-mode-of-payment-always-being-cash-bug' into 'master'
Resolve "Fix mode of payment always being cash bug"
Closes #86
See merge request jankstudio/resq!73
|
2018-04-09 13:18:15 +00:00 |
|
|
|
23fbaf1e13
|
Fix mode of payment bug in jo incoming #86
|
2018-04-09 21:17:20 +08:00 |
|
|
|
4e8ba8ac52
|
Merge branch '84-fix-job-order-incoming-cv-submit-bug' into 'master'
Resolve "Fix job order incoming cv submit bug"
Closes #84
See merge request jankstudio/resq!72
|
2018-04-09 08:12:24 +00:00 |
|
|
|
98e0f81f4f
|
Fix bug that doesn't set make on edit vehicle in customer form #84
|
2018-04-09 16:11:28 +08:00 |
|
|
|
acad5fa06b
|
Merge branch '84-fix-job-order-incoming-cv-submit-bug' into 'master'
Resolve "Fix job order incoming cv submit bug"
Closes #84
See merge request jankstudio/resq!71
|
2018-04-09 05:18:28 +00:00 |
|
|
|
1a60b6d632
|
Fix bug in jo submission for create jo from cv #84
|
2018-04-09 13:17:28 +08:00 |
|
|
|
4e633033ba
|
Merge branch '83-make-battery-dropdown-display-in-cvehicle-incoming-job-order' into 'master'
Resolve "Make battery dropdown display in cvehicle incoming job order"
Closes #83
See merge request jankstudio/resq!70
|
2018-04-09 04:42:17 +00: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 |
|
