rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

WIP: Resolve "CMB - Walk-in customer form" #1193

Closed
korina.cordero wants to merge 0 commits from 340-cmb-walk-in-customer-form into master
pull from: 340-cmb-walk-in-customer-form
merge into: rgutierrez:master
Conversation 9 Commits - Files changed -
korina.cordero commented 2020-02-13 04:13:50 +00:00 (Migrated from gitlab.com)
Copy link

Closes #340

Closes #340
korina.cordero commented 2020-02-13 04:13:51 +00:00 (Migrated from gitlab.com)
Copy link

restored source branch 340-cmb-walk-in-customer-form

restored source branch `340-cmb-walk-in-customer-form`
korina.cordero commented 2020-02-13 05:11:16 +00:00 (Migrated from gitlab.com)
Copy link

added 255 commits

  • 37a83099 - Merge branch '265-cmb-project' of gitlab.com:jankstudio/resq into origin/265-cmb-project
  • f1cc1dfa - Create interface for invoice creator. #265
  • cce4638c - Rename invoice creator for resq. Make most public methods in invoice creator protected. #265
  • dc2eecbe - Rename InvoiceCreator to InvoiceGenerator. #265
  • 89ec286a - Rename processCriteria to generateInvoice. Added constants to invoice generator. #265
  • cf8c3bb8 - Move setting of invoice status and createdby inside the invoice generator. #265
  • ca97897a - Move the saving of new job order to a job order generator service. #265
  • b129609d - Refactor submission of updated job order. #265
  • 7f973fd1 - Merge branch 'master' of gitlab.com:jankstudio/resq into origin/265-cmb-project
  • f766965f - Add checking for invoice change. #265
  • 98a6bfc8 - Create invoice and job generator for cmb. Modify services.yaml for cmb. #265
  • 6e3be9ed - Rename from Cmb to CMB. #265
  • 6c3bc652 - Merge branch 'origin/265-cmb-project' into '270-final-cmb-fixes'
  • 37c0945d - Move the validation for incoming and editing job orders from the controller to the service. #270
  • bd869631 - Move the dispatch and assign rider to job order to the service. #270
  • 7754ddc5 - Move the assign rider, dispatch, fulfill, and cancel job order code to the service. #270
  • 34dc6193 - Move the initialization of parameters for new and edit job order forms to the service. #270
  • 2e2f4315 - Move the initialization of parameters for view all and processing job order...
  • 365b316d - Add exception handling to the job order service. #270
  • a7b5341f - Move the initialization of the fulfillment and hub forms to the service. #270
  • 12555f34 - Move the initialization of rider and hub forms and hub reassignment to the job order service. #270
  • e6482d44 - Move reassignment of hub and rider to the job order service. #270
  • 304ef327 - Move reject hub to the job order service. #270
  • 7de72e2c - Move unlock processor and unlock assignor to the job order service. #270
  • 2f555483 - Move generate PDF form to the job order service. #270
  • 7989f6b6 - Move retrieval of job order rows to the job service. #270
  • 08bd23fe - Fix issue of invalid meta urls. #270
  • f205f04b - Move the invoice generation out of the job order service and into the invoice...
  • 59807151 - Add command to add battery manufacturers from given csv file. #270
  • 987668ff - Add command to add battery models from given csv file. #270
  • 5348d2c5 - Add command to add battery sizes from given csv file. #270
  • a29ea875 - Add command to add batteries. #270
  • 54c98711 - merge import batter commands under one command. #270
  • 5ab7cd6e - Add vehicle and vehicle manufacturers in the import command. #270
  • 54a367af - Add images and icons for cmb. Add messages for cmb. #270
  • 2b48c702 - Fix for fatal error in command. #270
  • dcd34f6f - Fix adding of compatible batteries to vehicles. #270
  • 547c13d7 - Fix the adding of compatible batteries for a vehicle. #270
  • f6df19a5 - Add sql script that deletes the data from battery and vehicle tables. #270
  • eb0e19d2 - Add country code prefix to messages. Made the country code a constant. #270
  • a9ed02b0 - Limit the service types to 2 for POC. Have job order return which twig template to display. #270
  • 610bbdcc - Add trade in type for cmb. #270
  • 7e446883 - Add to translation file default point for map. #270
  • a8792c32 - Set the default point for maps. #270
  • 111bb55a - Add command to add prices to batteries using a csv file. #270
  • 7adcb524 - Add command to add tradein prices to battery sizes using a csv file. #270
  • c0d363dd - Redo the import battery data command. #270
  • 02b88bca - Redo the battery vehicle compatibility command. #270
  • 6d0af269 - Redo the import tradein price command. #270
  • 361b8c04 - Change century logo in main template #270
  • 906cf2b6 - Add normalize name method to process special cases for battery size. #270
  • eb6e3118 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes
  • c6b31569 - Create service types for CMB. #270
  • c2fbb75a - Change Delivery Instructions label to Delivery Instructions - CarFix Job Order No. #270
  • ff58ccf9 - Add autocomplete for maps in job order. Set the default region in translation files. #270
  • 74e09384 - Add autocomplete for maps in outlet, hub, and partner. #270
  • e7584b10 - Add warranty creation after a job order is fulfilled. #270
  • a2094758 - Add warranty creation when rider confirms payment of JO. #270
  • 26d2dab6 - Remove warranty creation when service type is battery replacement under warranty. #270
  • 01ffdea2 - Add map to Dashboard. #270
  • 76b291f6 - Add the rider tracker service to retrieve and display all rider locations. #270
  • c05921cd - Add autorefresh for rider locations in map. #270
  • f5606d83 - Add label to rider markers. #270
  • 29cc7374 - Add custom trade in types, warranty class, and modes of payment. #270
  • c3195418 - Add command to seed current rider sessions to redis cache. #270
  • f70155a1 - Update redis cache for rider session when rider registers or logs in. #270
  • 934afece - Remove unnecessary comments from command. #270
  • 2bb213ef - Move the dashboard routes to home.yaml. #270
  • 954ae0e2 - Removed the color, status, and fuel type fields for customer vehicle. #270
  • 9165fa1e - Remove error_logs. #270
  • a0ad1b00 - Add asterisks to required fields for job order. #270
  • 341db637 - Create a twig template for job order for resq, separate from cmb. #270
  • 58c671fe - Add TODO for country code prefix. #270
  • d385d32d - Move the adding of customer and customer vehicle to customer handler service. #270
  • 50e54f6a - Move the update of customer and customer vehicle to customer handler service. #270
  • 0a8ba8ca - Remove old implementation for update customer. #270
  • 3a33a16c - Move the loading of customer list page to the customer service. #270
  • fb6823d2 - Move the customer list to the customer handler service. #270
  • cc3db5b5 - Move the delete customer to the service. #270
  • 8f875f1e - Move getCustomerVehicles to the customer handler service. #270
  • 174f0142 - Move getCustomerVehicleInfo to the customer handler service. #270
  • 4549e124 - Add job order queueing for riders assignments. #270
  • 15339877 - Add a TODO for the JobHandlerInterface. #270
  • 9e9dba95 - Change the map in the Dashboard to use leaflet and openmaps. #270
  • ade2c3b5 - Add map manager interface. #270
  • e2dd980a - Rename twig block for javascript. #270
  • 505fa86f - Fix console error when google or bing maps are used. #270
  • 734aaac3 - Add display of rider markers for OSM. #270
  • 93692415 - Add rider id to marker popup. #270
  • d04a6976 - Use OpenStreetMap for map in incoming form. #270
  • 5bdc1a7f - Use OpenStreetMap for map in incoming JO form. #270
  • bf223103 - Change implementation of all maps for job order to OpenStreet. #270
  • fdf68618 - Change icons for the hub map. #270
  • 8bbe245c - Add snippet and comments that will not display the riders by default. #270
  • 8e331495 - Add TODO for the OSM implementation for job order. #270
  • 185ac8aa - Add TODO for the access token. #270
  • 494ae854 - Add OpenStreet implementation to resq form. #270
  • 2f3e8df6 - Fix dashboard map bug when rider has no assigned hub #270
  • 5b2b5654 - Add default resq services and comment out cmb for easy swap #270
  • 5852b825 - Make resq translation file the default #270
  • bd1dd36e - Prettify the map in the dashboard #270
  • 008e482f - Modify dashboard to display customers and riders with popup details #270
  • e4277b89 - Remove footer #270
  • 1b6727ca - Expand map to 100% height #270
  • 2d023b5e - Fix location issue in incoming job order. #270
  • a21d0509 - Fix centering issue for hub map when dispatching a job order. #270
  • 51850d02 - Add one step job order process form #270
  • 60391966 - Add form tags for the one step form. #270
  • 0771f2b8 - Add selection of hub. #270
  • 72abf2f2 - Add rider assignment section to form. #270
  • 0ed4e102 - Add rider assignment to one step form. #270
  • b7b673fd - Add rider selection to one step form. #270
  • ed2975e8 - Add validation when submitting a one step job order. #270
  • 79ab6061 - Add saving of one step job order data. #270
  • 3a167f0b - Add links and routes to editing a one step job order form. #270
  • 8da95f2e - Add saving of updated form for one step job order. #270
  • 99e84850 - Display invoice details for editing one step form. #270
  • a92c8c90 - Added a di after battery details for Invoice. #270
  • 35f0d9c7 - Add riders to one step job order map. #270
  • 260c2187 - Added one step form for CMB. #270
  • bbaaf250 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map
  • ece4e6dd - Add MQTT subscribe functionality in main dashboard #299
  • 425c235c - Include kml directory in gitignore #299
  • b435cdfa - Fix bug in map script for dashboard #299
  • 67a7b86f - Add handler for rider location updates in dashboard #299
  • d2286f21 - Add rider_id to RAPI login return data #299
  • 3667e122 - Add mqtt websocket server settings in env file #299
  • e463876c - Create marker in dashboard map when rider id is not yet there #299
  • 68fd16e6 - Shift to CMB configuration #299
  • eac8f41d - Make rider markers load popup via ajax #299
  • ec5e67a6 - Make customer marker popup load via ajax #299
  • d6015978 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • d418f0ff - Remove hardcoded prefix from customer. Add country code to .env and services.yaml. #307
  • 026a1aa4 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • 8727c227 - Merge branch '307-cmb-fix-customer-hard-coded-country-code' of...
  • d569c666 - Add warranty creation when JO is fulfilled to ResqJobOrderHandler. #305
  • 2f9f787e - Added CMB CustomerHandler in services.yaml. #305
  • 5ac6127e - Merge branch '307-cmb-fix-customer-hard-coded-country-code' into '270-final-cmb-fixes'
  • 39adfe19 - Merge branch...
  • 2c9f5180 - Move warranty creation when JO is fulfilled to the warranty handler for CMB. #308
  • 1545f623 - Merge branch...
  • 68a92b2d - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map
  • 0297d66d - Merge branch '299-cmb-realtime-map' into '270-final-cmb-fixes'
  • fb52b59a - Refactor mqtt sender script #299
  • fe7cfe6c - Refactor RedisClientProvider #299
  • ce0d0fb2 - Add initial job order active cache that listens to JobOrder entity events #299
  • 5a138ce0 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • 8e613a43 - Bug fixes from merge. Remove hardcoded country code prefixes from onestep form. #309
  • c9185e61 - Bug fixes for RAPIController. #309
  • 66be351b - Make MQTT key configurable #299
  • c753be54 - Refactor dashboard map js to use classes #299
  • 9e00c3f1 - Fix publishing and subscribing for new / updated JOs #299
  • 5279e886 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • 3eb7c2c4 - Update RAPIController.php
  • fd0738ad - Merge branch '309-replace-63-in-templates-with-proper-country-code' of...
  • 64689543 - Display hubs and riders in non-dynamic table for onestep edit. #312
  • 96bed8a4 - Add highlight to selected hub and rider when loading onestepedit form. #312
  • adc6cc8c - Add highlight to selected hub and rider when loading onestepedit form for resq. #312
  • cba80ddd - Have active job orders loaded from cache in dashboard map #299
  • f350b3eb - Make command to load active job order cache #299
  • a5a95a45 - Create new mqtt_rider utility script for rider location caching #299
  • 2d619331 - Add ability to remove customer markers via status publish #299
  • eb9b8bfd - Fix bug for onestep edit when user selects another hub but does not select a new rider. #312
  • 879e1129 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • ce9a1abd - Merge branch '312-cmb-highlight-selected-hub-and-rider-in-onestep-edit' of...
  • 655ead77 - Change color of hubs and riders. #312
  • 79b758f5 - Fix for rider icons not displaying in map. #312
  • bdb306e5 - Fix bug in mqtt_rider script #299
  • 4719d893 - Add rider cache service #299
  • 676bf400 - Merge branch '299-cmb-realtime-map' into '270-final-cmb-fixes'
  • 86b4601b - Fix bug in rider cache #270
  • 9563bd8c - Fix dashboard bug for active riders not in the database #270
  • a82cfb26 - Fix bug for dashboard rider #270
  • 6dd3f337 - Merge branch '309-replace-63-in-templates-with-proper-country-code' into '270-final-cmb-fixes'
  • 0daf2a28 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • ffb4551f - Update composer lock after running composer require. #312
  • 44276670 - Merge branch '312-cmb-highlight-selected-hub-and-rider-in-onestep-edit' of...
  • 555bd5ae - Add Cancel Job Order button to onestep form. #313
  • bc8ce40b - Add distance from customer to hub to hub table. #314
  • 8d45b8e6 - Merge branch '314-cmb-add-hub-distance-to-customer-on-one-step-hub-table' into...
  • e914c6d2 - Add customer jo tracking view #315
  • 4f1a5f2e - Merge branch '315-cmb-add-customer-view-of-job-order' into '270-final-cmb-fixes'
  • c8157b95 - Add functionality to job order tracking page #270
  • 41a6801c - Fix string concat bug in jo tracking page #270
  • e8e97bcd - Fix jo link in rider and customer popup in dashboard #270
  • 84293cb4 - Merge branch '317-delete-icon-for-battery-in-vehicle-screen' into '270-final-cmb-fixes'
  • 10ecd629 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 318-error_log-cleanup
  • ed606a87 - Merge branch '318-error_log-cleanup' into '270-final-cmb-fixes'
  • 74c239cf - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • 4d104d38 - Move the register function from controller to service. #311
  • cbc99778 - Move login to the service. #311
  • c3662cd1 - Add login to interface. #311
  • 3e5ea688 - Move logout and getJobOrder to the service. #311
  • 35ccaa73 - Add country code to constructor of RiderAPIHandler service. #311
  • becd8d0c - Move acceptJobOrder to the service. #311
  • de4bf9f2 - Bug fixes for acceptJobOrder. #311
  • b651d06e - Move cancelJobOrder to the service. #311
  • bf3136da - Move the arrive function to the service. #311
  • aa1a2b3b - Move the hubArrive function to the service. #311
  • 05af87ed - Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #311
  • 2093bbde - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • ca8d6fb5 - Add multipolygon type #319
  • 3789871f - Add rider and date filter to search. #319
  • 15bafe23 - Fix for query when multiple parameters are passed. #319
  • 4ad0db07 - Add new customer option enabling customer and vehicle fields #319
  • b6700eed - Add rider and date query parameters for list of to be fulfilled and open job orders. #319
  • 746b25ad - Fix one step form for CMB to allow for new customer and vehicle #319
  • d943015f - Merge branch '319-cmb-one-step-form-display-rider-distance' of...
  • cb5fa963 - Fix bug with missing entity manager for one step edit #319
  • 6cdb5d03 - Fix battery fetching for new customer in one step jo form #319
  • eee516a6 - Merge branch '319-cmb-one-step-form-display-rider-distance' into '270-final-cmb-fixes'
  • a3e40de1 - Add adding of customer and customer vehicle from one step form. #319
  • cf783bf1 - Added validations to customer and customer vehicle data. #319
  • 295dbaa2 - Remove Rider label and added option AllRiders to Rider dropdown. #319
  • 33004004 - Move the rest of the functions to the service. #311
  • 36657cbd - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • 3e2d0db5 - Merge branch '319-cmb-one-step-form-display-rider-distance' into '270-final-cmb-fixes'
  • 91182fbc - Remove git conflict message. #311
  • 1fc64cef - Add checking for valid plate number before warranty creation after JO is fulfilled. #311
  • 075c83fb - Add checking for valid plate number before warranty creation after JO is fulfilled. #311
  • 60e3d367 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • 49d0e6b9 - Resolve missed merge conflict. #329
  • b7cae5af - Add getOtherParameters to Resq job order handler. #329
  • 8dbcd047 - Add riders and dates to query filters. #329
  • eceb20f2 - Add resq counterparts in services.yaml. #329
  • 088dca5a - Create two separate services.yaml for resq and cmb. #329
  • 8bbc39ec - Merge branch '311-cmb-refactor-rapicontroller-into-a-service' of...
  • 0df0955c - Add rider assignment handler for resq. #333
  • d62a36b6 - Merge branch '333-rider-assignment-handler-for-resq' into...
  • 52f075cc - Add new fields to customer. #324
  • fc6edb2b - Merge branch '329-transition-branch-for-cmb-and-resq-merging' of...
  • e260edc8 - Add new fields to incoming job order form. #324
  • 5dc57dc0 - Add new fields to customer form. #324
  • 716f263e - Make editable the new fields in JO form. #324
  • e202fb65 - Disable the new fields if editing JO form. #324
  • 38d56d9c - Set default value for the flags to false. #324
  • 4d8ddc53 - Modify the retrieval of the flags from request object. #324
  • cf7e0269 - Merge branch '324-add-new-fields-for-jo-form' into '329-transition-branch-for-cmb-and-resq-merging'
  • 2226f7c8 - Merge branch '311-cmb-refactor-rapicontroller-into-a-service' into '270-final-cmb-fixes'
  • 23253a1e - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • f0212cc6 - Add checkIfNewBattery function to job order service. Add RiderAPIHandler to...
  • 9cd5915e - Add saving of serial when adding/editing/fulfilling a JO. #335
  • d51a98a6 - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...
  • fb76cb04 - Replace ObjectManager with EntityManagerInterface #335
  • 3981dd95 - Set services to CMB #335
  • 866910db - Updated composer #335
  • fde400e0 - Remove text 'No current battery' for serial. #335
  • 54fa5508 - Merge branch '335-cmb-editable-battery-serial-number' into...
  • 4f9e7959 - Merge branch '329-transition-branch-for-cmb-and-resq-merging' of...
  • c81a56c6 - Modify the checking if service type is new battery. #336
  • f354631d - Add RiderAPIHandler to services.yaml for resq and cmb. #329
  • 29be1e94 - Fix wiring for resq rider api handler. #329
  • 1595954a - Merge branch '329-transition-branch-for-cmb-and-resq-merging' of...
  • 592c8e81 - Merge branch '336-trans-method-to-check-if-new-battery' into...
  • 60203cc7 - Add routes for walk-in form. #340

