Commit graph

325 commits

Author SHA1 Message Date
Ramon Gutierrez
cb7fffe49f Change timeline date format to 12-hour #31 2018-02-27 23:46:08 +08:00
Ramon Gutierrez
6262f933bc Add missing acl checks on list methods #30 2018-02-27 23:42:44 +08:00
Ramon Gutierrez
ab116d35ce Add view all job orders tier #26 2018-02-27 23:31:02 +08:00
13adca3721 Add service type to invoice criteria #29 2018-02-27 12:17:29 +08:00
Ramon Gutierrez
6c85108393 Add missing unlock_route tier param to open job order views #28 2018-02-27 06:43:47 +08:00
Ramon Gutierrez
ea4906d207 Merge branch 'master' into '13-job-order-reassignment'
# Conflicts:
#   src/Controller/JobOrderController.php
2018-02-26 22:36:18 +00:00
Ramon Gutierrez
c3199d80c4 Add job order cancel functionality #13 2018-02-27 06:32:15 +08:00
dddfbef619 Fix fulfillment table bug #14 2018-02-27 06:28:31 +08:00
6cd6fccb8c Add unlock processor and assignor feature for job order #14 2018-02-27 06:21:43 +08:00
Ramon Gutierrez
d0d8bb07e0 Add open role to job order #13 2018-02-27 05:53:55 +08:00
Ramon Gutierrez
84b57d82d6 Merge branch '25-customer-form-changes' into 'master'
Resolve "Customer form changes"

Closes #25

