Commit graph

1720 commits

Author SHA1 Message Date
Korina Cordero
44afc498c1 Add population of hours based on shift selected. #531 2021-01-22 10:35:38 +00:00
Korina Cordero
f5759c8cea Add population of hour shift, depending on selected shift schedule. #531 2021-01-21 09:55:16 +00:00
Korina Cordero
f31891393d Add shift schedule dropdown. #531 2021-01-21 08:44:56 +00:00
Korina Cordero
314c0704f8 Add TEST ONLY as a cancel reason. #530 2021-01-04 07:20:39 +00:00
7d612df076 Merge branch '528-app-cannot-add-customer-vehicle' into 'master'
Add checking if token is null. #528

Closes #528

See merge request jankstudio/resq!614
2020-12-14 06:23:02 +00:00
Korina Cordero
f97153832c Add checking if token is null. #528 2020-12-14 06:21:27 +00:00
Korina Cordero
408a2bf42c Change output->writeln to error_log. 2020-12-14 03:28:09 +00:00
0ff930438b Add check for user class type for cv history #528 2020-12-14 10:56:04 +08:00
Korina Cordero
b17a95e35a Add container size to SAP battery form. #527 2020-12-07 09:05:00 +00:00
Korina Cordero
a9d631cbc2 Add list, create, update, and delete for container size. #527 2020-12-07 06:46:43 +00:00
Korina Cordero
807749c8f5 Add SAPBatteryContainerSize entity. #527 2020-12-07 05:48:48 +00:00
Korina Cordero
0d7ff77a07 Rename flag_latest to flag_new in constructor. #526 2020-12-07 05:00:46 +00:00
Korina Cordero
debc3bc8cb Add new flag for SAP battery. #526 2020-12-01 09:12:21 +00:00
Korina Cordero
ac2138c1b1 Fix error validation for SAP battery. #524 2020-11-27 10:27:01 +00:00
Korina Cordero
0752fe3726 Add create, list, update, and delete for SAP Battery. #524 2020-11-27 09:52:24 +00:00
Korina Cordero
bd80c6295a Add create, delete, update, and list for SAP battery size. #524 2020-11-27 08:43:47 +00:00
Korina Cordero
041cb7bafa CRUD for SAP battery brand. #524 2020-11-27 08:25:01 +00:00
070937cd37 Enable logging of changes to customer vehicle warranty code #525 2020-10-26 17:27:06 +08:00
7898595bff Add new entity for customer vehicle warranty code history #525 2020-10-26 16:30:14 +08:00
668f49f335 Add warranty serial edit modal and ajax call for jo forms #525 2020-10-26 01:46:35 +08:00
Korina Cordero
28025a5735 Add checking for empty row and empty columns. #523 2020-10-20 03:55:40 +00:00
7ca467ce4c Add date_update to battery list CAPI #522 2020-10-20 07:52:07 +08:00
74928f196b Add date_create and date_update to SAPBattery entity #522 2020-10-20 07:38:47 +08:00
6898b9989e Add date_create and date_update fields in Battery entity #522 2020-10-20 07:01:01 +08:00
Korina Cordero
121f3623bb Add missing reasons. #520 2020-10-13 02:30:32 +00:00
f684fb532c Merge branch 'master' into '519-motiv-connectivity'
# Conflicts:
#   src/Controller/JobOrderController.php
2020-10-12 14:48:56 +00:00
1227e03e1a Add inventory count to hub table in job order processing form #519 2020-10-10 00:52:45 +08:00
c44fa66195 Create MotivConnector service #519 2020-10-09 22:57:44 +08:00
7bc0dfe54a Merge branch '504-resq-new-import-commands-for-sap-battery' into '485-resq-september-10-release'
Resolve "Resq - new import commands for SAP Battery"

See merge request jankstudio/resq!592
2020-09-29 01:30:07 +00:00
Korina Cordero
ae5ccb40f2 Add date_create to Customer. #513 2020-09-28 07:52:00 +00:00
Korina Cordero
7107c57eb6 Create command to import SAP information. #504 2020-09-25 09:58:07 +00:00
Korina Cordero
beee87c3b4 Modify the ImportSAPDeltaCommand to make import checking easier. #504 2020-09-23 04:47:15 +00:00
Korina Cordero
7c49bd9f0a Add ImportSAPDeltaCommand. #504 2020-09-22 11:17:25 +00:00
Korina Cordero
aa89e74e94 Add DPA access when creating customer and job order. Add checking for email when email promo is checked. #486 2020-09-10 06:05:41 +00:00
Korina Cordero
82671a80a3 Add checking for service type for no trade in reason. #471 2020-09-09 08:07:38 +00:00
Korina Cordero
479ff96fdc Modified contents of the csv file when no invalid warranties are found. #476 2020-08-28 09:36:11 +00:00
Korina Cordero
dba2eb693a Added cancellation reasons. #481 2020-08-28 05:26:10 +00:00
Korina Cordero
73dcdb0b99 Add content. #479 2020-08-28 04:12:42 +00:00
Korina Cordero
c30874e1c0 Change the wiling to wait checkbox into a dropdown. Add text field for not willing to wait. #479 2020-08-27 08:28:39 +00:00
Korina Cordero
1b88baa3de Add all batteries to Battery dropdown in JO form. #465 2020-08-18 02:25:31 +00:00
Korina Cordero
75ff5bcdbb Add country code to mobile number. #465 2020-08-17 11:09:35 +00:00
Korina Cordero
61098b551f Merge branch '464-resq-sms-message-to-customer-upon-jo-completion' into '465-resq-august-13-release'
Resolve "Resq - sms message to customer upon JO completion"

See merge request jankstudio/resq!543
2020-08-12 05:46:07 +00:00
Korina Cordero
71b70d0c5a Merge branch '463-resq-message-prompt-for-non-serviceable-area' into '465-resq-august-13-release'
Resolve "Resq - message prompt for non-serviceable area"

See merge request jankstudio/resq!542
2020-08-12 05:41:56 +00:00
Korina Cordero
938ef24078 Add SMS message sending to customer when JO is fulfilled via rider app. #464 2020-08-12 05:35:36 +00:00
Korina Cordero
28b939a969 Add SMS messaging to customer when rider fulfills a JO from rider app. #464 2020-08-11 11:10:24 +00:00
Korina Cordero
2c48c619b8 Send SMS message to customer when JO is fulfilled from admin panel. #464 2020-08-11 07:24:20 +00:00
Korina Cordero
ce70966117 Add geofence checking to JO form. #463 2020-08-10 09:03:21 +00:00
Korina Cordero
8d33e21647 Merge branch '462-resq-dropdown-for-trade-in-reason' into '465-resq-august-13-release'
Resolve "Resq - dropdown for trade-in reason"

