Commit graph

302 commits

Author SHA1 Message Date
Ramon Gutierrez
5cadd27ffb Add branch name to hub column on rider table #12 2018-02-18 17:08:45 +08:00
Ramon Gutierrez
6a1658e2ea Merge branch '8-rider-schedule' into 'master'
Resolve "Rider schedule"

Closes #8

See merge request jankstudio/resq!10
2018-02-18 08:36:45 +00:00
Ramon Gutierrez
a4ae8f4726 Add rider schedule entry to rider form #8 2018-02-18 16:34:30 +08:00
Ramon Gutierrez
3c27cf53bf Add riderschedule entity #8 2018-02-18 16:34:09 +08:00
Ramon Gutierrez
8513e563f6 Add dayofweek namevalue #8 2018-02-18 16:33:57 +08:00
Ramon Gutierrez
bf42224f00 Merge branch '11-fix-select-a-vehicle-in-job-order' into 'master'
Resolve "Fix "Select a vehicle" in job order"

Closes #11

See merge request jankstudio/resq!9
2018-02-17 09:21:49 +00:00
Ramon Gutierrez
193503d5a6 Remove placeholder text for vehicle fields on processing and assigning forms #11 2018-02-17 17:12:23 +08:00
Ramon Gutierrez
056f8e368b Merge branch '6-job-order-table-auto-refresh' into 'master'
Resolve "Job order table auto-refresh"

Closes #6

See merge request jankstudio/resq!8
2018-02-17 08:51:02 +00:00
Ramon Gutierrez
277a709ead Apply auto refresh to job order list views #6 2018-02-17 16:50:30 +08:00
Ramon Gutierrez
7d8575410c Add job order refresh rate setting parameter #6 2018-02-17 16:50:03 +08:00
Ramon Gutierrez
a3911d7bdf Merge branch '4-remove-sign-up-and-forget-password' into 'master'
Resolve "Remove sign up and forget password"

Closes #4

See merge request jankstudio/resq!6
2018-02-17 07:44:28 +00:00
Ramon Gutierrez
c79cc1b52a Hide sign up and forgot password elements on login page #4 2018-02-17 15:43:37 +08:00
Ramon Gutierrez
c8132af30f Merge branch '2-remove-outlet-counter-code' into 'master'
Resolve "Remove outlet counter code"

Closes #2

See merge request jankstudio/resq!4
2018-02-17 07:13:32 +00:00
Ramon Gutierrez
036cf5209d Remove outletcounter entity #2 2018-02-17 15:10:43 +08:00
Ramon Gutierrez
34088b4e30 Merge branch '1-filter-battery-dropdown-according-to-vehicle' into 'master'
Resolve "Filter Battery dropdown according to vehicle"

Closes #1

See merge request jankstudio/resq!3
2018-02-17 06:48:25 +00:00
Ramon Gutierrez
49aaa90e37 Return only compatible batteries on job order form #1 2018-02-17 14:47:03 +08:00
Ramon Gutierrez
e360fbbbd2 Fix ajax error catcher catching aborted calls #1 2018-02-17 13:02:29 +08:00
13d4a19e6f Merge branch '10-rider-rating' into 'master'
Resolve "Rider rating"

Closes #10

See merge request jankstudio/resq!2
2018-02-16 09:00:33 +00:00
3df1470559 Add current rating field for Rider entity #10 2018-02-16 16:58:57 +08:00
dfffcc43cb Add rider rating entity #10 2018-02-16 16:58:46 +08:00
4faa2293fb Merge branch '7-rider-assignment-locking' into 'master'
Resolve "Rider assignment locking"

Closes #7

See merge request jankstudio/resq!1
2018-02-16 08:03:25 +00:00
0f546ac593 Add assignor locking for job order assigning #7 2018-02-16 16:02:16 +08:00
89093c0695 Dump test sql data for presentation 2018-02-07 22:24:32 +08:00
93b62a37a2 Add rider details in API rider status call 2018-02-07 21:47:29 +08:00
21b7727278 Add rider status API call 2018-02-07 15:23:20 +08:00
ed75a3936a Make API output for invoice item price decimal 2018-02-07 13:41:51 +08:00
ad8100fb26 Add API calls for estimate and job order request 2018-02-07 03:18:16 +08:00
9d04ff7879 Add API call for get estimate 2018-02-07 01:40:13 +08:00
7ea7e238cc Add hub branch in outlest list table 2018-02-06 16:15:09 +08:00
Ramon Gutierrez
59b1cd3b31 Hide manufacturer field from invoice 2018-02-05 13:26:16 +08:00
Ramon Gutierrez
f3ad3fe807 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-05 13:20:24 +08:00
3b4c81f03c Fix job order processing bugs 2018-02-05 13:17:12 +08:00
Ramon Gutierrez
887823eee0 Add invoice display, prevent editing on anything other than incoming tier 2018-02-05 13:14:55 +08:00
Ramon Gutierrez
075c9e7dd5 Add reset invoice button 2018-02-05 03:53:00 +08:00
Ramon Gutierrez
46ebd223a2 Regenerate invoice when changing promo 2018-02-05 03:45:28 +08:00
Ramon Gutierrez
a318d5ffcb Update battery placeholder image 2018-02-05 02:53:34 +08:00
b012c29752 Fix bug in processor display on job orders processing list 2018-02-05 01:58:46 +08:00
f79aa12fbc Add discount support to invoice generation 2018-02-05 01:43:31 +08:00
1125eba1bc Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-05 01:24:07 +08:00
a3d793087d Fix invoice generation computations 2018-02-05 01:23:38 +08:00
Ramon Gutierrez
a6b1252f73 Add outletcounter entity 2018-02-04 23:40:12 +08:00
Ramon Gutierrez
884cd7b7f1 Add image file to battery, update cleanup task for orphaned images 2018-02-04 23:10:32 +08:00
Ramon Gutierrez
74b696099c Check if filename exists before proceeding with upload 2018-02-04 20:37:04 +08:00
Ramon Gutierrez
95092c2c1b Add space between vehicle model and year in form title 2018-02-04 19:48:11 +08:00
Ramon Gutierrez
83518679ea Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-04 19:47:15 +08:00
Ramon Gutierrez
2e1573feac Update rider form hub list display + reposition plate number field 2018-02-04 19:47:02 +08:00
141212d4e6 Rename owner to processor in job order list 2018-02-04 19:43:09 +08:00
1d0aaa211a Display owner in job order list 2018-02-04 19:41:46 +08:00
Ramon Gutierrez
8d5907e0d8 Update hub list display to show branch name on outlet form 2018-02-04 19:29:36 +08:00
Ramon Gutierrez
2ee41da273 Update user form to use vertical layout 2018-02-04 19:26:44 +08:00