Commit graph

1369 commits

Author SHA1 Message Date
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
Korina Cordero
2fb24e4e13 Add validation for mobile phone number. #339 2020-02-13 02:41:32 +00:00
Korina Cordero
c81a56c6e6 Modify the checking if service type is new battery. #336 2020-02-12 02:33:14 +00:00
Korina Cordero
4f9e7959b5 Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 336-trans-method-to-check-if-new-battery 2020-02-12 01:41:50 +00:00
fb76cb0445 Replace ObjectManager with EntityManagerInterface #335 2020-02-11 20:31:28 +08:00
Korina Cordero
9cd5915e88 Add saving of serial when adding/editing/fulfilling a JO. #335 2020-02-11 08:09:55 +00:00
Korina Cordero
f0212cc6d4 Add checkIfNewBattery function to job order service. Add RiderAPIHandler to the respective services.yaml. #336 2020-02-11 05:54:58 +00:00
Korina Cordero
4d8ddc5323 Modify the retrieval of the flags from request object. #324 2020-02-11 01:49:24 +00:00
Korina Cordero
38d56d9c09 Set default value for the flags to false. #324 2020-02-11 01:36:13 +00:00
Korina Cordero
716f263e6b Make editable the new fields in JO form. #324 2020-02-10 08:13:36 +00:00
Korina Cordero
5dc57dc073 Add new fields to customer form. #324 2020-02-10 05:44:00 +00:00
Korina Cordero
fc6edb2b25 Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 324-add-new-fields-for-jo-form 2020-02-10 02:49:31 +00:00
Korina Cordero
52f075ccba Add new fields to customer. #324 2020-02-10 02:48:21 +00:00
Korina Cordero
0df0955cb3 Add rider assignment handler for resq. #333 2020-02-07 08:19:51 +00:00
Korina Cordero
8bbc39ec9e Merge branch '311-cmb-refactor-rapicontroller-into-a-service' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-07 02:24:17 +00:00
Korina Cordero
8dbcd0478d Add riders and dates to query filters. #329 2020-02-06 07:29:23 +00:00
Korina Cordero
b7cae5afe2 Add getOtherParameters to Resq job order handler. #329 2020-02-06 07:21:39 +00:00
Korina Cordero
49d0e6b97e Resolve missed merge conflict. #329 2020-02-06 05:43:15 +00:00
Korina Cordero
60e3d3673f Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging 2020-02-06 05:38:57 +00:00
Korina Cordero
075c83fb0d Add checking for valid plate number before warranty creation after JO is fulfilled. #311 2020-02-06 05:25:30 +00:00
Korina Cordero
1fc64cef8a Add checking for valid plate number before warranty creation after JO is fulfilled. #311 2020-02-06 04:59:48 +00:00
Korina Cordero
0af69bd963 Fix for payment bug. #327 2020-02-06 03:08:51 +00:00
Korina Cordero
91182fbc38 Remove git conflict message. #311 2020-02-05 23:47:53 +00:00
Korina Cordero
36657cbdf0 Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service 2020-02-05 08:25:18 +00:00
Korina Cordero
3300400456 Move the rest of the functions to the service. #311 2020-02-05 08:19:10 +00:00
Korina Cordero
cf783bf1cb Added validations to customer and customer vehicle data. #319 2020-02-05 05:28:59 +00:00
Korina Cordero
a3e40de170 Add adding of customer and customer vehicle from one step form. #319 2020-02-05 03:15:30 +00:00
6cdb5d0312 Fix battery fetching for new customer in one step jo form #319 2020-02-05 05:14:42 +08:00
cb5fa96307 Fix bug with missing entity manager for one step edit #319 2020-02-05 04:45:27 +08:00
d943015f4a Merge branch '319-cmb-one-step-form-display-rider-distance' of gitlab.com:jankstudio/resq into 319-cmb-one-step-form-display-rider-distance 2020-02-05 04:37:33 +08:00
746b25ad74 Fix one step form for CMB to allow for new customer and vehicle #319 2020-02-05 04:36:33 +08:00
Korina Cordero
b6700eed36 Add rider and date query parameters for list of to be fulfilled and open job orders. #319 2020-02-04 11:15:10 +00:00
Korina Cordero
15bafe2363 Fix for query when multiple parameters are passed. #319 2020-02-04 10:33:12 +00:00
Korina Cordero
3789871f9a Add rider and date filter to search. #319 2020-02-04 08:43:39 +00:00
Korina Cordero
56a797533d Add processing of deleting and adding a battery in one request. #323 2020-02-04 01:54:43 +00:00
Korina Cordero
96efa32a12 Fixes for battery_ajax_get. #323 2020-02-04 01:39:14 +00:00
Korina Cordero
ac908e9bcd Add saving of battery to vehicle. #323 2020-02-03 11:23:57 +00:00
Korina Cordero
6bcdf70902 Display the battery to be added to the form. #323 2020-02-03 11:03:52 +00:00
Korina Cordero
fd2fe4fb6f Add routes and UI elements to add compatible battery to vehicle. #323 2020-02-03 08:59:22 +00:00
Korina Cordero
05af87ed9c Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #311 2020-01-31 10:05:08 +00:00
Korina Cordero
aa1a2b3bcb Move the hubArrive function to the service. #311 2020-01-31 09:04:04 +00:00
Korina Cordero
bf3136da62 Move the arrive function to the service. #311 2020-01-31 08:53:35 +00:00
Korina Cordero
b651d06ec8 Move cancelJobOrder to the service. #311 2020-01-31 08:16:11 +00:00
Korina Cordero
de4bf9f271 Bug fixes for acceptJobOrder. #311 2020-01-31 07:55:26 +00:00
Korina Cordero
becd8d0c17 Move acceptJobOrder to the service. #311 2020-01-31 06:21:35 +00:00
Korina Cordero
35ccaa73c3 Add country code to constructor of RiderAPIHandler service. #311 2020-01-31 06:04:18 +00:00
Korina Cordero
3e5ea688bc Move logout and getJobOrder to the service. #311 2020-01-31 04:22:27 +00:00
Korina Cordero
c3662cd185 Add login to interface. #311 2020-01-30 08:53:56 +00:00
Korina Cordero
cbc99778cd Move login to the service. #311 2020-01-30 08:52:41 +00:00
Korina Cordero
4d104d38e1 Move the register function from controller to service. #311 2020-01-30 07:47:34 +00:00
Korina Cordero
10ecd6298a Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 318-error_log-cleanup 2020-01-30 04:03:44 +00:00
Korina Cordero
dab8986ad1 Remove or comment out error_logs meant for debugging purposes. #318 2020-01-30 00:31:01 +00:00