See merge request jankstudio/resq!541
2020-08-10 07:53:01 +00:00
Korina Cordero
e8220f4282 Add no trade in reason to form and JO entity. #462 2020-08-10 07:51:37 +00:00
Korina Cordero
4454f10d45 Merge branch '453-resq-july-30-release' of gitlab.com:jankstudio/resq into 462-resq-dropdown-for-trade-in-reason 2020-08-10 04:01:46 +00:00
Korina Cordero
25b96e8a14 Fix error when user reassigns hub. #453 2020-08-10 03:28:40 +00:00
Korina Cordero
1f39ab3ccf Add list of no trade in reasons. #462 2020-08-07 08:54:16 +00:00
Korina Cordero
fb8dabc269 Return only compatible batteries for customer vehicle. #461 2020-08-07 07:05:42 +00:00
Korina Cordero
df950006c1 Revert "Merge branch '457-cmb-add-telephone-number-to-search' into 'master'"
This reverts merge request !536
2020-08-05 10:17:40 +00:00
Korina Cordero
1a82676c25 Remove log messages. #457 2020-08-05 10:13:53 +00:00
Korina Cordero
62a4ffcdfd Add mobile number to customer vehicle search in JO forms. #457 2020-08-05 09:40:18 +00:00
Korina Cordero
5942575fde Add responsible_party field to job order entity and JO forms. #459 2020-08-05 08:03:46 +00:00
Korina Cordero
407c860582 Add finish date column to list of all job orders. #456 2020-08-05 03:51:40 +00:00
Korina Cordero
46bcf7f209 Fix zoom issue in dashboard map. #424 2020-08-04 08:08:56 +00:00
Korina Cordero
117974d2cb Add CustomerNotWaitReason. #453 2020-08-04 08:00:21 +00:00
Korina Cordero
8f6aa72cc0 Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 424-cmb-release 2020-08-04 07:57:15 +00:00
Korina Cordero
8a026ef44a Add fix to dashboard map zoom error. #424 2020-08-04 07:52:27 +00:00
55a4455586 Revert "Add name to rider label. #424"
This reverts commit fdce6c02a4
2020-08-04 05:39:07 +00:00
Korina Cordero
21c1535e89 Add Lazada to Transaction Origin. #455 2020-08-04 03:45:23 +00:00
Korina Cordero
78d0f4b150 Change text field to dropdown for reasons why customer will not wait. #454 2020-08-04 03:32:51 +00:00
Korina Cordero
a526b7bee5 Fix issue when user cancels the cancellation. #449 2020-08-04 02:27:44 +00:00
Korina Cordero
2e9a5585d4 Add dropdown for cancellation reasons. #449 2020-08-03 10:58:36 +00:00
Korina Cordero
4cd75acb46 Add updating of landmark, willing to wait, and reason when updating JO form. #453 2020-07-31 01:42:50 +00:00
Korina Cordero
964dce9842 Add Willing to Wait tickbox and Reason for not waiting text field. #445 2020-07-28 10:10:59 +00:00
Korina Cordero
18dd63ac16 Make Landmark field in JO required. #447 2020-07-28 08:07:56 +00:00
Korina Cordero
ed0eefc1d8 Add Battery Facilitated By column in View All. #443 2020-07-28 06:48:40 +00:00
Korina Cordero
886ed94d88 Merge branch '444-resq-include-date-filter-in-hub-view' of gitlab.com:jankstudio/resq into 443-resq-add-battery-facilitated-by-in-view-all-page 2020-07-28 06:15:39 +00:00
Korina Cordero
c3e36ad055 Add fulfill for cancelled job orders. #442 2020-07-28 05:58:21 +00:00
Korina Cordero
fdce6c02a4 Add name to rider label. #424 2020-07-27 09:49:53 +00:00
Korina Cordero
e85139b864 Add date start to the list of JOs in View All and Open. #424 2020-07-27 07:38:13 +00:00
Korina Cordero
ed53e494b4 Fix bug where JO goes back to assigned when updated. #424 2020-07-24 08:57:33 +00:00
Korina Cordero
d61d71804d Return empty array for job order when no ongoing job order. #424 2020-07-24 06:42:38 +00:00
Korina Cordero
afbe3aa00b Add route to fulfill a cancelled job order. #442 2020-07-23 10:34:01 +00:00
Korina Cordero
505177360e Add date filter for hub view. #444 2020-07-23 08:58:41 +00:00
Korina Cordero
febd4d6e09 Comment out the error_log for header longitude and latitude. #424 2020-07-23 06:53:01 +00:00
Korina Cordero
ff83dec5ce Add upload photo event type. #424 2020-07-23 04:40:48 +00:00
Korina Cordero
eadcd4604a Add getHeaderCoordinates to rider api. #424 2020-07-23 03:55:33 +00:00
Korina Cordero
232ebfe3fc Add RIDER_FINISH event. Add date_complete to API response. #424 2020-07-23 02:50:13 +00:00
Korina Cordero
37fef914d9 Add checking for null for other images. #424 2020-07-22 06:35:12 +00:00
Korina Cordero
b680349e56 Limit uploaded photos to four. Rename images to generic names. #441 2020-07-21 09:58:06 +00:00
Korina Cordero
127b4a6f7b Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 438-cmb-rider-icon-should-be-green-when-rider-rejects-jo 2020-07-21 07:17:56 +00:00
Korina Cordero
d7a5bd7dda Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 437-cmb-rider-cannot-go-offline-if-rider-has-assigned-jos 2020-07-21 07:12:46 +00:00
Korina Cordero
6b65e92711 Add date_start to the job order data response. #440 2020-07-21 07:10:45 +00:00
Korina Cordero
d01aa82e31 Clear rider when JO has been rejected. Send event for rider availability when rider rejects JO. #437 2020-07-21 04:58:14 +00:00
Korina Cordero
109911bbb0 Clear rider when JO has been rejected. Send event for rider availability when rider rejects JO. #437 2020-07-21 04:51:50 +00:00
Korina Cordero
95a070051e Add checking for assigned job orders when rider is logging out or going offline. #437 2020-07-20 08:21:34 +00:00
Korina Cordero
20f5e46726 Add date_accept to the responses when getting a job order. #440 2020-07-17 06:17:55 +00:00
655b632849 Fix availability if active jo is closed #424 2020-07-16 15:12:44 +08:00
e79ae22f32 Fix rider available ajax call to rely on active job order #424 2020-07-16 14:40:30 +08:00
2745e0dac0 Fix hardcoded availability of rider in ajax call #424 2020-07-16 14:31:51 +08:00
b24bae3788 Add rider availability ajax call #424 2020-07-16 14:19:16 +08:00
Korina Cordero
0c845b456e Fix issue of icon not displaying when rider goes online. #436 2020-07-16 05:09:53 +00:00
Korina Cordero
326bbeaed2 Add channel for rider availability to add/remove rider when rider goes online/offline. #436 2020-07-16 03:31:04 +00:00
Korina Cordero
4c8ea2f69b Add list of job orders behind schedule. #436 2020-07-15 08:40:30 +00:00
Korina Cordero
1a6ed417bf Split invoice items with quantity more than 1. #436 2020-07-14 03:15:51 +00:00
Korina Cordero
6cb3f1be66 Fix the quantity in invoice when user orders more than one battery of the same type. #436 2020-07-13 09:38:47 +00:00
Korina Cordero
6bf4b76486 Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 436-cmb-uat-requests 2020-07-13 02:39:52 +00:00
Korina Cordero
7d19cfa1eb Fix bug when assigning rider to JO. #434 2020-07-08 10:41:28 +00:00
Korina Cordero
c82a7a388d Modify checking for JO reassignment. #434 2020-07-08 09:12:35 +00:00
Korina Cordero
a448177a1c Made the model year field a dropdown. #434 2020-07-08 04:21:17 +00:00
Korina Cordero
9c2c1e5895 Remove before pictures from job order. Also remove uploadArrive endpoint. #434 2020-07-06 09:10:33 +00:00
Korina Cordero
3de8b8762f Add checking if scheduled date and time are before the current date and time. #434 2020-07-06 07:51:26 +00:00
Korina Cordero
27f37de489 Fix discount issues. #434 2020-07-03 08:14:12 +00:00
Korina Cordero
c3487358f1 Autopopulate the OR Name field with the customer name. #434 2020-07-03 07:29:47 +00:00
Korina Cordero
6e07e24e93 Made discount a dropdown. #434 2020-07-02 11:53:14 +00:00
Korina Cordero
9bb8380ca4 Add 45 minutes to date_schedule. #434 2020-07-02 02:59:23 +00:00
32d3012802 Limit rider schedule to 7 - 4 and 8 - 5 #409 2020-07-01 23:43:24 +08:00
Korina Cordero
473e7a8e51 Return list of years for model year until current year. #434 2020-07-01 09:40:01 +00:00
Korina Cordero
ada02f46a7 Comment saving of promo information. #434 2020-07-01 09:17:34 +00:00
Korina Cordero
e8923c8faf Add checking for odometer maximum value. #434 2020-07-01 02:55:48 +00:00
Korina Cordero
1c076228c6 Add Whatsapp to the list for transaction origin. #434 2020-07-01 02:35:12 +00:00
Korina Cordero
b4d1cd344d Add E-Wallet as mode of payment. #434 2020-07-01 02:20:57 +00:00
Korina Cordero
858849a764 Made customer notes non-mandatory. #434 2020-07-01 02:12:08 +00:00
Korina Cordero
9717effb0a Add signature and email address to display. Separate the before and after images. #432 2020-06-29 09:00:42 +00:00
Korina Cordero
7aed20019c Fix displaying of images. #432 2020-06-29 08:18:39 +00:00
Korina Cordero
32c83aa40c Add odometer and pictures when viewing JO. #432 2020-06-29 07:00:17 +00:00
Korina Cordero
e9981b24fa Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 432-cmb-display-details-in-jo 2020-06-29 02:56:08 +00:00
94116a2958 Add time restriction in analytics #409 2020-06-27 07:42:04 +08:00
Korina Cordero
818a8fff30 Add cash to mode of payments. #424 2020-06-26 05:22:46 +00:00
Korina Cordero
481420294e Fix for JO not displaying errors when required fields are blank. #424 2020-06-26 03:26:54 +00:00
2803c264ac Allow analytics to be filtered by date range #409 2020-06-25 23:39:46 +08:00
Korina Cordero
bf572fa93c Remove error_log commands. #424 2020-06-25 10:57:14 +00:00
Korina Cordero
be52d089d2 Fix JO saving when plate number is blank. #424 2020-06-25 08:50:08 +00:00
Korina Cordero
a65211a709 Remove the Action and Distance in KM from walkin form. Remove the Action columns in one step form. #424 2020-06-25 08:24:09 +00:00
Korina Cordero
c3b4e1219b Add trim when getting plate number when adding a customer vehicle. #424 2020-06-25 04:43:00 +00:00
Korina Cordero
a1a60100f5 Add new event type for perform. Add event creation when JO is performed. #424 2020-06-25 03:11:08 +00:00
Korina Cordero
47a52782f7 Remove prefix from channel. #424 2020-06-24 07:55:50 +00:00
Korina Cordero
5822ea84a6 Add fix for rider being unavailable after completing a JO. #424 2020-06-23 09:54:50 +00:00
Korina Cordero
0f5bf2e8d6 Fix error when rider is not selected. #424 2020-06-23 09:40:39 +00:00
Korina Cordero
21ae94c5b6 Change default mode of payment to credit card. #424 2020-06-23 06:06:15 +00:00
Korina Cordero
093a249689 Add JO status checking for getOngoingJobOrder. #424 2020-06-23 02:33:24 +00:00
16b136b0d3 Make sure blank job_order is in data for get ongoing job order rider api call #424 2020-06-23 00:10:08 +08:00
Korina Cordero
9d41ecb228 Add fix for security checking for verifyJobOrder. #424 2020-06-22 11:39:58 +00:00
Korina Cordero
47eaa6488f Add display name for payment method in rider API JO data. #424 2020-06-22 10:56:41 +00:00
Korina Cordero
42d086ff5d Add sending of mqtt event when JO is assigned to rider. #424 2020-06-22 10:05:01 +00:00
Korina Cordero
a3cf1572f1 Refactor the controller for the API response. #424 2020-06-22 06:41:24 +00:00
Korina Cordero
0f0169cff4 Fix return value for verifyJobOrder. #424 2020-06-22 04:32:58 +00:00
Korina Cordero
db4ab726ab Fix bug in completeJobOrder. #424 2020-06-22 04:00:08 +00:00
Korina Cordero
2f8dca3dbc Fix responses for verifyJobOrder. #424 2020-06-22 03:45:50 +00:00
Korina Cordero
3abb6f0efb Add verifyJobOrder API call. #424 2020-06-22 03:13:41 +00:00
cbaf1ed6a6 Fix customer signature issue #424 2020-06-21 20:08:27 +08:00
eb2d173ea7 Add email and customer signature to complete call in rider api #424 2020-06-21 19:14:30 +08:00
2b13adffa0 Add customer email to jo details in rider api #424 2020-06-21 17:04:41 +08:00
f519ec01dc Set paid status in payment call in rider api #424 2020-06-21 16:46:11 +08:00
1e3b621a91 Send null for extra images if blank for rider api #424 2020-06-21 16:27:43 +08:00
d59174d721 Replace speedomtr with speedometer #424 2020-06-21 16:26:10 +08:00
4ec5ddd993 Add mode of payment to payment in rider api #424 2020-06-21 15:52:34 +08:00
fe363e1df6 Add request object to format job order data method #424 2020-06-21 14:49:31 +08:00
60323acce3 Add request to URL extra image generation #424 2020-06-21 14:48:27 +08:00
ce9a2f42b9 Add images and odometer to JO info #424 2020-06-21 14:44:10 +08:00
391909c493 Fix typo in job order status constant #424 2020-06-21 10:27:24 +08:00
59e6e9eb5c Support null date_status_change for rider api #424 2020-06-20 21:49:35 +08:00
5e75608402 Add date_status_change to job order data in rider api #424 2020-06-20 21:41:21 +08:00
0d89cab165 Add date_status_change for job order entity and refactor rider api job order data generation #424 2020-06-20 21:19:56 +08:00
ef7e362c7d Fix syntax bugs #424 2020-06-20 16:46:00 +08:00
b618605849 Fix syntax error #424 2020-06-20 16:43:14 +08:00
943c01e5d9 Add jo perform rider api call for CMB #424 2020-06-20 16:38:08 +08:00
Korina Cordero
5b96e03557 Add other_images parameter to upload photos API calls. #428 2020-06-19 11:33:49 +00:00
Korina Cordero
6473c2e344 Add getPaymentMethods and getCancelReason API calls to rider API. Add phone_landline to the JO responses. #428 2020-06-19 07:14:12 +00:00
Korina Cordero
332f9687a2 Add getOngoingJobOrder to rider API. #428 2020-06-19 06:19:11 +00:00
Korina Cordero
7a2996d4e5 Add getStatus to rider API. #428 2020-06-19 04:16:45 +00:00
Korina Cordero
0f06ca7339 Add saving of JOs. #427 2020-06-18 04:38:08 +00:00
Korina Cordero
9833a2709a Add command to add test JO data 2020-06-18 03:47:46 +00:00
Korina Cordero
0a06a7ad31 Add command to copy the config and messages files. #426 2020-06-17 08:49:52 +00:00
Korina Cordero
90697af64b Merge branch '422-cmb-no-riders-in-list-when-rider-is-unavailable' of gitlab.com:jankstudio/resq into 426-command-to-copy-configuration-files 2020-06-17 08:20:12 +00:00
Korina Cordero
bd0cf0ad1d Merge branch '424-cmb-release' into '425-cmb-use-cmb-service-type'
# Conflicts:
#   src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
2020-06-17 02:05:06 +00:00
Korina Cordero
753c77773d Use CMBServiceType to check service type. #425 2020-06-17 02:03:50 +00:00
Korina Cordero
661e048206 Add checking for rider availability when saving JO. #422 2020-06-16 03:58:39 +00:00
Korina Cordero
86a5c117e3 Merge branch '421-cmb-new-rider-api' of gitlab.com:jankstudio/resq into 422-cmb-no-riders-in-list-when-rider-is-unavailable 2020-06-16 03:52:44 +00:00
618ccd8d06 Merge branch '421-cmb-new-rider-api' into '424-cmb-release'
Resolve "CMB - new Rider API"

