Commit graph

558 commits

Author SHA1 Message Date
1cc1a92853 Add reports to navigation menu #99 2018-05-08 03:53:05 +08:00
1e0b94d8ff Add acl for reports #99 2018-05-07 05:32:30 +08:00
55bc1b8a01 Merge branch '107-changes-for-ios-api' into 'master'
Resolve "Changes for ios api"

Closes #107

See merge request jankstudio/resq!93
2018-05-01 13:02:30 +00:00
ae153c60b0 Add image_url to get estimate api call #107 2018-05-01 21:01:38 +08:00
83de99aeca Merge branch '108-disable-2nd-click-on-new-jo-submission' into 'master'
Resolve "Disable 2nd click on new JO submission"

Closes #108

See merge request jankstudio/resq!92
2018-04-30 13:50:22 +00:00
13b12a8104 Disable double submit on job order form #108 2018-04-30 21:46:21 +08:00
b2e75d2b5a Merge branch '107-changes-for-ios-api' into 'master'
Resolve "Changes for ios api"

Closes #107

See merge request jankstudio/resq!91
2018-04-29 06:26:17 +00:00
2f68a184e7 Add setDateFulfill when jo is fulfilled #107 2018-04-29 14:25:34 +08:00
aecc409ce0 Merge branch '107-changes-for-ios-api' into 'master'
Resolve "Changes for ios api"

Closes #107

See merge request jankstudio/resq!90
2018-04-29 06:22:24 +00:00
921aa9bb66 Fix date fulfilled typo / bug #107 2018-04-29 14:21:30 +08:00
e957b4bc7f Merge branch '107-changes-for-ios-api' into 'master'
Resolve "Changes for ios api"

Closes #107

See merge request jankstudio/resq!89
2018-04-29 04:13:03 +00:00
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