Resolve "Transition branch for CMB and Resq merging" #1181
No reviewers
Labels
No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: rgutierrez/resq#1181
Loading…
Reference in a new issue
No description provided.
Delete branch "329-transition-branch-for-cmb-and-resq-merging"
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?
Closes #329
added 202 commits
37a83099- Merge branch '265-cmb-project' of gitlab.com:jankstudio/resq into origin/265-cmb-projectf1cc1dfa- Create interface for invoice creator. #265cce4638c- Rename invoice creator for resq. Make most public methods in invoice creator protected. #265dc2eecbe- Rename InvoiceCreator to InvoiceGenerator. #26589ec286a- Rename processCriteria to generateInvoice. Added constants to invoice generator. #265cf8c3bb8- Move setting of invoice status and createdby inside the invoice generator. #265ca97897a- Move the saving of new job order to a job order generator service. #265b129609d- Refactor submission of updated job order. #2657f973fd1- Merge branch 'master' of gitlab.com:jankstudio/resq into origin/265-cmb-projectf766965f- Add checking for invoice change. #26598a6bfc8- Create invoice and job generator for cmb. Modify services.yaml for cmb. #2656e3be9ed- Rename from Cmb to CMB. #2656c3bc652- 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. #270bd869631- Move the dispatch and assign rider to job order to the service. #2707754ddc5- Move the assign rider, dispatch, fulfill, and cancel job order code to the service. #27034dc6193- Move the initialization of parameters for new and edit job order forms to the service. #2702e2f4315- Move the initialization of parameters for view all and processing job order...365b316d- Add exception handling to the job order service. #270a7b5341f- Move the initialization of the fulfillment and hub forms to the service. #27012555f34- Move the initialization of rider and hub forms and hub reassignment to the job order service. #270e6482d44- Move reassignment of hub and rider to the job order service. #270304ef327- Move reject hub to the job order service. #2707de72e2c- Move unlock processor and unlock assignor to the job order service. #2702f555483- Move generate PDF form to the job order service. #2707989f6b6- Move retrieval of job order rows to the job service. #27008bd23fe- Fix issue of invalid meta urls. #270f205f04b- 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. #270987668ff- Add command to add battery models from given csv file. #2705348d2c5- Add command to add battery sizes from given csv file. #270a29ea875- Add command to add batteries. #27054c98711- merge import batter commands under one command. #2705ab7cd6e- Add vehicle and vehicle manufacturers in the import command. #27054a367af- Add images and icons for cmb. Add messages for cmb. #2702b48c702- Fix for fatal error in command. #270dcd34f6f- Fix adding of compatible batteries to vehicles. #270547c13d7- Fix the adding of compatible batteries for a vehicle. #270f6df19a5- Add sql script that deletes the data from battery and vehicle tables. #270eb0e19d2- Add country code prefix to messages. Made the country code a constant. #270a9ed02b0- Limit the service types to 2 for POC. Have job order return which twig template to display. #270610bbdcc- Add trade in type for cmb. #2707e446883- Add to translation file default point for map. #270a8792c32- Set the default point for maps. #270111bb55a- Add command to add prices to batteries using a csv file. #2707adcb524- Add command to add tradein prices to battery sizes using a csv file. #270c0d363dd- Redo the import battery data command. #27002b88bca- Redo the battery vehicle compatibility command. #2706d0af269- Redo the import tradein price command. #270361b8c04- Change century logo in main template #270906cf2b6- Add normalize name method to process special cases for battery size. #270eb6e3118- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixesc6b31569- Create service types for CMB. #270c2fbb75a- Change Delivery Instructions label to Delivery Instructions - CarFix Job Order No. #270ff58ccf9- Add autocomplete for maps in job order. Set the default region in translation files. #27074e09384- Add autocomplete for maps in outlet, hub, and partner. #270e7584b10- Add warranty creation after a job order is fulfilled. #270a2094758- Add warranty creation when rider confirms payment of JO. #27026d2dab6- Remove warranty creation when service type is battery replacement under warranty. #27001ffdea2- Add map to Dashboard. #27076b291f6- Add the rider tracker service to retrieve and display all rider locations. #270c05921cd- Add autorefresh for rider locations in map. #270f5606d83- Add label to rider markers. #27029cc7374- Add custom trade in types, warranty class, and modes of payment. #270c3195418- Add command to seed current rider sessions to redis cache. #270f70155a1- Update redis cache for rider session when rider registers or logs in. #270934afece- Remove unnecessary comments from command. #2702bb213ef- Move the dashboard routes to home.yaml. #270954ae0e2- Removed the color, status, and fuel type fields for customer vehicle. #2709165fa1e- Remove error_logs. #270a0ad1b00- Add asterisks to required fields for job order. #270341db637- Create a twig template for job order for resq, separate from cmb. #27058c671fe- Add TODO for country code prefix. #270d385d32d- Move the adding of customer and customer vehicle to customer handler service. #27050e54f6a- Move the update of customer and customer vehicle to customer handler service. #2700a8ba8ca- Remove old implementation for update customer. #2703a33a16c- Move the loading of customer list page to the customer service. #270fb6823d2- Move the customer list to the customer handler service. #270cc3db5b5- Move the delete customer to the service. #2708f875f1e- Move getCustomerVehicles to the customer handler service. #270174f0142- Move getCustomerVehicleInfo to the customer handler service. #2704549e124- Add job order queueing for riders assignments. #27015339877- Add a TODO for the JobHandlerInterface. #2709e9dba95- Change the map in the Dashboard to use leaflet and openmaps. #270ade2c3b5- Add map manager interface. #270e2dd980a- Rename twig block for javascript. #270505fa86f- Fix console error when google or bing maps are used. #270734aaac3- Add display of rider markers for OSM. #27093692415- Add rider id to marker popup. #270d04a6976- Use OpenStreetMap for map in incoming form. #2705bdc1a7f- Use OpenStreetMap for map in incoming JO form. #270bf223103- Change implementation of all maps for job order to OpenStreet. #270fdf68618- Change icons for the hub map. #2708bbe245c- Add snippet and comments that will not display the riders by default. #2708e331495- Add TODO for the OSM implementation for job order. #270185ac8aa- Add TODO for the access token. #270494ae854- Add OpenStreet implementation to resq form. #2702f3e8df6- Fix dashboard map bug when rider has no assigned hub #2705b2b5654- Add default resq services and comment out cmb for easy swap #2705852b825- Make resq translation file the default #270bd1dd36e- Prettify the map in the dashboard #270008e482f- Modify dashboard to display customers and riders with popup details #270e4277b89- Remove footer #2701b6727ca- Expand map to 100% height #2702d023b5e- Fix location issue in incoming job order. #270a21d0509- Fix centering issue for hub map when dispatching a job order. #27051850d02- Add one step job order process form #27060391966- Add form tags for the one step form. #2700771f2b8- Add selection of hub. #27072abf2f2- Add rider assignment section to form. #2700ed4e102- Add rider assignment to one step form. #270b7b673fd- Add rider selection to one step form. #270ed2975e8- Add validation when submitting a one step job order. #27079ab6061- Add saving of one step job order data. #2703a167f0b- Add links and routes to editing a one step job order form. #2708da95f2e- Add saving of updated form for one step job order. #27099e84850- Display invoice details for editing one step form. #270a92c8c90- Added a di after battery details for Invoice. #27035f0d9c7- Add riders to one step job order map. #270260c2187- Added one step form for CMB. #270bbaaf250- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-mapece4e6dd- Add MQTT subscribe functionality in main dashboard #299425c235c- Include kml directory in gitignore #299b435cdfa- Fix bug in map script for dashboard #29967a7b86f- Add handler for rider location updates in dashboard #299d2286f21- Add rider_id to RAPI login return data #2993667e122- Add mqtt websocket server settings in env file #299e463876c- Create marker in dashboard map when rider id is not yet there #29968fd16e6- Shift to CMB configuration #299eac8f41d- Make rider markers load popup via ajax #299ec5e67a6- Make customer marker popup load via ajax #299d6015978- 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. #307026a1aa4- 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. #3052f9f787e- Added CMB CustomerHandler in services.yaml. #3055ac6127e- 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. #3081545f623- Merge branch...68a92b2d- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 299-cmb-realtime-map0297d66d- Merge branch '299-cmb-realtime-map' into '270-final-cmb-fixes'fb52b59a- Refactor mqtt sender script #299fe7cfe6c- Refactor RedisClientProvider #299ce0d0fb2- Add initial job order active cache that listens to JobOrder entity events #2995a138ce0- 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. #309c9185e61- Bug fixes for RAPIController. #30966be351b- Make MQTT key configurable #299c753be54- Refactor dashboard map js to use classes #2999e00c3f1- Fix publishing and subscribing for new / updated JOs #2995279e886- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...3eb7c2c4- Update RAPIController.phpfd0738ad- Merge branch '309-replace-63-in-templates-with-proper-country-code' of...64689543- Display hubs and riders in non-dynamic table for onestep edit. #31296bed8a4- Add highlight to selected hub and rider when loading onestepedit form. #312adc6cc8c- Add highlight to selected hub and rider when loading onestepedit form for resq. #312cba80ddd- Have active job orders loaded from cache in dashboard map #299f350b3eb- Make command to load active job order cache #299a5a95a45- Create new mqtt_rider utility script for rider location caching #2992d619331- Add ability to remove customer markers via status publish #299eb9b8bfd- Fix bug for onestep edit when user selects another hub but does not select a new rider. #312655ead77- Change color of hubs and riders. #31279b758f5- Fix for rider icons not displaying in map. #312bdb306e5- Fix bug in mqtt_rider script #2994719d893- Add rider cache service #299676bf400- Merge branch '299-cmb-realtime-map' into '270-final-cmb-fixes'86b4601b- Fix bug in rider cache #2709563bd8c- Fix dashboard bug for active riders not in the database #270a82cfb26- Fix bug for dashboard rider #2706dd3f337- 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. #31244276670- Merge branch '312-cmb-highlight-selected-hub-and-rider-in-onestep-edit' of...555bd5ae- Add Cancel Job Order button to onestep form. #313bc8ce40b- Add distance from customer to hub to hub table. #3148d45b8e6- Merge branch '314-cmb-add-hub-distance-to-customer-on-one-step-hub-table' into...e914c6d2- Add customer jo tracking view #3154f1a5f2e- Merge branch '315-cmb-add-customer-view-of-job-order' into '270-final-cmb-fixes'c8157b95- Add functionality to job order tracking page #27041a6801c- Fix string concat bug in jo tracking page #270e8e97bcd- Fix jo link in rider and customer popup in dashboard #27084293cb4- 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-cleanuped606a87- Merge branch '318-error_log-cleanup' into '270-final-cmb-fixes'2093bbde- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...ca8d6fb5- Add multipolygon type #3193789871f- Add rider and date filter to search. #31915bafe23- Fix for query when multiple parameters are passed. #3194ad0db07- Add new customer option enabling customer and vehicle fields #319b6700eed- Add rider and date query parameters for list of to be fulfilled and open job orders. #319746b25ad- Fix one step form for CMB to allow for new customer and vehicle #319d943015f- Merge branch '319-cmb-one-step-form-display-rider-distance' of...cb5fa963- Fix bug with missing entity manager for one step edit #3196cdb5d03- Fix battery fetching for new customer in one step jo form #319eee516a6- 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. #319cf783bf1- Added validations to customer and customer vehicle data. #319295dbaa2- Remove Rider label and added option AllRiders to Rider dropdown. #3193e2d0db5- Merge branch '319-cmb-one-step-form-display-rider-distance' into '270-final-cmb-fixes'60e3d367- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...Compare with previous version
added 1 commit
49d0e6b9- Resolve missed merge conflict. #329Compare with previous version
added 1 commit
b7cae5af- Add getOtherParameters to Resq job order handler. #329Compare with previous version
added 1 commit
8dbcd047- Add riders and dates to query filters. #329Compare with previous version
added 1 commit
eceb20f2- Add resq counterparts in services.yaml. #329Compare with previous version
added 1 commit
088dca5a- Create two separate services.yaml for resq and cmb. #329Compare with previous version
added 20 commits
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...74c239cf- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...4d104d38- Move the register function from controller to service. #311cbc99778- Move login to the service. #311c3662cd1- Add login to interface. #3113e5ea688- Move logout and getJobOrder to the service. #31135ccaa73- Add country code to constructor of RiderAPIHandler service. #311becd8d0c- Move acceptJobOrder to the service. #311de4bf9f2- Bug fixes for acceptJobOrder. #311b651d06e- Move cancelJobOrder to the service. #311bf3136da- Move the arrive function to the service. #311aa1a2b3b- Move the hubArrive function to the service. #31105af87ed- Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #31133004004- Move the rest of the functions to the service. #31136657cbd- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...91182fbc- Remove git conflict message. #3111fc64cef- Add checking for valid plate number before warranty creation after JO is fulfilled. #311075c83fb- Add checking for valid plate number before warranty creation after JO is fulfilled. #3118bbc39ec- Merge branch '311-cmb-refactor-rapicontroller-into-a-service' of...Compare with previous version
unmarked as a Work In Progress
added 2 commits
0df0955c- Add rider assignment handler for resq. #333d62a36b6- Merge branch '333-rider-assignment-handler-for-resq' into...Compare with previous version
added 9 commits
52f075cc- Add new fields to customer. #324fc6edb2b- Merge branch '329-transition-branch-for-cmb-and-resq-merging' of...e260edc8- Add new fields to incoming job order form. #3245dc57dc0- Add new fields to customer form. #324716f263e- Make editable the new fields in JO form. #324e202fb65- Disable the new fields if editing JO form. #32438d56d9c- Set default value for the flags to false. #3244d8ddc53- Modify the retrieval of the flags from request object. #324cf7e0269- Merge branch '324-add-new-fields-for-jo-form' into '329-transition-branch-for-cmb-and-resq-merging'Compare with previous version
added 8 commits
2226f7c8- Merge branch '311-cmb-refactor-rapicontroller-into-a-service' into '270-final-cmb-fixes'9cd5915e- Add saving of serial when adding/editing/fulfilling a JO. #335d51a98a6- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...fb76cb04- Replace ObjectManager with EntityManagerInterface #3353981dd95- Set services to CMB #335866910db- Updated composer #335fde400e0- Remove text 'No current battery' for serial. #33554fa5508- Merge branch '335-cmb-editable-battery-serial-number' into...Compare with previous version
added 1 commit
f354631d- Add RiderAPIHandler to services.yaml for resq and cmb. #329Compare with previous version
added 1 commit
29be1e94- Fix wiring for resq rider api handler. #329Compare with previous version
added 6 commits
23253a1e- Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into...f0212cc6- Add checkIfNewBattery function to job order service. Add RiderAPIHandler to...4f9e7959- Merge branch '329-transition-branch-for-cmb-and-resq-merging' of...c81a56c6- Modify the checking if service type is new battery. #3361595954a- Merge branch '329-transition-branch-for-cmb-and-resq-merging' of...592c8e81- Merge branch '336-trans-method-to-check-if-new-battery' into...Compare with previous version
added 3 commits
524378f6- Add dashboard_enable to .env.dist. #3347b5239e5- Add checking for dashboard_enable. #33403d21337- Merge branch '334-trans-make-env-entry-for-disabling-dashboard' into...Compare with previous version
added 8 commits
master615b5a33- Merge branch 'master' of gitlab.com:jankstudio/resq into...Compare with previous version
merged
mentioned in commit
79a1c46cee