See merge request jankstudio/resq!487
2020-06-16 02:25:17 +00:00
b65893e821 Add aggregate data table for analytics output #409 2020-06-15 13:38:13 +08:00
e13e3c0dd5 Fix bug when no JO comes up for hub in 2018 #409 2020-06-14 18:54:52 +08:00
a2fdb346b3 Refactor schedule solver to solver per weekday and add charts and tables to template #409 2020-06-14 14:12:32 +08:00
Korina Cordero
18081d0903 Add title field to error object. #421 2020-06-12 10:35:20 +00:00
d94e2353b0 Add schedule solver script and run it inside analytics controller #409 2020-06-11 01:15:58 +08:00
Korina Cordero
334b0f1c99 Add uploadFinishPhotos API call. #421 2020-06-09 02:57:48 +00:00
Korina Cordero
ce64a1b64d Add uploadArrivePhotos API call. #421 2020-06-08 10:39:57 +00:00
Korina Cordero
8f108c18cb Modify name of stype_id parameter to service_type for clarity. #421 2020-06-05 09:52:23 +00:00
Korina Cordero
760fa7acf3 Add get job order history for this month and last month. #421 2020-06-04 09:47:58 +00:00
Korina Cordero
b41b5ea29b Modify getJobOrderHistory. #421 2020-06-04 06:02:53 +00:00
Korina Cordero
a0ee7b32bc Add setOdometer API call. Modify url routes for some calls for easier reading. #421 2020-06-04 03:32:05 +00:00
Korina Cordero
b6c54615ad Add api calls: payment, complete, cancel, reject for job orders. #421 2020-06-03 10:34:56 +00:00
0911a1787e Create graph for overlaps #409 2020-06-03 01:18:12 +08:00
Korina Cordero
0e69eb4943 Add completeJobOrder and setActiveJobOrder API calls. #421 2020-06-02 09:25:43 +00:00
Korina Cordero
79b19a61f6 Add startJobOrder API call. Add RIDER_START event type. #421 2020-06-02 08:03:31 +00:00
Korina Cordero
22c1fab15c Add generateInvoice API call. #421 2020-06-02 07:41:47 +00:00
Korina Cordero
ce0240d001 Add event types for CMB. Add JO in transit API call. #421 2020-06-02 06:35:31 +00:00
Korina Cordero
e74d4061ba Add checking for assigned rider for JO for getJobOrder. #421 2020-06-02 04:27:10 +00:00
Korina Cordero
dbdde5cdde Change which flag is set when rider logs in and logs out. Add goOnline and goOffline API calls. #421 2020-06-02 03:40:55 +00:00
Korina Cordero
af9be59d8d Change getActiveJobOrders to getAssignedJobOrders. #421 2020-06-01 09:30:28 +00:00
Korina Cordero
2ea0111b1e Add generate invoice API call. #420 2020-06-01 09:15:05 +00:00
Korina Cordero
1842898c11 Add viewActiveJobOrders API call. #420 2020-06-01 06:29:11 +00:00
Korina Cordero
8730ab4ea3 Add viewJobOrderHistory API call to rider api. #420 2020-06-01 04:37:12 +00:00
Korina Cordero
2ea5bfe193 Add changes to CMB's rider API handler. #420 2020-06-01 02:26:04 +00:00
Korina Cordero
ce2b838ff7 Add RAPIController for CMB. #420 2020-05-29 07:20:00 +00:00
Korina Cordero
7b60ec7c5f Move the setting of JO search fields to the entity. Move the sql script to the migration folder. #419 2020-05-27 08:13:51 +00:00
Korina Cordero
2a0bee8d8d Create sql command to update the job orders for the search fields. Modify search to use the JO search fields. Add saving of search fields when adding a JO. #419 2020-05-27 07:05:44 +00:00
Korina Cordero
8b2a1cd09c Merge branch 'master' of gitlab.com:jankstudio/resq into 419-resq-search-optimization 2020-05-27 04:56:17 +00:00
Korina Cordero
c8c03b756d Add fields and indexes used for search to JO entity. #419 2020-05-27 03:44:52 +00:00
e150bf6181 Merge branch '409-add-analytics-for-forecasting' into 'master'
Resolve "Add analytics for forecasting"

