Commit graph

538 commits

Author SHA1 Message Date
Ramon Gutierrez
8baa8734bc Add title and active fields to customer form and list #25 2018-02-27 03:50:28 +08:00
ec6ca96f7d Merge branch '27-handling-jumpstart-on-invoice-computation-for-job-order' into 'master'
Resolve "Handling jumpstart on invoice computation for job order"

Closes #27

See merge request jankstudio/resq!24
2018-02-26 19:44:50 +00:00
d4e28cd332 Add service type to invoice computation #27 2018-02-27 03:43:30 +08:00
Ramon Gutierrez
c23845ce14 Add flag_active and title fields to customer #25 2018-02-27 03:11:29 +08:00
Ramon Gutierrez
394d4c926a Merge branch '24-job-order-form-changes' into 'master'
Resolve "Job Order form changes"

Closes #24

See merge request jankstudio/resq!22
2018-02-26 18:47:39 +00:00
Ramon Gutierrez
d77dbcd209 Sort compatible battery list by highest price #24 2018-02-27 02:46:52 +08:00
Ramon Gutierrez
cae5a5bbac Add reference job order selector to incoming form #24 2018-02-27 02:37:29 +08:00
Ramon Gutierrez
b1e1612a4b Add reference job order to job order entity #24 2018-02-27 02:37:20 +08:00
Ramon Gutierrez
172e09c2ef Add ref_jo association to job order #24 2018-02-26 22:41:28 +08:00
Ramon Gutierrez
730f18c813 Merge branch '23-change-mobile-number-to-contact-number' into 'master'
Resolve "Change mobile number to contact number"

Closes #23

See merge request jankstudio/resq!21
2018-02-26 10:48:13 +00:00
Ramon Gutierrez
6c57325f80 Change customer mobile numbers to general contact numbers #23 2018-02-26 18:46:55 +08:00
Ramon Gutierrez
fbd52281e4 Merge branch '22-related-tickets' into 'master'
Resolve "Related tickets"

Closes #22

See merge request jankstudio/resq!20
2018-02-26 10:38:16 +00:00
Ramon Gutierrez
d8e5117c2e Add related tickets table to form #22 2018-02-26 18:37:07 +08:00
Ramon Gutierrez
de9d3d92ab Merge branch '21-ticket-changes' into 'master'
Resolve "Ticket changes"

Closes #21

See merge request jankstudio/resq!19
2018-02-26 09:53:51 +00:00
Ramon Gutierrez
50347027a3 Add job order ticket form blocks #21 2018-02-26 17:52:38 +08:00
Ramon Gutierrez
7b39419710 Link tickets to job order #21 2018-02-26 17:52:10 +08:00
Ramon Gutierrez
4aee9f8cde Move ticket type fields to top of form #21 2018-02-26 16:17:50 +08:00
Ramon Gutierrez
7cc7c81d98 Add plate number to tickets #21 2018-02-26 15:33:38 +08:00
Ramon Gutierrez
fd982a1e05 Update ticket types #21 2018-02-26 15:14:38 +08:00
787eb32afd Merge branch '20-job-order-cancel-api' into 'master'
Resolve "Job order cancel API"

Closes #20

See merge request jankstudio/resq!18
2018-02-21 16:44:36 +00:00
2039ec9b3a Add job order cancel API call #20 2018-02-22 00:43:45 +08:00
5e6c5297ca Merge branch '18-rider-rating-api' into 'master'
Resolve "Rider Rating API"

Closes #18

See merge request jankstudio/resq!17
2018-02-21 13:55:50 +00:00
6ec9f76d4d Add post rider rating API #18 2018-02-21 21:53:06 +08:00
Ramon Gutierrez
e878d646f6 Merge branch '19-replace-form-cancel-button-labels-with-back' into 'master'
Resolve "Replace form Cancel button labels with "Back""

Closes #19

See merge request jankstudio/resq!15
2018-02-19 17:14:07 +00:00
Ramon Gutierrez
a0020a92d4 Change labels of form cancel buttons to back #19 2018-02-20 01:08:00 +08:00
Ramon Gutierrez
cf7bb934e1 Merge branch '15-job-order-close-functionality' into 'master'
Resolve "Job order close functionality"

Closes #15

See merge request jankstudio/resq!14
2018-02-19 15:29:40 +00:00
Ramon Gutierrez
db2904f4de Add fulfillment job order list and form #15 2018-02-19 23:28:50 +08:00
Ramon Gutierrez
61a5a988cc Merge branch '17-job-order-assignment-fix' into 'master'
Resolve "Job Order Assignment Fix"

Closes #17

See merge request jankstudio/resq!13
2018-02-19 06:15:28 +00:00
Ramon Gutierrez
226da99ae4 Edit getfullname format for location #17 2018-02-19 14:13:49 +08:00
Ramon Gutierrez
e124b0cebd Fix job order form to use hubs instead of outlets #17 2018-02-19 14:11:56 +08:00
Ramon Gutierrez
d4cc431bac Associate job orders with hubs instead of outlets, filter assigning list to user assigned hubs only #17 2018-02-19 13:51:07 +08:00
Ramon Gutierrez
bc65a4ac39 Change form section header to hub assignment #17 2018-02-19 01:09:03 +08:00
Ramon Gutierrez
fb0b66de3d Add user hub assignments #17 2018-02-18 17:46:10 +08:00
Ramon Gutierrez
137a46d3ce Merge branch '16-add-sap_code-column-to-battery-entity' into 'master'
Resolve "Add sap_code column to Battery entity"

Closes #16

See merge request jankstudio/resq!12
2018-02-18 09:19:35 +00:00
Ramon Gutierrez
6d1a45ddf9 Add sap_code to battery entity/form #16 2018-02-18 17:17:47 +08:00
Ramon Gutierrez
496adb458b Merge branch '12-rider-table-hub-display' into 'master'
Resolve "Rider table hub display"

Closes #12

See merge request jankstudio/resq!11
2018-02-18 09:09:34 +00:00
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