rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions
731 commits 749 branches 8 tags 145 MiB
Commit graph

306 commits

Author SHA1 Message Date
Kendrick Chan
04448c03a0 Increase limit of nearest hubs to 20 #91 2018-04-13 22:41:33 +08:00
Kendrick Chan
2ecb3b142a Change job order all and open search to sarch for plate number #91 2018-04-12 22:24:31 +08:00
Kendrick Chan
42f3048d12 Optimize incoming jo customer vehicle search #89 2018-04-10 23:37:34 +08:00
Kendrick Chan
315a369a3b Hide error_log debugging in job order controller #89 2018-04-10 20:13:09 +08:00
Kendrick Chan
23fbaf1e13 Fix mode of payment bug in jo incoming #86 2018-04-09 21:17:20 +08:00
Kendrick Chan
1a60b6d632 Fix bug in jo submission for create jo from cv #84 2018-04-09 13:17:28 +08:00
Kendrick Chan
e1c4a9e40d Fix jo incoming from cv to display and handle invoice editing properly #83 2018-04-09 12:41:10 +08:00
Kendrick Chan
c29de550d5 Make sure job order reassign hub / rider sets prossesed by and assigned by properly #82 2018-04-09 01:15:47 +08:00
Kendrick Chan
5bbfff6dd4 Limit JO incoming search to plate number #78 2018-04-07 10:11:38 +08:00
Kendrick Chan
3642b2225e Fix permission bug in customer link showing #77 2018-04-06 17:49:41 +08:00
Kendrick Chan
e383a66e8f Add pdf workaround #76 2018-04-06 16:04:31 +08:00
Kendrick Chan
0ced0735a3 Save new battery on fulfill jo action #71 2018-04-05 13:53:30 +08:00
Kendrick Chan
c5fe392cae Modify invoice creator to properly compute for trade-ins based on size #70 2018-04-04 21:23:26 +08:00
Kendrick Chan
ef85141587 Add trade-in prices in entity, controller and templates #70 2018-04-04 17:43:04 +08:00
Kendrick Chan
4321f70e94 Add job order event / status history #68 2018-04-04 03:51:39 +08:00
Kendrick Chan
b009199df3 Add all other batteries to compatible battery dropdown #67 2018-04-03 22:35:27 +08:00
Kendrick Chan
190ab8ceaf Add schedule and adjust schedule date to display date and time always #67 2018-04-03 21:38:45 +08:00
Kendrick Chan
69bf01fa27 Make customer add and edit forward back to edit form #62 2018-04-01 02:44:15 +08:00
Kendrick Chan
e371d9900d Allow user to create JO from customer vehicle #62 2018-04-01 02:22:24 +08:00
Kendrick Chan
f6145d45f1 Merge branch '52-migrate-contact-and-job-order-scripts' into 'master' 
Resolve "Migrate contact and job order scripts"

Closes #52

See merge request jankstudio/resq!50
 2018-03-21 19:24:48 +00:00