Closes #409

See merge request jankstudio/resq!480
2020-05-26 10:00:27 +00:00
Korina Cordero
f21753bd07 Comment out checking of dpa consent. Comment out access to dpa consent. #418 2020-05-25 03:33:44 +00:00
8be67413d4 Add map display to show overlaps #409 2020-05-24 16:09:17 +08:00
06d3aa3b27 Add form for analytics forecasting #409 2020-05-23 23:07:00 +08:00
760f823794 Have graphs for all hubs in list #409 2020-05-22 23:56:51 +08:00
Korina Cordero
7bd2a6fb31 Add index for customer first name, customer last name, and date_schedule. #415 2020-05-22 05:51:52 +00:00
2aa6d417b7 Merge branch '408-resq-additional-dpa-behavior' into 'master'
Resolve "Resq - additional dpa behavior"

Closes #408

See merge request jankstudio/resq!471
2020-05-21 01:50:57 +00:00
d63dfcabbd Create graphs for hours during the weekday and dates for the year #409 2020-05-21 00:33:32 +08:00
Korina Cordero
adcd9f8c4c Add advance order job orders report. #413 2020-05-20 08:13:42 +00:00
Korina Cordero
c2ca48c402 Add auto assigned job orders report. #412 2020-05-20 07:40:18 +00:00
Korina Cordero
c5eaf348a8 Filter hubs in hubs dropdown to those with flag_hub_view set to true. Add flag_hub_view to Hub entity. Filter JOs whose status are not cancelled or fulfilled. #411 2020-05-20 05:22:08 +00:00
Korina Cordero
ef3f5d5cec Add route to edit hub view form. Remove pdf link from hub view. Filter JOs based on selected hub. #410 2020-05-19 06:55:55 +00:00
Korina Cordero
25997ae11e Add acl, menu item, template, and route for Hub View. #410 2020-05-19 03:30:50 +00:00
616537d055 Add searching for job orders within 5 km of the hub #409 2020-05-18 23:33:16 +08:00
c1a8a5199b Add analytics menu, acl, controller, route, and template #409 2020-05-18 14:31:01 +08:00
Korina Cordero
bbebdb04c8 Add checking for email address if email checkbox is checked. #408 2020-05-15 09:24:31 +00:00
Korina Cordero
af85a632e5 Add acl entry for display of DPA Consent. Add checking when adding/updating customer for DPA consent. #408 2020-05-15 08:48:58 +00:00
Korina Cordero
eebdd40d0a Put advance order fix in APIController. #406 2020-05-13 09:00:46 +00:00
Korina Cordero
092df7dc7e Add status_autoassign to JobOrder entity. Add setting of auto assign status when a JO is requested via API. #406 2020-05-13 08:42:39 +00:00
0871ca1c1e Fix bug with advance order setting wrong variable #405 2020-05-13 10:49:27 +08:00
75b1d157b6 Make sure advance order flag sticks #405 2020-05-13 10:28:52 +08:00
19527e38da Merge branch '401-resq-modify-warrantyhandler-to-use-date_schedule-for-expiry-date-computation' into 'master'
Resolve "Resq - modify WarrantyHandler to use date_schedule for expiry date computation"