Compare with previous version

added 255 commits <ul><li>37a83099 - Merge branch &#39;265-cmb-project&#39; of gitlab.com:jankstudio/resq into origin/265-cmb-project</li><li>f1cc1dfa - Create interface for invoice creator. #265</li><li>cce4638c - Rename invoice creator for resq. Make most public methods in invoice creator protected. #265</li><li>dc2eecbe - Rename InvoiceCreator to InvoiceGenerator. #265</li><li>89ec286a - Rename processCriteria to generateInvoice. Added constants to invoice generator. #265</li><li>cf8c3bb8 - Move setting of invoice status and createdby inside the invoice generator. #265</li><li>ca97897a - Move the saving of new job order to a job order generator service. #265</li><li>b129609d - Refactor submission of updated job order. #265</li><li>7f973fd1 - Merge branch &#39;master&#39; of gitlab.com:jankstudio/resq into origin/265-cmb-project</li><li>f766965f - Add checking for invoice change. #265</li><li>98a6bfc8 - Create invoice and job generator for cmb. Modify services.yaml for cmb. #265</li><li>6e3be9ed - Rename from Cmb to CMB. #265</li><li>6c3bc652 - Merge branch &#39;origin/265-cmb-project&#39; into &#39;270-final-cmb-fixes&#39;</li><li>37c0945d - Move the validation for incoming and editing job orders from the controller to the service. #270</li><li>bd869631 - Move the dispatch and assign rider to job order to the service. #270</li><li>7754ddc5 - Move the assign rider, dispatch, fulfill, and cancel job order code to the service. #270</li><li>34dc6193 - Move the initialization of parameters for new and edit job order forms to the service. #270</li><li>2e2f4315 - Move the initialization of parameters for view all and processing job order...</li><li>365b316d - Add exception handling to the job order service. #270</li><li>a7b5341f - Move the initialization of the fulfillment and hub forms to the service. #270</li><li>12555f34 - Move the initialization of rider and hub forms and hub reassignment to the job order service. #270</li><li>e6482d44 - Move reassignment of hub and rider to the job order service. #270</li><li>304ef327 - Move reject hub to the job order service. #270</li><li>7de72e2c - Move unlock processor and unlock assignor to the job order service. #270</li><li>2f555483 - Move generate PDF form to the job order service. #270</li><li>7989f6b6 - Move retrieval of job order rows to the job service. #270</li><li>08bd23fe - Fix issue of invalid meta urls. #270</li><li>f205f04b - Move the invoice generation out of the job order service and into the invoice...</li><li>59807151 - Add command to add battery manufacturers from given csv file. #270</li><li>987668ff - Add command to add battery models from given csv file. #270</li><li>5348d2c5 - Add command to add battery sizes from given csv file. #270</li><li>a29ea875 - Add command to add batteries. #270</li><li>54c98711 - merge import batter commands under one command. #270</li><li>5ab7cd6e - Add vehicle and vehicle manufacturers in the import command. #270</li><li>54a367af - Add images and icons for cmb. Add messages for cmb. #270</li><li>2b48c702 - Fix for fatal error in command. #270</li><li>dcd34f6f - Fix adding of compatible batteries to vehicles. #270</li><li>547c13d7 - Fix the adding of compatible batteries for a vehicle. #270</li><li>f6df19a5 - Add sql script that deletes the data from battery and vehicle tables. #270</li><li>eb0e19d2 - Add country code prefix to messages. Made the country code a constant. #270</li><li>a9ed02b0 - Limit the service types to 2 for POC. Have job order return which twig template to display. #270</li><li>610bbdcc - Add trade in type for cmb. #270</li><li>7e446883 - Add to translation file default point for map. #270</li><li>a8792c32 - Set the default point for maps. #270</li><li>111bb55a - Add command to add prices to batteries using a csv file. #270</li><li>7adcb524 - Add command to add tradein prices to battery sizes using a csv file. #270</li><li>c0d363dd - Redo the import battery data command. #270</li><li>02b88bca - Redo the battery vehicle compatibility command. #270</li><li>6d0af269 - Redo the import tradein price command. #270</li><li>361b8c04 - Change century logo in main template #270</li><li>906cf2b6 - Add normalize name method to process special cases for battery size. #270</li><li>eb6e3118 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into 270-final-cmb-fixes</li><li>c6b31569 - Create service types for CMB. #270</li><li>c2fbb75a - Change Delivery Instructions label to Delivery Instructions - CarFix Job Order No. #270</li><li>ff58ccf9 - Add autocomplete for maps in job order. Set the default region in translation files. #270</li><li>74e09384 - Add autocomplete for maps in outlet, hub, and partner. #270</li><li>e7584b10 - Add warranty creation after a job order is fulfilled. #270</li><li>a2094758 - Add warranty creation when rider confirms payment of JO. #270</li><li>26d2dab6 - Remove warranty creation when service type is battery replacement under warranty. #270</li><li>01ffdea2 - Add map to Dashboard. #270</li><li>76b291f6 - Add the rider tracker service to retrieve and display all rider locations. #270</li><li>c05921cd - Add autorefresh for rider locations in map. #270</li><li>f5606d83 - Add label to rider markers. #270</li><li>29cc7374 - Add custom trade in types, warranty class, and modes of payment. #270</li><li>c3195418 - Add command to seed current rider sessions to redis cache. #270</li><li>f70155a1 - Update redis cache for rider session when rider registers or logs in. #270</li><li>934afece - Remove unnecessary comments from command. #270</li><li>2bb213ef - Move the dashboard routes to home.yaml. #270</li><li>954ae0e2 - Removed the color, status, and fuel type fields for customer vehicle. #270</li><li>9165fa1e - Remove error_logs. #270</li><li>a0ad1b00 - Add asterisks to required fields for job order. #270</li><li>341db637 - Create a twig template for job order for resq, separate from cmb. #270</li><li>58c671fe - Add TODO for country code prefix. #270</li><li>d385d32d - Move the adding of customer and customer vehicle to customer handler service. #270</li><li>50e54f6a - Move the update of customer and customer vehicle to customer handler service. #270</li><li>0a8ba8ca - Remove old implementation for update customer. #270</li><li>3a33a16c - Move the loading of customer list page to the customer service. #270</li><li>fb6823d2 - Move the customer list to the customer handler service. #270</li><li>cc3db5b5 - Move the delete customer to the service. #270</li><li>8f875f1e - Move getCustomerVehicles to the customer handler service. #270</li><li>174f0142 - Move getCustomerVehicleInfo to the customer handler service. #270</li><li>4549e124 - Add job order queueing for riders assignments. #270</li><li>15339877 - Add a TODO for the JobHandlerInterface. #270</li><li>9e9dba95 - Change the map in the Dashboard to use leaflet and openmaps. #270</li><li>ade2c3b5 - Add map manager interface. #270</li><li>e2dd980a - Rename twig block for javascript. #270</li><li>505fa86f - Fix console error when google or bing maps are used. #270</li><li>734aaac3 - Add display of rider markers for OSM. #270</li><li>93692415 - Add rider id to marker popup. #270</li><li>d04a6976 - Use OpenStreetMap for map in incoming form. #270</li><li>5bdc1a7f - Use OpenStreetMap for map in incoming JO form. #270</li><li>bf223103 - Change implementation of all maps for job order to OpenStreet. #270</li><li>fdf68618 - Change icons for the hub map. #270</li><li>8bbe245c - Add snippet and comments that will not display the riders by default. #270</li><li>8e331495 - Add TODO for the OSM implementation for job order. #270</li><li>185ac8aa - Add TODO for the access token. #270</li><li>494ae854 - Add OpenStreet implementation to resq form. #270</li><li>2f3e8df6 - Fix dashboard map bug when rider has no assigned hub #270</li><li>5b2b5654 - Add default resq services and comment out cmb for easy swap #270</li><li>5852b825 - Make resq translation file the default #270</li><li>bd1dd36e - Prettify the map in the dashboard #270</li><li>008e482f - Modify dashboard to display customers and riders with popup details #270</li><li>e4277b89 - Remove footer #270</li><li>1b6727ca - Expand map to 100% height #270</li><li>2d023b5e - Fix location issue in incoming job order. #270</li><li>a21d0509 - Fix centering issue for hub map when dispatching a job order. #270</li><li>51850d02 - Add one step job order process form #270</li><li>60391966 - Add form tags for the one step form. #270</li><li>0771f2b8 - Add selection of hub. #270</li><li>72abf2f2 - Add rider assignment section to form. #270</li><li>0ed4e102 - Add rider assignment to one step form. #270</li><li>b7b673fd - Add rider selection to one step form. #270</li><li>ed2975e8 - Add validation when submitting a one step job order. #270</li><li>79ab6061 - Add saving of one step job order data. #270</li><li>3a167f0b - Add links and routes to editing a one step job order form. #270</li><li>8da95f2e - Add saving of updated form for one step job order. #270</li><li>99e84850 - Display invoice details for editing one step form. #270</li><li>a92c8c90 - Added a di after battery details for Invoice. #270</li><li>35f0d9c7 - Add riders to one step job order map. #270</li><li>260c2187 - Added one step form for CMB. #270</li><li>bbaaf250 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into 299-cmb-realtime-map</li><li>ece4e6dd - Add MQTT subscribe functionality in main dashboard #299</li><li>425c235c - Include kml directory in gitignore #299</li><li>b435cdfa - Fix bug in map script for dashboard #299</li><li>67a7b86f - Add handler for rider location updates in dashboard #299</li><li>d2286f21 - Add rider_id to RAPI login return data #299</li><li>3667e122 - Add mqtt websocket server settings in env file #299</li><li>e463876c - Create marker in dashboard map when rider id is not yet there #299</li><li>68fd16e6 - Shift to CMB configuration #299</li><li>eac8f41d - Make rider markers load popup via ajax #299</li><li>ec5e67a6 - Make customer marker popup load via ajax #299</li><li>d6015978 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>d418f0ff - Remove hardcoded prefix from customer. Add country code to .env and services.yaml. #307</li><li>026a1aa4 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>8727c227 - Merge branch &#39;307-cmb-fix-customer-hard-coded-country-code&#39; of...</li><li>d569c666 - Add warranty creation when JO is fulfilled to ResqJobOrderHandler. #305</li><li>2f9f787e - Added CMB CustomerHandler in services.yaml. #305</li><li>5ac6127e - Merge branch &#39;307-cmb-fix-customer-hard-coded-country-code&#39; into &#39;270-final-cmb-fixes&#39;</li><li>39adfe19 - Merge branch...</li><li>2c9f5180 - Move warranty creation when JO is fulfilled to the warranty handler for CMB. #308</li><li>1545f623 - Merge branch...</li><li>68a92b2d - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into 299-cmb-realtime-map</li><li>0297d66d - Merge branch &#39;299-cmb-realtime-map&#39; into &#39;270-final-cmb-fixes&#39;</li><li>fb52b59a - Refactor mqtt sender script #299</li><li>fe7cfe6c - Refactor RedisClientProvider #299</li><li>ce0d0fb2 - Add initial job order active cache that listens to JobOrder entity events #299</li><li>5a138ce0 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>8e613a43 - Bug fixes from merge. Remove hardcoded country code prefixes from onestep form. #309</li><li>c9185e61 - Bug fixes for RAPIController. #309</li><li>66be351b - Make MQTT key configurable #299</li><li>c753be54 - Refactor dashboard map js to use classes #299</li><li>9e00c3f1 - Fix publishing and subscribing for new / updated JOs #299</li><li>5279e886 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>3eb7c2c4 - Update RAPIController.php</li><li>fd0738ad - Merge branch &#39;309-replace-63-in-templates-with-proper-country-code&#39; of...</li><li>64689543 - Display hubs and riders in non-dynamic table for onestep edit. #312</li><li>96bed8a4 - Add highlight to selected hub and rider when loading onestepedit form. #312</li><li>adc6cc8c - Add highlight to selected hub and rider when loading onestepedit form for resq. #312</li><li>cba80ddd - Have active job orders loaded from cache in dashboard map #299</li><li>f350b3eb - Make command to load active job order cache #299</li><li>a5a95a45 - Create new mqtt_rider utility script for rider location caching #299</li><li>2d619331 - Add ability to remove customer markers via status publish #299</li><li>eb9b8bfd - Fix bug for onestep edit when user selects another hub but does not select a new rider. #312</li><li>879e1129 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>ce9a1abd - Merge branch &#39;312-cmb-highlight-selected-hub-and-rider-in-onestep-edit&#39; of...</li><li>655ead77 - Change color of hubs and riders. #312</li><li>79b758f5 - Fix for rider icons not displaying in map. #312</li><li>bdb306e5 - Fix bug in mqtt_rider script #299</li><li>4719d893 - Add rider cache service #299</li><li>676bf400 - Merge branch &#39;299-cmb-realtime-map&#39; into &#39;270-final-cmb-fixes&#39;</li><li>86b4601b - Fix bug in rider cache #270</li><li>9563bd8c - Fix dashboard bug for active riders not in the database #270</li><li>a82cfb26 - Fix bug for dashboard rider #270</li><li>6dd3f337 - Merge branch &#39;309-replace-63-in-templates-with-proper-country-code&#39; into &#39;270-final-cmb-fixes&#39;</li><li>0daf2a28 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>ffb4551f - Update composer lock after running composer require. #312</li><li>44276670 - Merge branch &#39;312-cmb-highlight-selected-hub-and-rider-in-onestep-edit&#39; of...</li><li>555bd5ae - Add Cancel Job Order button to onestep form. #313</li><li>bc8ce40b - Add distance from customer to hub to hub table. #314</li><li>8d45b8e6 - Merge branch &#39;314-cmb-add-hub-distance-to-customer-on-one-step-hub-table&#39; into...</li><li>e914c6d2 - Add customer jo tracking view #315</li><li>4f1a5f2e - Merge branch &#39;315-cmb-add-customer-view-of-job-order&#39; into &#39;270-final-cmb-fixes&#39;</li><li>c8157b95 - Add functionality to job order tracking page #270</li><li>41a6801c - Fix string concat bug in jo tracking page #270</li><li>e8e97bcd - Fix jo link in rider and customer popup in dashboard #270</li><li>84293cb4 - Merge branch &#39;317-delete-icon-for-battery-in-vehicle-screen&#39; into &#39;270-final-cmb-fixes&#39;</li><li>10ecd629 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into 318-error_log-cleanup</li><li>ed606a87 - Merge branch &#39;318-error_log-cleanup&#39; into &#39;270-final-cmb-fixes&#39;</li><li>74c239cf - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>4d104d38 - Move the register function from controller to service. #311</li><li>cbc99778 - Move login to the service. #311</li><li>c3662cd1 - Add login to interface. #311</li><li>3e5ea688 - Move logout and getJobOrder to the service. #311</li><li>35ccaa73 - Add country code to constructor of RiderAPIHandler service. #311</li><li>becd8d0c - Move acceptJobOrder to the service. #311</li><li>de4bf9f2 - Bug fixes for acceptJobOrder. #311</li><li>b651d06e - Move cancelJobOrder to the service. #311</li><li>bf3136da - Move the arrive function to the service. #311</li><li>aa1a2b3b - Move the hubArrive function to the service. #311</li><li>05af87ed - Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #311</li><li>2093bbde - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>ca8d6fb5 - Add multipolygon type #319</li><li>3789871f - Add rider and date filter to search. #319</li><li>15bafe23 - Fix for query when multiple parameters are passed. #319</li><li>4ad0db07 - Add new customer option enabling customer and vehicle fields #319</li><li>b6700eed - Add rider and date query parameters for list of to be fulfilled and open job orders. #319</li><li>746b25ad - Fix one step form for CMB to allow for new customer and vehicle #319</li><li>d943015f - Merge branch &#39;319-cmb-one-step-form-display-rider-distance&#39; of...</li><li>cb5fa963 - Fix bug with missing entity manager for one step edit #319</li><li>6cdb5d03 - Fix battery fetching for new customer in one step jo form #319</li><li>eee516a6 - Merge branch &#39;319-cmb-one-step-form-display-rider-distance&#39; into &#39;270-final-cmb-fixes&#39;</li><li>a3e40de1 - Add adding of customer and customer vehicle from one step form. #319</li><li>cf783bf1 - Added validations to customer and customer vehicle data. #319</li><li>295dbaa2 - Remove Rider label and added option AllRiders to Rider dropdown. #319</li><li>33004004 - Move the rest of the functions to the service. #311</li><li>36657cbd - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>3e2d0db5 - Merge branch &#39;319-cmb-one-step-form-display-rider-distance&#39; into &#39;270-final-cmb-fixes&#39;</li><li>91182fbc - Remove git conflict message. #311</li><li>1fc64cef - Add checking for valid plate number before warranty creation after JO is fulfilled. #311</li><li>075c83fb - Add checking for valid plate number before warranty creation after JO is fulfilled. #311</li><li>60e3d367 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>49d0e6b9 - Resolve missed merge conflict. #329</li><li>b7cae5af - Add getOtherParameters to Resq job order handler. #329</li><li>8dbcd047 - Add riders and dates to query filters. #329</li><li>eceb20f2 - Add resq counterparts in services.yaml. #329</li><li>088dca5a - Create two separate services.yaml for resq and cmb. #329</li><li>8bbc39ec - Merge branch &#39;311-cmb-refactor-rapicontroller-into-a-service&#39; of...</li><li>0df0955c - Add rider assignment handler for resq. #333</li><li>d62a36b6 - Merge branch &#39;333-rider-assignment-handler-for-resq&#39; into...</li><li>52f075cc - Add new fields to customer. #324</li><li>fc6edb2b - Merge branch &#39;329-transition-branch-for-cmb-and-resq-merging&#39; of...</li><li>e260edc8 - Add new fields to incoming job order form. #324</li><li>5dc57dc0 - Add new fields to customer form. #324</li><li>716f263e - Make editable the new fields in JO form. #324</li><li>e202fb65 - Disable the new fields if editing JO form. #324</li><li>38d56d9c - Set default value for the flags to false. #324</li><li>4d8ddc53 - Modify the retrieval of the flags from request object. #324</li><li>cf7e0269 - Merge branch &#39;324-add-new-fields-for-jo-form&#39; into &#39;329-transition-branch-for-cmb-and-resq-merging&#39;</li><li>2226f7c8 - Merge branch &#39;311-cmb-refactor-rapicontroller-into-a-service&#39; into &#39;270-final-cmb-fixes&#39;</li><li>23253a1e - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>f0212cc6 - Add checkIfNewBattery function to job order service. Add RiderAPIHandler to...</li><li>9cd5915e - Add saving of serial when adding/editing/fulfilling a JO. #335</li><li>d51a98a6 - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into...</li><li>fb76cb04 - Replace ObjectManager with EntityManagerInterface #335</li><li>3981dd95 - Set services to CMB #335</li><li>866910db - Updated composer #335</li><li>fde400e0 - Remove text &#39;No current battery&#39; for serial. #335</li><li>54fa5508 - Merge branch &#39;335-cmb-editable-battery-serial-number&#39; into...</li><li>4f9e7959 - Merge branch &#39;329-transition-branch-for-cmb-and-resq-merging&#39; of...</li><li>c81a56c6 - Modify the checking if service type is new battery. #336</li><li>f354631d - Add RiderAPIHandler to services.yaml for resq and cmb. #329</li><li>29be1e94 - Fix wiring for resq rider api handler. #329</li><li>1595954a - Merge branch &#39;329-transition-branch-for-cmb-and-resq-merging&#39; of...</li><li>592c8e81 - Merge branch &#39;336-trans-method-to-check-if-new-battery&#39; into...</li><li>60203cc7 - Add routes for walk-in form. #340</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/382/diffs?diff_id=75272227&start_sha=506505bff5ac917af3ba2ad6e3f36c366bbc5de1)
korina.cordero commented 2020-02-13 07:32:30 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>7e116d8d - Add function to load walk-in form. #340</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/382/diffs?diff_id=75285111&start_sha=60203cc7b5cd6ab14b28909023fe66da7fd2ef00)
korina.cordero commented 2020-02-13 08:54:09 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>d07adc60 - Add saving of walkin form. #340</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/382/diffs?diff_id=75298746&start_sha=7e116d8d3eb11d19a226e6ed6ec2a1e32f7e181f)
korina.cordero commented 2020-02-14 01:47:21 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>034ae108 - Fix saving issue for JOEvent. #340</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/382/diffs?diff_id=75457785&start_sha=d07adc606b6a4e84e36bdbc522090d383c951344)
korina.cordero commented 2020-02-14 03:07:51 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>bea5d72d - Modify the function names for walkin. #340</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/382/diffs?diff_id=75461549&start_sha=034ae108e0031fdc92626ff4de2cb96bddaa2e04)
korina.cordero commented 2020-02-14 03:10:15 +00:00 (Migrated from gitlab.com)
Copy link