Kendrick Chan
1e2df32443 Add migration script and initial sql dump for customer and customer vehicle #52 2018-03-22 03:23:11 +08:00
Kendrick Chan
29e9c7864e Add job order counters to open job order form #55 2018-03-15 14:06:55 +08:00
Kendrick Chan
13f7676b6b Fixed ... shortening for tables in batteries and vehicles #51 2018-03-14 22:29:12 +08:00
Kendrick Chan
ce6627e21a Add active flag in rider form #49 2018-03-14 21:51:24 +08:00
Kendrick Chan
48f30f4dd9 Remove access check for ajax call on vehicle manufacturer #48 2018-03-14 19:34:15 +08:00
Kendrick Chan
30b67386a6 Add migration tool for batteries and vehicles #UAT 2018-03-13 03:37:40 +08:00
Kendrick Chan
9ad5f2557b Implement counters and fix rider flow #UAT 2018-03-12 18:32:59 +08:00
Kendrick Chan
ecd9ee0dcf Remove service type display in jo process list #UAT 2018-03-12 02:40:15 +08:00
Kendrick Chan
bc4a2ac7f7 Add promo detail field in job order #UAT 2018-03-12 01:36:11 +08:00
Kendrick Chan
f807c7041e Add email field to customer #UAT 2018-03-12 00:15:51 +08:00
Kendrick Chan
017a8bb30d Add landmark field #UAT 2018-03-11 04:01:14 +08:00
Kendrick Chan
a7ffb58fc8 Fix ticket functionality related to contact numbers #UAT 2018-03-11 02:44:44 +08:00
Kendrick Chan
5c18619e80 Fix contact number related bugs #UAT 2018-03-11 02:36:13 +08:00
Kendrick Chan
caf981e4a6 Fix and refactor customer controller and template #UAT 2018-03-10 21:47:27 +08:00
Kendrick Chan
5769e1c366 Replace contact numbers with individual numbers in customer entity, controllers, and templates #UAT 2018-03-10 14:18:07 +08:00
Kendrick Chan
99401b95e6 Add OR Name to job order entity and controller (incoming) and templates #UAT 2018-03-10 02:21:55 +08:00
Kendrick Chan
8d1554a4b9 Add transaction origin / source to job order templates, controllers and entity #UAT 2018-03-10 01:44:43 +08:00
Kendrick Chan
eab86ec007 Rename Processing to Dispatch #UAT 2018-03-09 23:49:32 +08:00
Kendrick Chan
b37dbd5986 Add driver_assigned event #45 2018-03-08 11:56:25 +08:00
Kendrick Chan
d182c64b1f Rename start_rating MQTT event to fulfilled 2018-03-08 10:04:31 +08:00
Kendrick Chan
4120677cb0 Add service type to invoice criteria calls #43 2018-03-08 03:13:27 +08:00
Kendrick Chan
f5c7d17d2f Add MQTT event sending #41 2018-03-08 02:09:58 +08:00
Kendrick Chan
7ef92bad99 Change getOutlet to getHub for get rider call #41 2018-03-07 22:11:55 +08:00
Kendrick Chan
4811d7d1cf Fix edit rider by initializing has_schedule #40 2018-03-07 22:07:12 +08:00
Kendrick Chan
e987f22fa6 Initialize array for rider schedule #39 2018-03-07 21:46:17 +08:00
Ramon Gutierrez
03f6b40ed3 Add mandatory cancellation reason to prompt #34 2018-03-02 03:26:47 +08:00
Kendrick Chan
eabee25db9 Fix job order related bugs #33 2018-03-01 07:39:17 +08:00
Kendrick Chan
36e4219f99 Add support for mode of payment dropdown #33 2018-03-01 07:28:59 +08:00
Kendrick Chan
ad04131515 Add Tier 1 and Tier 2 notes #33 2018-03-01 04:15:44 +08:00
Kendrick Chan
fbdcd6f31f Initialize job_order to null if not found #32 2018-03-01 02:39:18 +08:00
Kendrick Chan
5cb38e8907 Use getName static method for NameValue values #32 2018-03-01 02:34:51 +08:00
Kendrick Chan
6d78c37435 Merge branch '29-handle-under-warranty-with-invoice-generator' into 'master' 
Resolve "Handle under warranty with invoice generator"

Closes #29

See merge request jankstudio/resq!31
 2018-02-27 17:43:43 +00:00