Closes #401

See merge request jankstudio/resq!465
2020-05-12 01:29:36 +00:00
2f80a510b0 Merge branch '400-resq-check-jos-with-no-warranty-entries' into 'master'
Resolve "Resq - check JOs with no warranty entries"

Closes #400

See merge request jankstudio/resq!450
2020-05-12 01:29:18 +00:00
Korina Cordero
e67c011831 Change the start date for warranty expiration computation to date_schedule, instead of date_create or date_fulfilled. #401 2020-05-11 06:50:15 +00:00
dc744e7117 Fix typo in sprintf #403 2020-05-09 22:32:01 +08:00
1269774c39 Fix typo #403 2020-05-09 22:30:47 +08:00
f059e2b981 Add debug information on next slot #403 2020-05-09 22:29:30 +08:00
7abe34ee8b Deplete next rider slot for scheduled order if it overlaps #403 2020-05-09 22:26:50 +08:00
824f5c3423 Add debug data for existing advance order slots #403 2020-05-09 21:52:17 +08:00
9550e1e46c Fix getClosestOpenHubs bug #403 2020-05-09 21:39:53 +08:00
c64a78c4b5 Fix bug in hub rider slots initialization #403 2020-05-09 21:10:44 +08:00
921a7180c8 Fix typo for advance order #403 2020-05-09 21:08:10 +08:00
47333acaef Add debug info for hub rider slots data #403 2020-05-09 20:53:20 +08:00
60846e17d6 Refactor scheduling for advance order #403 2020-05-09 20:47:26 +08:00
2df5bdc080 Fix bug in hub_slots API #399 2020-05-08 17:17:27 +08:00
475d91bc9e Make hub slot computation easier #399 2020-05-08 16:58:36 +08:00
39dc9eff80 Change no hub message for API #399 2020-05-08 14:29:00 +08:00
Korina Cordero
78136cc281 Add output file for existing warranties and invalid plate numbers. #400 2020-05-08 05:30:27 +00:00
Korina Cordero
24d297b48f Add error log if JO fulfillment cannot created the warranty. Fix for warranty creation issues when creating warranty from existing JO. #400 2020-05-07 11:13:43 +00:00
6476a96c06 Fix advance order setting #399 2020-05-06 18:24:29 +08:00
Korina Cordero
258a379b68 Add filter for 9900000000 number. #398 2020-05-05 03:07:08 +00:00
e123008061 Activate actual sending of warranty SMS and change configuration to point to live DR URL #394 2020-05-04 18:34:42 +08:00
f384c5d940 Merge branch 'master' of gitlab.com:jankstudio/resq into 394-warranty-expiration-sms-reminder 2020-05-04 18:05:15 +08:00
46da9b6bfd Add details to message #394 2020-05-04 18:04:56 +08:00
Korina Cordero
8d7e0664ee Add index for date_create. #397 2020-05-04 08:46:38 +00:00
Korina Cordero
143c471a48 Add report for SMS messages. #397 2020-05-04 08:05:50 +00:00
1a78320ca9 Fix when date is not speicifed in warranty:sms command #394 2020-05-04 11:34:34 +08:00
e8446cd181 Merge branch '394-warranty-expiration-sms-reminder' of gitlab.com:jankstudio/resq into 394-warranty-expiration-sms-reminder 2020-05-04 11:31:00 +08:00
82baef50ee Make checks for mobile number format #394 2020-05-04 11:30:43 +08:00
Korina Cordero
81f8bf84d3 Made date an optional argument to command. #394 2020-05-04 03:23:04 +00:00
Korina Cordero
416441c572 Merge branch '394-warranty-expiration-sms-reminder' of gitlab.com:jankstudio/resq into 394-warranty-expiration-sms-reminder 2020-05-04 03:07:48 +00:00
cb95705848 Add command for sending warranty SMS #394 2020-05-04 11:05:28 +08:00
6abd8cacae Merge branch '394-warranty-expiration-sms-reminder' into 'master'
Have sms search for message_id instead of id #394