See merge request jankstudio/resq!23
2018-02-26 19:51:15 +00:00
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
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
d8e5117c2e Add related tickets table to form #22 2018-02-26 18:37:07 +08: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
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
2039ec9b3a Add job order cancel API call #20 2018-02-22 00:43:45 +08:00
6ec9f76d4d Add post rider rating API #18 2018-02-21 21:53:06 +08:00
Ramon Gutierrez
db2904f4de Add fulfillment job order list and form #15 2018-02-19 23:28:50 +08: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
fb0b66de3d Add user hub assignments #17 2018-02-18 17:46:10 +08:00
Ramon Gutierrez
6d1a45ddf9 Add sap_code to battery entity/form #16 2018-02-18 17:17:47 +08:00
Ramon Gutierrez
5cadd27ffb Add branch name to hub column on rider table #12 2018-02-18 17:08:45 +08: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
277a709ead Apply auto refresh to job order list views #6 2018-02-17 16:50:30 +08:00
Ramon Gutierrez
036cf5209d Remove outletcounter entity #2 2018-02-17 15:10:43 +08:00
Ramon Gutierrez
49aaa90e37 Return only compatible batteries on job order form #1 2018-02-17 14:47:03 +08: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
0f546ac593 Add assignor locking for job order assigning #7 2018-02-16 16:02:16 +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
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
46ebd223a2 Regenerate invoice when changing promo 2018-02-05 03:45:28 +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
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
006db8a286 Add pessimistic locking for job order processing 2018-02-04 18:49:16 +08:00
Ramon Gutierrez
5c306c1723 Redirect add ticket to edit customer page if applicable 2018-02-04 17:14:11 +08:00
Ramon Gutierrez
5d05043034 Redirect ticket form back to customer update path if applicable 2018-02-04 17:11:28 +08:00
Ramon Gutierrez
dd5fbf7cd6 Restore using isset instead of in_array for number and vehicle whitelisting on customer 2018-02-04 16:55:06 +08:00
Ramon Gutierrez
2b0f97a678 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-04 16:46:35 +08:00
Ramon Gutierrez
ff4ec511e4 Remove date_confirmed from mobile number + fix index bug on deletion of existing customer vehicle 2018-02-04 16:46:23 +08:00
c9af452629 Add API call to list ongoing job orders 2018-02-04 13:44:27 +08:00
b210401150 Change id to cv_id in list vehicles 2018-02-04 12:54:14 +08:00
46ad945686 Add reverse association for processed_by 2018-02-04 12:39:48 +08:00
8252d3cf1c Add default value to customer notes 2018-02-04 12:31:58 +08:00
23afaade96 Add default value to customer classificiation 2018-02-04 12:28:52 +08:00
3dff90da90 Add id to list vehicles for API 2018-02-04 12:13:59 +08:00
59d76c3975 Add locking version in job order entities and place TODOs in controller 2018-02-04 04:00:38 +08:00
Ramon Gutierrez
8ad354c8c3 Make contact number nullable on ticket, fix update behavior to retain old name and number values even if customer is associated 2018-02-02 03:21:14 +08:00
9841d5c215 Fix delete number / vehicle bug in customer 2018-02-02 03:06:00 +08:00
fac3c409c4 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-02 02:48:22 +08:00
ddb642a95f Refactor customer form and fix bugs 2018-02-02 02:48:00 +08:00
Ramon Gutierrez
92035b99bf Use new invoice generation behavior on job order form 2018-02-02 02:31:22 +08:00
Ramon Gutierrez
6c79281ff0 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-01 23:14:56 +08:00
Ramon Gutierrez
fb5d36aca6 Add promo selection to job order invoice form 2018-02-01 23:14:49 +08:00
687f1b0ff9 Add more work on InvoiceCreator 2018-02-01 23:12:50 +08:00
85a0f972c7 Fix Customer bug when no vehicle or mobile number is selected 2018-02-01 23:11:57 +08:00
ec68b7a787 Add getName method to NameValue class 2018-02-01 23:11:34 +08:00
Ramon Gutierrez
ef2dccdf57 Automatically set status for job orders when submitting form, set hub as mandatory on outlets 2018-02-01 17:11:09 +08:00
Ramon Gutierrez
2ec8a369f6 Add crud for promos, discountapply name value collection 2018-02-01 15:07:43 +08:00
Ramon Gutierrez
8a2e75f999 Move getting collection data outside of loops 2018-02-01 15:06:56 +08:00
Ramon Gutierrez
1efd5250e8 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-01 04:18:34 +08:00
Ramon Gutierrez
cbde853935 Add command to import csv for outlets and hubs 2018-02-01 04:18:11 +08:00
b6ce9d8ad8 Fix missing semicolon 2018-02-01 03:00:17 +08:00
83a162b4ab Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-01 01:36:08 +08:00
04cd0c59eb Add initial invoice capability 2018-02-01 01:35:47 +08:00
Ramon Gutierrez
9e7e937835 Add backend for saving warranty class on job order 2018-02-01 00:47:35 +08:00
Ramon Gutierrez
b6786895bd Update battery search labels to not include product code 2018-02-01 00:46:24 +08:00
Ramon Gutierrez
87ebf9f19b Add warranty class name value collection 2018-02-01 00:45:41 +08:00
Ramon Gutierrez
0654895dab Add warranty class to job order 2018-02-01 00:44:29 +08:00
Ramon Gutierrez
4a1ae3f539 Update asserts for battery price 2018-02-01 00:44:06 +08:00
Ramon Gutierrez
8f4b745025 Update list columns and fields based on feedback 2018-01-31 23:56:25 +08:00
Ramon Gutierrez
7bf2b7aa5d Add branch field to hub and outlet, create location trait 2018-01-31 23:55:51 +08:00
Ramon Gutierrez
fa5122235a Add customer classification field 2018-01-31 23:55:16 +08:00
Ramon Gutierrez
83cd3a008b Replace warranty personal with warranty private 2018-01-31 20:25:47 +08:00
Ramon Gutierrez
d0d83531bb Add fuel type and vehicle status condition name value collections 2018-01-31 15:30:04 +08:00
Ramon Gutierrez
034386aa59 Set all name value pair collections to extend from generic class 2018-01-31 13:35:10 +08:00
196850f7b6 Add generic NameValue class for name value pair collections 2018-01-31 13:17:55 +08:00
Ramon Gutierrez
d0d0c04c5d Add subject field to tickets 2018-01-31 12:04:52 +08:00
Ramon Gutierrez
6be23b27c5 Add user profile form 2018-01-31 06:14:46 +08:00
Ramon Gutierrez
72112ebe6c Initial commit for ticketing system 2018-01-31 05:59:48 +08:00
Ramon Gutierrez
bf0bd708e8 Fix erroneous assert annotations 2018-01-31 05:59:00 +08:00
Ramon Gutierrez
40a4e96632 Change time format on job order list 2018-01-31 04:02:29 +08:00
Ramon Gutierrez
9d74fd9a1d Add ticket entity and associations 2018-01-31 03:03:28 +08:00
Ramon Gutierrez
bc80f7100f Fix variable names for first and last name setters 2018-01-31 03:03:17 +08:00
Ramon Gutierrez
28e5f97ad4 Remove leftover error_log for job order status 2018-01-31 03:02:51 +08:00
Ramon Gutierrez
b21c563102 Record assigning user and datetime for job orders 2018-01-31 02:46:00 +08:00
Ramon Gutierrez
c0ecc1114c Initial commit for assigning screens for job orders 2018-01-31 02:31:04 +08:00
Ramon Gutierrez
8a2c84bdfd Add mobile number to customer vehicle search string for job order 2018-01-30 23:38:48 +08:00
Ramon Gutierrez
4884ef893f Highlight scheduled job orders on processing list 2018-01-30 23:38:01 +08:00
Ramon Gutierrez
29a838b1a8 Change destination marker image, add backend functionality for job order processing stage 2018-01-30 22:05:32 +08:00
Ramon Gutierrez
2b4c289ba9 Filter nearest outlets by open and close times 2018-01-30 19:47:39 +08:00
Ramon Gutierrez
d86b9f33a0 Fix sort by hub issue for rider list + add hub selection to outlets 2018-01-30 16:08:04 +08:00
Ramon Gutierrez
161778cfef Add plate number field to rider 2018-01-30 14:57:16 +08:00
Ramon Gutierrez
d97cbeaa45 Fix controller to save customer notes 2018-01-30 14:28:08 +08:00
Ramon Gutierrez
5e910be1e7 Set customer vehicle name as optional, fix customer form to work with new gas and status values 2018-01-30 12:52:39 +08:00
Ramon Gutierrez
66e70e4684 Add customer notes field to customer form 2018-01-30 12:19:29 +08:00
d53d51f499 Fix comment on date format 2018-01-30 01:50:38 +08:00
ae46f9068c Add more API calls 2018-01-30 00:02:59 +08:00
189b2e9a01 Add more API calls 2018-01-29 22:02:28 +08:00
b18d02f521 Add new API calls: info get, info update, status 2018-01-29 10:12:14 +08:00
fea805e385 Make api json_encode result use JSON_FORCE_OBJECT 2018-01-29 08:36:08 +08:00
e3a41febc5 Rename mobile session setDateConfirm to setDateConfirmed 2018-01-28 13:51:57 +08:00
e56929dbcc Refactor API controller for ease of use 2018-01-28 13:38:06 +08:00
f7c9931d9f Add nullable fields to fix register bug 2018-01-28 13:37:50 +08:00
18233f3567 Modify string length for job order service type 2018-01-28 05:20:03 +08:00
f5cce11738 Add routes and initial controller for API calls 2018-01-28 05:18:56 +08:00
db0a53fd1e Adjust mobile session entity 2018-01-28 05:17:25 +08:00
bcfa77151c Add map for viewing nearby outlets in job order processing 2018-01-18 10:07:54 +08:00
Ramon Gutierrez
798dd5e599 Only display km values for distance 2018-01-18 01:39:50 +08:00
Ramon Gutierrez
86f69e8056 Fix outlet row highlighting bug, format distance and duration into friendly time 2018-01-18 01:37:15 +08:00
Ramon Gutierrez
a614366a5a Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-18 01:18:49 +08:00
Ramon Gutierrez
4a216996ae Add job order processing form 2018-01-18 01:18:37 +08:00
84c8606894 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-17 23:54:22 +08:00
7811c8a66e Add validations and checks for outlet 2018-01-17 23:54:00 +08:00
Ramon Gutierrez
139cbdfc3d Initial commit for job order list (processing) 2018-01-17 23:53:54 +08:00
Ramon Gutierrez
2e0efa0b35 Rename incoming.html.twig to form.html.twig to keep standard 2018-01-17 23:14:18 +08:00
14b432a11e Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-17 22:51:45 +08:00
1f4ae0e386 Improve output of map tools 2018-01-17 22:51:13 +08:00
Ramon Gutierrez
627f850bfb Initial commit for saving incoming job order form 2018-01-17 22:37:31 +08:00
Ramon Gutierrez
a2311d7f03 Add delivery address to job order entity 2018-01-17 21:46:23 +08:00
Ramon Gutierrez
3132812308 Add invoice ui elements and form submission to incoming job order form 2018-01-17 20:42:09 +08:00
Ramon Gutierrez
1d4450821d Merge branch 'master' of gitlab.com:jankstudio/resq 2018-01-17 18:12:54 +08:00
Ramon Gutierrez
2572b0284d Add getter for simple array of mobile numbers 2018-01-17 18:12:24 +08:00