added 5 commits

  • 2fb24e4e - Add validation for mobile phone number. #339
  • 51e333de - Merge branch '329-transition-branch-for-cmb-and-resq-merging' of...
  • 62edf0f1 - Tweak validation for mobile phone number. #339
  • 3ec6ca0e - Merge branch '339-cmb-mobile-phone-validation-check' into '270-final-cmb-fixes'
  • 6a944eeb - Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 340-cmb-walk-in-customer-form

Compare with previous version

added 5 commits <ul><li>2fb24e4e - Add validation for mobile phone number. #339</li><li>51e333de - Merge branch &#39;329-transition-branch-for-cmb-and-resq-merging&#39; of...</li><li>62edf0f1 - Tweak validation for mobile phone number. #339</li><li>3ec6ca0e - Merge branch &#39;339-cmb-mobile-phone-validation-check&#39; into &#39;270-final-cmb-fixes&#39;</li><li>6a944eeb - Merge branch &#39;270-final-cmb-fixes&#39; of gitlab.com:jankstudio/resq into 340-cmb-walk-in-customer-form</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/382/diffs?diff_id=75461659&start_sha=bea5d72d13d80d4ea1fd6f19dd528abeb9950eef)
korina.cordero commented 2020-02-14 03:38:58 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • ac91960b - Add mobile phone validation for JO when new customer is created. #340

Compare with previous version

added 1 commit <ul><li>ac91960b - Add mobile phone validation for JO when new customer is created. #340</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/382/diffs?diff_id=75463044&start_sha=6a944eeb166310f66efff9a883c2f5db4dc7d24e)
korina.cordero commented 2020-02-14 03:39:52 +00:00 (Migrated from gitlab.com)
Copy link

closed

closed

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API

   
AU

Marshall Battery Feature

  
Bug

Bug

  
CRM Enhancements

   
Mobile API

   
Nice to have

   
Phase 2

Local Phase 2

No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: rgutierrez/resq#1193
No description provided.
Delete branch "340-cmb-walk-in-customer-form"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?