Closes #394

See merge request jankstudio/resq!444
2020-05-03 15:03:25 +00:00
0d50c864d6 Have sms search for message_id instead of id #394 2020-05-03 23:02:47 +08:00
54c0882b01 Merge branch '394-warranty-expiration-sms-reminder' into 'master'
Fix bug in dr_url passing #394

Closes #394

See merge request jankstudio/resq!443
2020-05-03 14:58:28 +00:00
106a38499d Fix bug in dr_url passing #394 2020-05-03 22:57:47 +08:00
89c18eda1c Merge branch '394-warranty-expiration-sms-reminder' into 'master'
Resolve "Warranty expiration sms reminder"

Closes #394

See merge request jankstudio/resq!442
2020-05-03 14:51:59 +00:00
d189b8eb18 Fix SMS delivery receipt functionality #394 2020-05-03 22:50:56 +08:00
7043f0c483 Add message field for version check #395 2020-05-01 15:29:24 +08:00
50e38e1e4b Replace flag_advance_order check with 1 instead of 'true' #395 2020-05-01 14:58:59 +08:00
381323a07e Set some defaults to null in get vehicles #395 2020-05-01 14:29:40 +08:00
434cedf206 Merge branch '384-make-map-tile-server-configurable' of gitlab.com:jankstudio/resq into 394-warranty-expiration-sms-reminder 2020-05-01 14:05:57 +08:00
ff6b4da4df Save records of sms messages when sending #384 2020-05-01 14:03:27 +08:00
Korina Cordero
ce5a9cb79d Fix when name is null when returning customer vehicle info. #393 2020-04-30 08:08:33 +00:00
Korina Cordero
7d4212195d Remove error_log. #392 2020-04-30 07:34:20 +00:00
Korina Cordero
ae17b23b2c Adjust the timecheck #392 2020-04-30 07:32:37 +00:00
Korina Cordero
6effa53997 Improve the time checking. #392 2020-04-30 07:26:12 +00:00
Korina Cordero
da16bf54a3 Add scheduleOptionStatus API call. #392 2020-04-30 07:17:34 +00:00
Korina Cordero
b66ebf7eeb Fix when no hubs are found. #392 2020-04-30 07:00:25 +00:00
Korina Cordero
b3b46bca7b Add versionCheck API call. #392 2020-04-30 05:38:41 +00:00
Korina Cordero
9921f9d69f Modify rider slots to be normal array. Fix label for the lunch break slot. Rename label. #391 2020-04-30 03:09:21 +00:00
3716a9a881 Merge branch '389-resq-new-api-calls-for-advance-order-slots' into 'master'
Resolve "Resq - new API calls for advance order slots"

Closes #389