Kendrick Chan
1dd51a8dd3 Add support for invoice generation for under warranty #29 2018-02-28 01:42:09 +08:00
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
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
Kendrick Chan
dddfbef619 Fix fulfillment table bug #14 2018-02-27 06:28:31 +08:00
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
d4e28cd332 Add service type to invoice computation #27 2018-02-27 03:43:30 +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
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
7cc7c81d98 Add plate number to tickets #21 2018-02-26 15:33:38 +08:00
Kendrick Chan
2039ec9b3a Add job order cancel API call #20 2018-02-22 00:43:45 +08:00
Kendrick Chan
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
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
277a709ead Apply auto refresh to job order list views #6 2018-02-17 16:50:30 +08:00
Ramon Gutierrez
49aaa90e37 Return only compatible batteries on job order form #1 2018-02-17 14:47:03 +08:00
Kendrick Chan
0f546ac593 Add assignor locking for job order assigning #7 2018-02-16 16:02:16 +08:00
Kendrick Chan
93b62a37a2 Add rider details in API rider status call 2018-02-07 21:47:29 +08:00
Kendrick Chan
21b7727278 Add rider status API call 2018-02-07 15:23:20 +08:00
Kendrick Chan
ed75a3936a Make API output for invoice item price decimal 2018-02-07 13:41:51 +08:00
Kendrick Chan
ad8100fb26 Add API calls for estimate and job order request 2018-02-07 03:18:16 +08:00
Kendrick Chan
9d04ff7879 Add API call for get estimate 2018-02-07 01:40:13 +08:00
Kendrick Chan
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
Kendrick Chan
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
Kendrick Chan
b012c29752 Fix bug in processor display on job orders processing list 2018-02-05 01:58:46 +08:00
Kendrick Chan
1125eba1bc Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-05 01:24:07 +08:00
Kendrick Chan
a3d793087d Fix invoice generation computations 2018-02-05 01:23:38 +08:00
Ramon Gutierrez
884cd7b7f1 Add image file to battery, update cleanup task for orphaned images 2018-02-04 23:10:32 +08:00
Kendrick Chan
141212d4e6 Rename owner to processor in job order list 2018-02-04 19:43:09 +08:00
Kendrick Chan
1d0aaa211a Display owner in job order list 2018-02-04 19:41:46 +08:00
Kendrick Chan
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
Kendrick Chan
c9af452629 Add API call to list ongoing job orders 2018-02-04 13:44:27 +08:00
Kendrick Chan
b210401150 Change id to cv_id in list vehicles 2018-02-04 12:54:14 +08:00
Kendrick Chan
3dff90da90 Add id to list vehicles for API 2018-02-04 12:13:59 +08:00
Kendrick Chan
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
Kendrick Chan
9841d5c215 Fix delete number / vehicle bug in customer 2018-02-02 03:06:00 +08:00
Kendrick Chan
fac3c409c4 Merge branch 'master' of gitlab.com:jankstudio/resq 2018-02-02 02:48:22 +08:00
Kendrick Chan
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
Kendrick Chan
85a0f972c7 Fix Customer bug when no vehicle or mobile number is selected 2018-02-01 23:11:57 +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
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
8f4b745025 Update list columns and fields based on feedback 2018-01-31 23:56:25 +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
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
40a4e96632 Change time format on job order list 2018-01-31 04:02:29 +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
Kendrick Chan
d53d51f499 Fix comment on date format 2018-01-30 01:50:38 +08:00
Kendrick Chan
ae46f9068c Add more API calls 2018-01-30 00:02:59 +08:00
Kendrick Chan
189b2e9a01 Add more API calls 2018-01-29 22:02:28 +08:00
Kendrick Chan
b18d02f521 Add new API calls: info get, info update, status 2018-01-29 10:12:14 +08:00
Kendrick Chan
fea805e385 Make api json_encode result use JSON_FORCE_OBJECT 2018-01-29 08:36:08 +08:00
Kendrick Chan
e3a41febc5 Rename mobile session setDateConfirm to setDateConfirmed 2018-01-28 13:51:57 +08:00
Kendrick Chan
e56929dbcc Refactor API controller for ease of use 2018-01-28 13:38:06 +08:00
Kendrick Chan
f5cce11738 Add routes and initial controller for API calls 2018-01-28 05:18:56 +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