See merge request jankstudio/resq!433
2020-04-29 10:52:32 +00:00
Korina Cordero
2a2cde8a2d Modify the message for clarity. #390 2020-04-29 08:24:07 +00:00
Korina Cordero
f030eeef2a Add newRequestJobOrder API call. #389 2020-04-28 09:08:48 +00:00
Korina Cordero
383fc1ee0a Modify input parameter for getNearestHubAndSlots. Add 4-5 PM shift. Add slot id to response. Remove unused code. #389 2020-04-27 09:19:21 +00:00
Korina Cordero
9e9c5759bb Fix issues found during testing for getNearestHubsAndSlots 2020-04-27 07:49:52 +00:00
Korina Cordero
ede1d04123 Add API call to get nearest hubs and slots. #389 2020-04-24 09:32:46 +00:00
Korina Cordero
7c4f452a40 Fix serial number in JO details report. #388 2020-04-23 08:16:09 +00:00
Korina Cordero
61278c81a4 Commented out auto assign advance order JO. #386 2020-04-23 03:15:12 +00:00
Korina Cordero
47a8f2dec1 Added the requested columns for the JO Details Report. #385 2020-04-22 10:37:16 +00:00
Korina Cordero
920400076d Modify the JO Details Report. #385 2020-04-22 07:52:08 +00:00
Korina Cordero
175b5855d3 Fix typo in JO status. #383 2020-04-21 08:33:15 +00:00
Korina Cordero
da151245c9 Fix typo in JO status. #383 2020-04-21 08:29:05 +00:00
Korina Cordero
a0c4c2f136 Set start time of advance order to 5 PM. #383 2020-04-21 08:23:55 +00:00
Korina Cordero
b4c234e5dd Fix issue of wrong JO status set. Add descriptive notes for JOStatus. #382 2020-04-21 08:12:46 +00:00
Korina Cordero
a55fe79fd6 Set start time of advance job order to 2 PM. #382 2020-04-21 06:44:27 +00:00
Korina Cordero
b8dbe5eb07 Fix error when saving hub in HubController. #382 2020-04-21 04:13:02 +00:00
Korina Cordero
0f5a6a1863 Fix error when saving hub in HubController. #382 2020-04-21 04:12:04 +00:00
Korina Cordero
21700e7922 Modify auto-assign with advance order, based on code review. #381 2020-04-21 03:23:23 +00:00
Korina Cordero
a7b5bf18ff Add hub assignment for advance order job orders. #381 2020-04-20 13:08:24 +00:00
Korina Cordero
c7af1c1592 Add rider_slots to hub. #381 2020-04-20 03:37:40 +00:00
Korina Cordero
f33a253cea Add transaction origin to mqtt message. #380 2020-04-17 06:07:32 +00:00
Korina Cordero
a30f9b2ce8 Modify how mobile customer markers are loaded when dashboard map is loaded. #380 2020-04-17 05:17:00 +00:00
Korina Cordero
88a45034f9 Add jo events report. #379 2020-04-16 09:08:35 +00:00
Korina Cordero
3caf23b57d Add job order details report. #379 2020-04-16 07:17:18 +00:00
Korina Cordero
e96fd6d7fb Merge branch '377-resq-bug-fixes' of gitlab.com:jankstudio/resq into 379-resq-jo-and-jo-event-report 2020-04-16 07:16:08 +00:00
Korina Cordero
932bd7c770 Add mobile customer layer to the dashboard map. 2020-04-15 07:32:05 +00:00
b7b38d138b Fix comment for checking advance order #378 2020-04-15 15:17:12 +08:00
7aebe13d1f Have battery services use the findNearestHub method without inventory check #378 2020-04-15 13:12:23 +08:00
5eef2df4e0 Check advance orders within 2 hours of order coming in before auto assigning #378 2020-04-15 13:11:04 +08:00
Korina Cordero
5460b216aa Change function name from updateJobOrder to openEditJobOrder. #377 2020-04-15 03:49:31 +00:00
Korina Cordero
4fd8292d2e Fix JO link in dashboard for resq. #377 2020-04-15 03:21:47 +00:00
Korina Cordero
db46e5134f Fix for the JO event logs and status issues when editing a JO. #377 2020-04-14 09:18:13 +00:00
Korina Cordero
ea7908a18e Fix for access. #377 2020-04-14 08:06:17 +00:00
Korina Cordero
b545750910 Add customer distance limit to .env and checking if hub within the limit. #377 2020-04-14 07:21:10 +00:00
Korina Cordero
7bf9a7435c Bug fix for access. Add API logging to CMB services to avoid breakage. #377 2020-04-14 05:23:21 +00:00
cdbf817db8 Remove permission check for incoming customer vehicle search #374 2020-04-14 12:10:50 +08:00
Korina Cordero
a738aac7e7 Add fix for bug. #374 2020-04-14 02:57:41 +00:00
Korina Cordero
06d0e21b1d Add access to tier 1 to customer vehicle search. #374 2020-04-14 02:48:55 +00:00
Korina Cordero
48e95ee581 Add .env variable and checking of variable when logging API events. #374 2020-04-14 02:24:52 +00:00
32b4c8546d Make rider available when they arrive at hub #374 2020-04-13 21:10:29 +08:00
46f46436fe Tag rider as unavailable on rapi payment call #374 2020-04-13 20:56:46 +08:00
Korina Cordero
64b533b2df Add JO event creation and notifications when JO is auto assigned a hub and rider. #374 2020-04-13 02:50:20 +00:00
51ad36b272 Fix bug in api request jo #374 2020-04-11 19:01:04 +08:00
1ee744eba0 Add all other services to auto assign hub / rider #374 2020-04-11 18:37:35 +08:00
9c0f86e588 Filter only open hubs for API autoassign #374 2020-04-11 11:44:45 +08:00
3cc20c7410 Fix typo in api logger #374 2020-04-10 21:17:31 +08:00
63bb887370 Add request information in API logging #374 2020-04-10 21:14:45 +08:00
1e23f0cd55 Log API controller responses to enable us to debug #374 2020-04-10 20:18:36 +08:00
Korina Cordero
e1b27dea9a Add branch_code and status_open to hub form. #374 2020-04-08 10:11:43 +00:00
Korina Cordero
8619c49397 Add the status_open field in Hub. #374 2020-04-08 09:39:42 +00:00
Korina Cordero
917459f228 Comment out call to inventory manager. #374 2020-04-08 09:31:28 +00:00
Korina Cordero
ab6ed4a185 Add auto assignment of hub and rider to APIController. #374 2020-04-08 07:34:28 +00:00
Korina Cordero
6c02c30370 Update function name. Add checking for empty response in getBranchesInventory. #374 2020-04-08 02:32:16 +00:00
Korina Cordero
eb5710b846 Create InventoryManager service to connect to API. #374 2020-04-07 10:10:44 +00:00
Korina Cordero
c62775c990 Moved the autoAssign code into a service. #374 2020-04-07 03:27:39 +00:00
Korina Cordero
9a661763a0 Add auto assign to controller. #374 2020-04-06 09:46:54 +00:00
e3cb53cb78 Merge branch '270-final-cmb-fixes' into 'master'
Resolve "Final CMB Fixes"

Closes #270

See merge request jankstudio/resq!418
2020-04-03 02:54:28 +00:00
Korina Cordero
615b5a3390 Merge branch 'master' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-04-03 02:32:07 +00:00
440cf35cf2 Merge branch '366-cmb-access-for-getcustomervehicles-2' into '270-final-cmb-fixes'
Resolve "CMB - access for getCustomerVehicles"

See merge request jankstudio/resq!411
2020-04-03 02:01:49 +00:00
Korina Cordero
1dac0c506e Remove message. #372 2020-04-02 04:01:08 +00:00
Korina Cordero
135ab10cd3 Add to response the list of serials with no warranties. #372 2020-04-02 03:58:21 +00:00
Korina Cordero
719cccf778 Add API call to get warranties when given a list of serial numbers. #372 2020-04-02 03:33:02 +00:00
Korina Cordero
c38eb147c8 Add logging of duplicate entries when importing SAP batteries. #371 2020-04-01 08:33:25 +00:00
Korina Cordero
1829e9112e Add error_logging in case of duplicate SAP battery. #371 2020-04-01 04:30:08 +00:00
Korina Cordero
d61d82b6e7 Add default value false to checking for new customer. #367 2020-03-10 06:22:25 +00:00
Korina Cordero
c4da604ac8 Made plate number a required field if new customer. #367 2020-03-10 06:07:29 +00:00
8e3df8f1c4 Treat blank serial as null to avoid unique exception in db #270 2020-03-06 07:42:00 +08:00
e4b8e44b06 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes 2020-03-05 23:53:24 +08:00
60fb331b47 Fix role controller issue on saving #270 2020-03-05 23:52:40 +08:00
Korina Cordero
6a7cb9788e Fix access to customer vehicle search for walkin and one step. #366 2020-03-05 08:36:24 +00:00
Korina Cordero
1dd476fba9 Merge branch '365-cmb-add-columns-to-open-and-view-all-pages' of gitlab.com:jankstudio/resq into 366-cmb-access-for-getcustomervehicles-2 2020-03-05 07:29:22 +00:00
Korina Cordero
624cf2fb7d Return the additional values to template. #365 2020-03-05 07:17:03 +00:00
Korina Cordero
dafe7e6b1c Modify access to getCustomerVehicles. #366 2020-03-05 06:53:26 +00:00
Korina Cordero
e93b6432b0 Add view all form for cmb. #365 2020-03-05 06:26:50 +00:00
bf535e37f5 Make sure rider's active jo is in an open status #362 2020-03-05 09:20:16 +08:00
de9e803ad4 Update rider status when job order status is changed #362 2020-03-05 08:57:32 +08:00
2e3c879fd5 Support rider status changes in dashboard map #362 2020-03-05 07:15:26 +08:00
977559b88d Set priority properly for job order and handle priority down button #360 2020-03-02 08:33:50 +08:00
07753274c3 Add initial job order prioritization features #360 2020-03-01 22:14:13 +08:00
ebc9b77eda Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 360-cmb-allow-reordering-of-rider-jo
Conflicts:
	src/Entity/JobOrder.php
2020-02-29 23:40:10 +08:00
1ab5909dfd Add priority field for JobOrder #360 2020-02-29 23:38:05 +08:00
0d148d8d50 Merge branch '359-cmb-remove-color-from-jo-pdf' into '270-final-cmb-fixes'
Resolve "CMB - remove color from JO pdf"

See merge request jankstudio/resq!401
2020-02-27 05:24:30 +00:00
Korina Cordero
a0f7ca6abe Fix editRoute parameters for CMB. #357 2020-02-27 02:07:30 +00:00
Korina Cordero
164e091c15 Remove color field from pdf form. #359 2020-02-25 08:39:30 +00:00
Korina Cordero
3d40bc6238 Remove links to onestep edit from templates for resq. Fix for getEditRoute issues found during testing. #357 2020-02-25 07:18:55 +00:00
Korina Cordero
6d14677bd7 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 357-transition-fix-resq-s-geteditroute 2020-02-25 03:38:18 +00:00
Korina Cordero
d534ce3241 Add getEditRoute for resq. #357 2020-02-25 03:37:58 +00:00
5b19302752 Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' into '270-final-cmb-fixes'
Resolve "CMB and Resq - move invoice-related code out of JOController"

See merge request jankstudio/resq!395
2020-02-25 03:35:53 +00:00
Korina Cordero
22be1eaf5a Fix edit for walkin JOs. #270 2020-02-24 10:33:13 +00:00
214e44405c Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes
Conflicts:
	src/Controller/JobOrderController.php
2020-02-24 16:45:43 +08:00
1a0fb13268 Fix view all edit button to use one step edit for CMB #270 2020-02-24 16:43:27 +08:00
Korina Cordero
230dd41055 Add jo_service_charges to one step form. #355 2020-02-24 07:57:43 +00:00
Korina Cordero
4b9b3622d5 Fix to display service charge amount when loading an existing JO. #355 2020-02-24 03:06:47 +00:00
Korina Cordero
9125a0d2fa Moved invoice code out of JO controller. #354 2020-02-21 03:22:17 +00:00
Korina Cordero
4a12fb6eb2 Change edit to edit onestep edit and walkin. #353 2020-02-20 04:12:12 +00:00
ffa25d6c79 Merge branch '347-cmb-fix-jo-form-display-when-loading-jo-from-view-all' into '270-final-cmb-fixes'
Resolve "CMB - fix JO form display when loading JO from View All"

See merge request jankstudio/resq!393
2020-02-19 08:37:49 +00:00
Korina Cordero
5ab6514a86 Fixed form for onestep when JO is loaded from View All. #347 2020-02-19 06:29:31 +00:00
Korina Cordero
1374a91dd4 Add checking for transaction origin. #347 2020-02-19 05:02:21 +00:00
Korina Cordero
a62476a833 Add create, update, list, and delete for service charges. #348 2020-02-19 03:16:27 +00:00
39fdf318d4 Make getMeta in JobOrder entity return null if meta key is not found #270 2020-02-18 09:55:13 +08:00
1c9ce12595 Merge branch '341-cmb-add-service-charge-dropdown' into '270-final-cmb-fixes'
Resolve "CMB - add service charge dropdown"

See merge request jankstudio/resq!387
2020-02-18 01:43:00 +00:00
Korina Cordero
ebc6867c8f Edit for one step JO with service charges. #341 2020-02-18 01:42:16 +00:00
Korina Cordero
9a24b08bdd Display existing service charges when editing one step JO. #341 2020-02-18 01:15:14 +00:00
d2afb99f4f Merge branch '344-cmb-rider-queue-management' into '270-final-cmb-fixes'
Add active job order feature for rider #344

See merge request jankstudio/resq!388
2020-02-17 17:01:50 +00:00
def4ed0357 Add active job order feature for rider #344 2020-02-18 01:00:19 +08:00
Korina Cordero
504d910621 Add saving to meta even if service charges are blank. #341 2020-02-17 14:56:35 +00:00
Korina Cordero
f9c304422c Add fix when saving an invoice with no service charges. #341 2020-02-17 14:43:21 +00:00
Korina Cordero
0cff722c6a Add saving of service charges to JO and Invoice Item. #341 2020-02-17 14:18:19 +00:00
Korina Cordero
f3f941e0a0 Add service charges to invoice generation. #341 2020-02-17 13:24:32 +00:00
4ae899925d Merge branch '341-cmb-add-service-charge-dropdown' of gitlab.com:jankstudio/resq into 341-cmb-add-service-charge-dropdown 2020-02-17 16:13:12 +08:00
Korina Cordero
663698f087 Rename promo to discount in JO service, JO forms, and invoice generator. #341 2020-02-17 08:12:51 +00:00
34e9091297 Fix dropdown for service charges in one-step JO form #341 2020-02-17 16:12:35 +08:00
Korina Cordero
6c11650b25 Add service charge entity. #341 2020-02-17 07:20:37 +00:00
Korina Cordero
984b0428d0 Fix for cmb to retain battery in invoice when editing JO. #343 2020-02-17 06:19:09 +00:00
Korina Cordero
a15b45173c Fix discount computation. #343 2020-02-17 01:02:41 +00:00
Korina Cordero
d439a411a8 Change computation of discount for CMB. #343 2020-02-14 09:40:08 +00:00
Korina Cordero
ac91960bd7 Add mobile phone validation for JO when new customer is created. #340 2020-02-14 03:38:37 +00:00
Korina Cordero
6a944eeb16 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 340-cmb-walk-in-customer-form 2020-02-14 03:09:57 +00:00
Korina Cordero
bea5d72d13 Modify the function names for walkin. #340 2020-02-14 03:07:42 +00:00
Korina Cordero
034ae108e0 Fix saving issue for JOEvent. #340 2020-02-14 01:47:08 +00:00
Korina Cordero
d07adc606b Add saving of walkin form. #340 2020-02-13 08:53:57 +00:00
Korina Cordero
7e116d8d3e Add function to load walk-in form. #340 2020-02-13 07:32:18 +00:00
Korina Cordero
60203cc7b5 Add routes for walk-in form. #340 2020-02-13 05:11:01 +00:00
Korina Cordero
62edf0f12c Tweak validation for mobile phone number. #339 2020-02-13 04:04:28 +00:00
Korina Cordero
51e333de8b Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 339-cmb-mobile-phone-validation-check 2020-02-13 02:46:52 +00:00