Merge branch '811-add-sealant-fee' into 'master'

Resolve "Add sealant fee"

Closes #811

See merge request jankstudio/resq!924

.gitignore

@@ -12,3 +12,6 @@
 
 *.swp
 /public/warranty_uploads/*
+.vscode
+*__pycache__
+/public/assets/images/insurance-premiums.png

config/packages/catalyst_auth.yaml

@@ -277,6 +277,8 @@ catalyst_auth:
                   label: Fulfill Cancelled JO
                 - id: jo_resq_proc.list
                   label: RESQ Dispatch
+                - id: jo_resq_all.list
+                  label: RESQ All
 
             - id: support
               label: Customer Support Access
@@ -618,6 +620,59 @@ catalyst_auth:
                 - id: ownership_type.delete
                   label: Delete
 
+            - id: service_offering
+              label: Service Offering Access
+              acls:
+                - id: service_offering.menu
+                  label: Menu
+                - id: service_offering.list
+                  label: List
+                - id: service_offering.add
+                  label: Add
+                - id: service_offering.update
+                  label: Update
+                - id: service_offering.delete
+                  label: Delete
+
+            - id: price_tier
+              label: Price Tier
+              acls:
+                - id: price_tier.menu
+                  label: Menu
+                - id: price_tier.list
+                  label: List
+                - id: price_tier.add
+                  label: Add
+                - id: price_tier.update
+                  label: Update
+                - id: price_tier.delete
+                  label: Delete 
+
+            - id: item_type
+              label: Item Type
+              acls:
+                - id: item_type.menu
+                  label: Menu
+                - id: item_type.list
+                  label: List
+                - id: item_type.add
+                  label: Add
+                - id: item_type.update
+                  label: Update
+                - id: item_type.delete
+                  label: Delete
+
+            - id: item
+              label: Item
+              acls:
+                - id: item.menu
+                  label: Menu
+            - id: item_pricing
+              label: Item Pricing
+              acls:
+                - id: item_pricing.update
+                  label: Update
+
     api:
         user_entity: "App\\Entity\\ApiUser"
         acl_data:
@@ -696,6 +751,16 @@ catalyst_auth:
               acls:
                 - id: warrantyserial.upload
                   label: Upload
+            - id: hub
+              label: Hub Access
+              acls:
+                - id: hub.list
+                  label: List
+            - id: joborder
+              label: Job Order Access
+              acls:
+                - id: joborder.find
+                  label: Find Job Order 
 
             - id: tapi_vmanufacturer
               label: Third Party Vehicle Manufacturer Access
@@ -876,4 +941,4 @@ catalyst_auth:
                 - id: cust_api_v2.warranty.check
                   label: Check Status
                 - id: cust_api_v2.warranty.register
-                  label: Register
+                  label: Register

config/packages/catalyst_menu.yaml

@@ -168,12 +168,16 @@ catalyst_menu:
           acl: jo_hub.list
           label: '[menu.joborder.hubview]'
           parent: joborder
+        - id: jo_resq_all
+          acl: jo_resq_all.list
+          label: '[menu.joborder.resqall]'
+          parent: joborder
 
         - id: support
           acl: support.menu
           label: '[menu.support]'
           icon: flaticon-support
-          order: 10
+          order: 11
         - id: customer_list
           acl: customer.list
           label: '[menu.support.customers]'
@@ -219,7 +223,7 @@ catalyst_menu:
           acl: service.menu
           label: '[menu.service]'
           icon: flaticon-squares
-          order: 11
+          order: 12
         - id: service_list
           acl: service.list
           label: '[menu.service.services]'
@@ -229,7 +233,7 @@ catalyst_menu:
           acl: partner.menu
           label: '[menu.partner]'
           icon: flaticon-network
-          order: 12
+          order: 13
         - id: partner_list
           acl: partner.list
           label: '[menu.partner.partners]'
@@ -243,7 +247,7 @@ catalyst_menu:
           acl: motolite_event.menu
           label: '[menu.motolite_event]'
           icon: flaticon-event-calendar-symbol
-          order: 13
+          order: 14
         - id: motolite_event_list
           acl: motolite_event.list
           label: '[menu.motolite_event.events]'
@@ -253,7 +257,7 @@ catalyst_menu:
           acl: analytics.menu
           label: '[menu.analytics]'
           icon: flaticon-graphic
-          order: 14
+          order: 15
         - id: analytics_forecast_form
           acl: analytics.forecast
           label: '[menu.analytics.forecasting]'
@@ -263,7 +267,7 @@ catalyst_menu:
           acl: database.menu
           label: '[menu.database]'
           icon: fa fa-database
-          order: 15
+          order: 16
         - id: ticket_type_list
           acl: ticket_type.menu
           label: '[menu.database.tickettypes]'
@@ -279,4 +283,26 @@ catalyst_menu:
         - id: ownership_type_list
           acl: ownership_type.menu
           label: '[menu.database.ownershiptypes]'
-          parent: database
+          parent: database
+        - id: service_offering_list
+          acl: service_offering.menu
+          label: '[menu.database.serviceofferings]'
+          parent: database
+        - id: item_type_list
+          acl: item_type.menu
+          label: '[menu.database.itemtypes]'
+          parent: database
+
+        - id: item
+          acl: item.menu
+          label: Item Management
+          icon: fa fa-boxes 
+          order: 10 
+        - id: price_tier_list
+          acl: price_tier.list
+          label: Price Tiers
+          parent: item
+        - id: item_pricing
+          acl: item_pricing.update
+          label: Item Pricing
+          parent: item

config/packages/security.yaml

@@ -53,8 +53,16 @@ security:
             pattern: ^\/test_capi\/
             security: false
 
+        insurance:
+            pattern: ^\/insurance\/
+            security: false
+
+        paymongo:
+            pattern: ^\/paymongo\/
+            security: false
+
         cust_api_v2:
-            pattern: ^\/apiv2\/(?!register|register\/|number_confirm|number_confirm\/|code_validate|code_validate\/|resend_code|resend_code\/)
+            pattern: ^\/apiv2\/(?!register|register\/|number_confirm|number_confirm\/|code_validate|code_validate\/|resend_code|resend_code\/|version_check|version_check\/|account|account\/|account_code_validate|account_code_validate\/|account_resend_code|account_resend_code\/)
             provider: api_v2_provider
             access_denied_handler: Catalyst\ApiBundle\Service\AccessDeniedHandler
             stateless: true
@@ -63,7 +71,7 @@ security:
                     - Catalyst\ApiBundle\Security\Authenticator
 
         cust_api_v2_guest:
-            pattern: ^\/apiv2\/(register|register\/|number_confirm|number_confirm\/|code_validate|code_validate\/|resend_code|resend_code\/)
+            pattern: ^\/apiv2\/(register|register\/|number_confirm|number_confirm\/|code_validate|code_validate\/|resend_code|resend_code\/|version_check|version_check\/|account|account\/|account_code_validate|account_code_validate\/|account_resend_code|account_resend_code\/)
             security: false
 
         warranty_api:

config/routes/apiv2.yaml

@@ -45,6 +45,11 @@ apiv2_cust_vehicle_add:
     controller: App\Controller\CustomerAppAPI\VehicleController::addVehicle
     methods: [POST]
 
+apiv2_cust_vehicle_info:
+    path: /apiv2/vehicles/{id}
+    controller: App\Controller\CustomerAppAPI\VehicleController::getVehicle
+    methods: [GET]
+
 apiv2_cust_vehicle_update:
     path: /apiv2/vehicles/{id}
     controller: App\Controller\CustomerAppAPI\VehicleController::updateVehicle
@@ -244,4 +249,67 @@ apiv2_partner_review_tags:
 
 apiv2_rider_review_tags:
     path: /apiv2/review_tags/rider
-    controller: App\Controller\CustomerAppAPI\ReviewTagController::getRiderReviewTags
+    controller: App\Controller\CustomerAppAPI\ReviewTagController::getRiderReviewTags
+
+# account deletion
+apiv2_account_delete:
+    path: /apiv2/account_delete
+    controller: App\Controller\CustomerAppAPI\AccountController::deleteAccount
+    methods: [POST]
+
+apiv2_account_delete_resend_code:
+    path: /apiv2/account_delete_resend_code
+    controller: App\Controller\CustomerAppAPI\AccountController:resendCode
+    methods: [POST]
+
+apiv2_account_delete_code_validate:
+    path: /apiv2/account_delete_code_validate
+    controller: App\Controller\CustomerAppAPI\AccountController::validateDeleteCode
+    methods: [POST]
+
+# trade-in support
+apiv2_cust_vehicle_trade_in_estimate:
+    path: /apiv2/vehicles/{id}/trade_in_estimate
+    controller: App\Controller\CustomerAppAPI\VehicleController::getTradeInEstimate
+    methods: [GET]
+
+# insurance
+apiv2_insurance_vehicle_maker_list:
+    path: /apiv2/insurance/vehicles/makers
+    controller: App\Controller\CustomerAppAPI\InsuranceController::getVehicleMakers
+    methods: [GET]
+
+apiv2_insurance_vehicle_model_list:
+    path: /apiv2/insurance/vehicles/models/{maker_id}
+    controller: App\Controller\CustomerAppAPI\InsuranceController::getVehicleModels
+    methods: [GET]
+
+apiv2_insurance_vehicle_trim_list:
+    path: /apiv2/insurance/vehicles/trims/{model_id}
+    controller: App\Controller\CustomerAppAPI\InsuranceController::getVehicleTrims
+    methods: [GET]
+
+apiv2_insurance_vehicle_mv_type_list:
+    path: /apiv2/insurance/mvtypes
+    controller: App\Controller\CustomerAppAPI\InsuranceController::getMVTypes
+    methods: [GET]
+
+apiv2_insurance_vehicle_client_type_list:
+    path: /apiv2/insurance/clienttypes
+    controller: App\Controller\CustomerAppAPI\InsuranceController::getClientTypes
+    methods: [GET]
+
+apiv2_insurance_application_create:
+    path: /apiv2/insurance/application
+    controller: App\Controller\CustomerAppAPI\InsuranceController::createApplication
+    methods: [POST]
+
+apiv2_insurance_premiums_banner:
+    path: /apiv2/insurance/premiums_banner
+    controller: App\Controller\CustomerAppAPI\InsuranceController::getPremiumsBanner
+    methods: [GET]
+
+apiv2_insurance_body_types:
+    path: /apiv2/insurance/body_types
+    controller: App\Controller\CustomerAppAPI\InsuranceController::getBodyTypes
+    methods: [GET]

config/routes/capi.yaml

@@ -194,3 +194,16 @@ capi_warranty_serial_upload:
     path: /capi/warranty_serial/upload
     controller: App\Controller\CAPI\WarrantySerialController::uploadWarrantySerialFile
     methods: [POST]
+
+# pullout form system
+# hub
+capi_hub_list:
+    path: /capi/hubs
+    controller: App\Controller\CAPI\HubController::getAll
+    methods: [GET]
+
+# job order details
+capi_job_order:
+    path: /capi/job_order/{id}
+    controller: App\Controller\CAPI\JobOrderController::getJobOrder
+    methods: [GET]

config/routes/capi_rider.yaml

@@ -94,3 +94,24 @@ capi_rider_jo_start:
     path: /rider_api/start
     controller: App\Controller\CAPI\RiderAppController::startJobOrder
     methods: [POST]
+
+# trade-ins
+capi_rider_battery_sizes:
+    path: /rider_api/battery_sizes
+    controller: App\Controller\CAPI\RiderAppController::getBatterySizes
+    methods: [GET]
+
+capi_rider_trade_in_types:
+    path: /rider_api/trade_in_types
+    controller: App\Controller\CAPI\RiderAppController::getTradeInTypes
+    methods: [GET]
+
+capi_rider_battery_info:
+    path: /rider_api/battery/{serial}
+    controller: App\Controller\CAPI\RiderAppController::getBatteryInfo
+    methods: [GET]
+
+capi_rider_update_jo:
+    path: /rider_api/job_order/update
+    controller: App\Controller\CAPI\RiderAppController::updateJobOrder
+    methods: [POST]

config/routes/insurance.yaml

@@ -1,6 +1,6 @@
 # insurance
 
 insurance_listener:
-    path: /api/insurance/listen
+    path: /insurance/listen
     controller: App\Controller\InsuranceController::listen
     methods: [POST]

config/routes/item_pricing.yaml

@@ -0,0 +1,14 @@
+item_pricing:
+    path: /item-pricing
+    controller: App\Controller\ItemPricingController::index
+    methods: [GET]
+
+item_pricing_update:
+    path: /item-pricing
+    controller: App\Controller\ItemPricingController::formSubmit
+    methods: [POST]
+
+item_pricing_prices:
+    path: /item-pricing/{pt_id}/{it_id}/prices
+    controller: App\Controller\ItemPricingController::itemPrices
+    methods: [GET]

config/routes/item_type.yaml

@@ -0,0 +1,34 @@
+item_type_list:
+    path: /item-types
+    controller: App\Controller\ItemTypeController::index
+    methods: [GET]
+
+item_type_rows:
+    path: /item-types/rowdata
+    controller: App\Controller\ItemTypeController::datatableRows
+    methods: [POST]
+
+item_type_add_form:
+    path: /item-types/newform
+    controller: App\Controller\ItemTypeController::addForm
+    methods: [GET]
+
+item_type_add_submit:
+    path: /item-types
+    controller: App\Controller\ItemTypeController::addSubmit
+    methods: [POST]
+
+item_type_update_form:
+    path: /item-types/{id}
+    controller: App\Controller\ItemTypeController::updateForm
+    methods: [GET]
+
+item_type_update_submit:
+    path: /item-types/{id}
+    controller: App\Controller\ItemTypeController::updateSubmit
+    methods: [POST]
+
+item_type_delete:
+    path: /item-types/{id}
+    controller: App\Controller\ItemTypeController::deleteSubmit
+    methods: [DELETE]

config/routes/job_order.yaml

@@ -267,3 +267,8 @@ jo_geofence:
     path: /ajax/job-order/geofence
     controller: App\Controller\JobOrderController::checkGeofence
     methods: [GET]
+
+jo_all_view_form:
+    path: /job-order/all/view/{id}
+    controller: App\Controller\JobOrderController::allViewForm
+    methods: [GET]

config/routes/paymongo.yaml

@@ -0,0 +1,16 @@
+# paymongo
+
+paymongo_listener:
+    path: /paymongo/listen
+    controller: App\Controller\PayMongoController::listen
+    methods: [POST]
+
+paymongo_payment_success:
+    path: /paymongo/success
+    controller: App\Controller\PayMongoController::paymentSuccess
+    methods: [GET]
+
+paymongo_payment_cancelled:
+    path: /paymongo/cancelled
+    controller: App\Controller\PayMongoController::paymentCancelled
+    methods: [GET]

config/routes/price_tier.yaml

@@ -0,0 +1,34 @@
+price_tier_list:
+    path: /price-tiers
+    controller: App\Controller\PriceTierController::index
+    methods: [GET]
+
+price_tier_rows:
+    path: /price-tiers/rows
+    controller: App\Controller\PriceTierController::datatableRows
+    methods: [POST]
+
+price_tier_add_form:
+    path: /price-tiers/newform
+    controller: App\Controller\PriceTierController::addForm
+    methods: [GET]
+
+price_tier_add_submit:
+    path: /price-tiers
+    controller: App\Controller\PriceTierController::addSubmit
+    methods: [POST]
+
+price_tier_update_form:
+    path: /price-tiers/{id}
+    controller: App\Controller\PriceTierController::updateForm
+    methods: [GET]
+
+price_tier_update_submit:
+    path: /price-tiers/{id}
+    controller: App\Controller\PriceTierController::updateSubmit
+    methods: [POST]
+
+price_tier_delete:
+    path: /price-tiers/{id}
+    controller: App\Controller\PriceTierController::deleteSubmit
+    methods: [DELETE]

config/routes/resq_job_order.yaml

@@ -7,3 +7,17 @@ jo_resq_proc_rows:
     path: /resq-job-order/processing-rows
     controller: App\Controller\ResqJobOrderController::datatableRows
     methods: [POST]
+    defaults:
+        tier: "proc"
+
+jo_resq_all:
+    path: /resq-job-order/all
+    controller: App\Controller\ResqJobOrderController::listAll
+    methods: [GET]
+
+jo_resq_all_rows:
+    path: /resq-job-orer/all
+    controller: App\Controller\ResqJobOrderController::datatableRows
+    methods: [POST]
+    defaults:
+        tier: "all"

config/routes/service_offering.yaml

@@ -0,0 +1,34 @@
+service_offering_list:
+    path: /service-offerings
+    controller: App\Controller\ServiceOfferingController::index
+    methods: [GET]
+
+service_offering_rows:
+    path: /service-offerings/rowdata
+    controller: App\Controller\ServiceOfferingController::datatableRows
+    methods: [POST]
+
+service_offering_add_form:
+    path: /service-offerings/newform
+    controller: App\Controller\ServiceOfferingController::addForm
+    methods: [GET]
+
+service_offering_add_submit:
+    path: /service-offerings
+    controller: App\Controller\ServiceOfferingController::addSubmit
+    methods: [POST]
+
+service_offering_update_form:
+    path: /service-offerings/{id}
+    controller: App\Controller\ServiceOfferingController::updateForm
+    methods: [GET]
+
+service_offering_update_submit:
+    path: /service-offerings/{id}
+    controller: App\Controller\ServiceOfferingController::updateSubmit
+    methods: [POST]
+
+service_offering_delete:
+    path: /service-offerings/{id}
+    controller: App\Controller\ServiceOfferingController::deleteSubmit
+    methods: [DELETE]

config/routes/tapi.yaml

@@ -51,7 +51,7 @@ tapi_vehicle_make_list:
 tapi_battery_list:
     path: /tapi/vehicles/{vid}/compatible_batteries
     controller: App\Controller\TAPI\BatteryController::getCompatibleBatteries
-    methods: [GET]
+    methods: [POST]
 
 # promos
 tapi_promo_list:

config/services.yaml

@@ -13,6 +13,10 @@ parameters:
     cvu_brand_id: "%env(CVU_BRAND_ID)%"
     country_code: "%env(COUNTRY_CODE)%"
     api_version: "%env(API_VERSION)%"
+    android_app_version: "%env(ANDROID_APP_VERSION)%"
+    ios_app_version: "%env(IOS_APP_VERSION)%"
+    insurance_premiums_banner_url: "%env(INSURANCE_PREMIUMS_BANNER_URL)%"
+    enabled_hub_filters: "%env(ENABLED_HUB_FILTERS)%"
 
 services:
     # default configuration for services in *this* file
@@ -106,6 +110,12 @@ services:
         arguments:
             $callback_url: "%env(WARRANTY_SERIAL_CALLBACK_URL)%"
 
+    App\Command\ProcessLatePaymongoTransactionsCommand:
+        arguments:
+            $em: "@doctrine.orm.entity_manager"
+            $paymongo: "@App\\Service\\PayMongoConnector"
+            $webhook_id: "%env(PAYMONGO_WEBHOOK_ID)%"
+
     # rider tracker service
     App\Service\RiderTracker:
         arguments:
@@ -214,6 +224,23 @@ services:
             $username: "%env(INSURANCE_USERNAME)%"
             $password: "%env(INSURANCE_PASSWORD)%"
 
+    # entity listener for gateway transactions
+    App\EntityListener\GatewayTransactionListener:
+        arguments:
+            $em: "@doctrine.orm.entity_manager"
+            $ic: "@App\\Service\\InsuranceConnector"
+        tags:
+            - name: doctrine.orm.entity_listener
+              event: 'postUpdate'
+              entity: 'App\Entity\GatewayTransaction'
+
+    # paymongo connector
+    App\Service\PayMongoConnector:
+        arguments:
+            $base_url: "%env(PAYMONGO_BASE_URL)%"
+            $public_key: "%env(PAYMONGO_PUBLIC_KEY)%"
+            $secret_key: "%env(PAYMONGO_SECRET_KEY)%"
+
     # entity listener for customer vehicle warranty code history
     App\EntityListener\CustomerVehicleSerialListener:
         arguments:
@@ -291,3 +318,41 @@ services:
         arguments:
             $server_key: "%env(FCM_SERVER_KEY)%"
             $sender_id: "%env(FCM_SENDER_ID)%"
+
+    # price tier manager
+    App\Service\PriceTierManager:
+        arguments:
+            $em: "@doctrine.orm.entity_manager"
+
+    # hub filters
+    App\Service\HubFilter\BaseHubFilter:
+        arguments:
+            $hub_filter_logger: "@App\\Service\\HubFilterLogger"
+            $em: "@doctrine.orm.entity_manager"
+            $rt: "@App\\Service\\RisingTideGateway"
+            $trans: "@Symfony\\Contracts\\Translation\\TranslatorInterface"
+
+    App\Service\HubFilter\Filters\DateAndTimeHubFilter:
+        public: true
+
+    App\Service\HubFilter\Filters\JoTypeHubFilter:
+        public: true
+
+    App\Service\HubFilter\Filters\MaxResultsHubFilter:
+        public: true
+
+    App\Service\HubFilter\Filters\PaymentMethodHubFilter:
+        public: true
+
+    App\Service\HubFilter\Filters\RiderAvailabilityHubFilter:
+        public: true
+
+    App\Service\HubFilter\Filters\InventoryHubFilter:
+        public: true
+        arguments:
+            $im: "@App\\Service\\InventoryManager"
+
+    App\Service\HubFilter\Filters\RoundRobinHubFilter:
+        public: true
+        arguments:
+            $hub_distributor: "@App\\Service\\HubDistributor"

public/assets/js/csv_export.js

@@ -0,0 +1,74 @@
+$(function() {
+	// export table to csv
+	$(document).on('click', '[data-export-csv]', async function(e) {
+		const el = e.target.closest('[data-export-csv]');
+		const oldLabel = el.innerHTML;
+
+		// set loading status
+		el.disabled = true;
+		el.innerHTML = 'Exporting...';
+
+		const formData = new FormData();
+
+		formData.append('datatable[pagination][page]', 1);
+		formData.append('datatable[pagination][perpage]', 10000000);
+
+		// get all rows
+		const response = await fetch(el.dataset.url, {
+			method: el.dataset.method,
+			body: formData,
+		});
+
+		const result = await response.json();
+
+		if (response.status === 200) {
+			// empty set returned
+			if (parseInt(result.meta.total) === 0) {
+				swal({
+					title: 'Whoops',
+					html: 'No data to export!',
+					type: 'warning',
+				});
+			}
+			
+			// build csv data
+			const csvRows = [];
+			const fieldList = el.dataset.fields.split(',');
+			csvRows.push(el.dataset.headers);
+
+			result.data.forEach((row) => {
+				const fieldData = [];
+				fieldList.forEach((field) => {
+					fieldData.push('"' + row[field] + '"');
+				});
+
+				csvRows.push(fieldData.join(','));
+			});
+
+			const csvData = csvRows.join('\n');
+
+			// build the csv file
+			const csvFile = new Blob([csvData], {
+                type: 'text/csv',
+            });
+
+			// create a link to the file and download it
+			const url = window.URL.createObjectURL(csvFile);
+			const a = document.createElement('a');
+			a.href = url;
+			a.download = el.dataset.filename + '.csv';
+			a.click();
+		} else {
+			// something went wrong on the server
+			swal({
+				title: 'Whoops',
+				html: 'An error has occurred while retrieving data.',
+				type: 'error',
+			});
+		}
+
+		// remove loading status
+		el.disabled = false;
+        el.innerHTML = oldLabel;
+	});
+});

src/Command/ProcessLatePaymongoTransactionsCommand.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace App\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
+
+use Doctrine\ORM\EntityManagerInterface;
+
+use App\Ramcar\TransactionStatus;
+use App\Entity\GatewayTransaction;
+use App\Service\PayMongoConnector;
+
+use DateTime;
+
+class ProcessLatePaymongoTransactionsCommand extends Command
+{
+    protected $em;
+    protected $paymongo;
+
+    protected $webhook_id;
+
+    public function __construct(EntityManagerInterface $em, PayMongoConnector $paymongo, $webhook_id)
+    {
+        $this->em = $em;
+        $this->paymongo = $paymongo;
+        $this->webhook_id = $webhook_id;
+
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this->setName('paymongo:checkpending')
+            ->setDescription('Check for any late PayMongo transactions and process if needed.')
+            ->setHelp('Check for any late PayMongo transactions and process if needed.')
+            ->addOption('force', 'f', InputOption::VALUE_NONE, 'Ignore webhook status and process anyway.');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $force = $input->getOption('force');
+
+        // if we aren't forcing, check webhook status first
+        if (!$force) {
+            $output->writeln('Checking webhook status...');
+
+            // check if webhook is disabled
+            $webhook = $this->paymongo->getWebhook($this->webhook_id);
+
+            if ($webhook['success'] && $webhook['response']['data']['attributes']['status'] === 'enabled') {
+                $output->writeln('<info>Webhook is enabled, no need to do anything.</info>');
+
+                return 0;
+            } else {
+                $output->writeln('<comment>Webhook is disabled! Logging event and attempting to re-enable...</comment>');
+
+                // attempt re-enabling of webhook
+                $result = $this->paymongo->enableWebhook($this->webhook_id);
+                if ($result['success'] && $result['response']['data']['attributes']['status'] ?? null === 'enabled') {
+                    $output->writeln('<info>Webhook ' . $this->webhook_id . ' re-enabled!</info>');
+
+                    // log event
+                    $this->paymongo->log('WEBHOOK RE-ENABLED', "[]", json_encode($result['response'], JSON_PRETTY_PRINT), 'webhook');
+                } else {
+                    $output->writeln('<comment>Webhook ' . $this->webhook_id . ' could not be re-enabled.</comment>');
+
+                    // log event
+                    $this->paymongo->log('WEBHOOK FAILURE', "[]", json_encode($result['response'], JSON_PRETTY_PRINT), 'webhook');
+                }
+            }
+        }
+
+        $output->writeln('Fetching all late pending transactions...');
+
+        // set date threshold to 24 hours ago
+        $date_threshold = (new DateTime())->modify('-24 hours');
+
+        $transactions = $this->em->getRepository(GatewayTransaction::class)
+            ->createQueryBuilder('t')
+            ->select('t')
+            ->where('t.status = :status')
+            ->andWhere('t.date_create <= :date_threshold')
+            ->setParameter('status', TransactionStatus::PENDING)
+            ->setParameter('date_threshold', $date_threshold)
+            ->getQuery()
+            ->getResult();
+
+        $output->writeln('Found '. count($transactions) . ' rows matching criteria.');
+
+        $x = 0;
+
+        foreach ($transactions as $trans) {
+            // check paymongo status
+            $checkout = $this->paymongo->getCheckout($trans->getExtTransactionId());
+
+            if ($checkout['success']) {
+                // check if we have any payments made
+                $payments = $checkout['response']['data']['attributes']['payments'] ?? [];
+                
+                if (!empty($payments)) {
+                    $amount_paid = 0;
+
+                    // for good measure, we get all successful payments and add them up
+                    foreach ($payments as $payment) {
+                        if ($payment['attributes']['status'] === TransactionStatus::PAID) {
+                            $amount_paid = bcadd($amount_paid, $payment['attributes']['amount']);
+                        }
+                    }
+                    
+                    // this transaction is fully paid, so we mark it as paid
+                    if (bccomp($trans->getAmount(), $amount_paid) <= 0) {
+                        $trans->setStatus(TransactionStatus::PAID);
+                        $trans->setDatePay(new DateTime());
+                        $this->em->flush();
+
+                        $output->writeln('Marked transaction '. $trans->getID() . ' as paid.');
+                        $x++;
+                    } else {
+                        $output->writeln('<comment>Insufficient payment amount (' . $amount_paid . '/' . $trans->getAmount() . ') for this transaction: ' . $trans->getID() . '</comment>');
+                    }
+                } else {
+                    $output->writeln('<comment>No payments found for transaction: ' . $trans->getID() . '</comment>');
+                }
+            } else {
+                $output->writeln('<comment>Checkout not found: ' . $checkout['error']['message'] . '</comment>');
+            }
+        }
+
+        $output->writeln('<info>Done! Processed ' . $x . ' rows.</info>');
+
+        return 0;
+    }
+}

src/Command/SetJobOrderCustNewCommand.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+use Doctrine\ORM\EntityManagerInterface;
+
+use App\Service\JobOrderManager;
+
+class SetJobOrderCustNewCommand extends Command
+{
+    protected $em;
+    protected $jo_manager;
+
+    public function __construct(EntityManagerInterface $em, JobOrderManager $jo_manager)
+    {
+        $this->em = $em;
+        $this->jo_manager = $jo_manager;
+
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this->setName('joborder:setcustomernew')
+            ->setDescription('Set job order\'s customer new flag for existing job orders.')
+            ->setHelp('Set job order\'s customer new flag for existing job orders');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $em = $this->em;
+
+        // pdo connection
+        $db = $em->getConnection();
+
+        // get all the ids for all job orders
+        $all_query_sql = 'SELECT id AS jo_id, customer_id AS cust_id FROM job_order ORDER BY id';
+
+        $all_query_stmt = $db->prepare($all_query_sql);
+        $all_query_stmt->execute();
+
+        $all_jo_results = $all_query_stmt->fetchAll();
+
+        $output->writeln('Processing job orders...');
+
+        foreach ($all_jo_results as $jo_row)
+        {
+            // for each jo id, get the customer id
+            $jo_id = $jo_row['jo_id'];
+            $cust_id = $jo_row['cust_id'];
+
+            // check how many JOs have that customer id
+            $jo_count = $this->jo_manager->getCustomerJobOrderCount($cust_id);
+
+            // if one or less, set flag_cust_new to true
+            if ($jo_count <= 1)
+                $this->updateCustNew($db, $jo_id);
+        }
+
+        $output->writeln('All done!');
+
+        return 0;
+    }
+
+    protected function updateCustNew($db, $jo_id)
+    {
+        $update_jo_sql = 'UPDATE job_order SET flag_cust_new = :flag_cust_new WHERE id = :jo_id';
+
+        $update_jo_stmt = $db->prepare($update_jo_sql);
+        $update_jo_stmt->execute([
+            'flag_cust_new' => true,
+            'jo_id' => $jo_id
+        ]);
+    }
+}

src/Controller/APIController.php

@@ -49,6 +49,8 @@ use App\Service\HubDistributor;
 use App\Service\HubFilterLogger;
 use App\Service\HubFilteringGeoChecker;
 use App\Service\HashGenerator;
+use App\Service\JobOrderManager;
+use App\Service\PriceTierManager;
         
 use App\Entity\MobileSession;
 use App\Entity\Customer;
@@ -867,7 +869,7 @@ class APIController extends Controller implements LoggedController
                                     MapTools $map_tools, InventoryManager $im, MQTTClient $mclient,
                                     RiderAssignmentHandlerInterface $rah, PromoLogger $promo_logger,
                                     HubSelector $hub_select, HubDistributor $hub_dist, HubFilterLogger $hub_filter_logger,
-                                    HubFilteringGeoChecker $hub_geofence)
+                                    HubFilteringGeoChecker $hub_geofence, JobOrderManager $jo_manager)
     {
         // check required parameters and api key
         $required_params = [
@@ -928,7 +930,15 @@ class APIController extends Controller implements LoggedController
                 ->setErrorMessage('No customer information found');
             return $res->getReturnResponse();
         }
+
+        // check if customer has more than one job order already
+        $flag_cust_new = false;
+        $cust_jo_count = $jo_manager->getCustomerJobOrderCount($cust->getID());
+        if ($cust_jo_count <= 1)
+            $flag_cust_new = true;
+
         $jo->setCustomer($cust);
+        $jo->setCustNew($flag_cust_new);
 
         // validate service type
         $stype = $req->request->get('service_type');
@@ -1035,6 +1045,10 @@ class APIController extends Controller implements LoggedController
         // set if taxable
         $icrit->setIsTaxable();
 
+        // set JO source
+        // old app doesn't have separate jumpstart
+        $icrit->setSource(TransactionOrigin::CALL);
+
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
         $jo->setInvoice($invoice);
@@ -1317,6 +1331,10 @@ class APIController extends Controller implements LoggedController
         // set taxable
         $icrit->setIsTaxable(true);
 
+        // set JO source
+        // old app doesn't have separate jumpstart
+        $icrit->setSource(TransactionOrigin::CALL);
+
         // check trade-in
         // only allow motolite, other, none
         $trade_in = $req->request->get('trade_in');
@@ -2724,7 +2742,7 @@ class APIController extends Controller implements LoggedController
                                        MapTools $map_tools, InventoryManager $im, MQTTClient $mclient,
                                        RiderAssignmentHandlerInterface $rah, PromoLogger $promo_logger,
                                        HubSelector $hub_select, HubDistributor $hub_dist, HubFilterLogger $hub_filter_logger,
-                                       HubFilteringGeoChecker $hub_geofence)
+                                       HubFilteringGeoChecker $hub_geofence, JobOrderManager $jo_manager)
     {
         // check required parameters and api key
         $required_params = [
@@ -2849,7 +2867,15 @@ class APIController extends Controller implements LoggedController
         //        ->setErrorMessage('No customer information found');
         //    return $res->getReturnResponse();
         // }
+
+        // check if customer has more than one job order already
+        $flag_cust_new = false;
+        $cust_jo_count = $jo_manager->getCustomerJobOrderCount($cust->getID());
+        if ($cust_jo_count <= 1)
+            $flag_cust_new = true;
+
         $jo->setCustomer($cust);
+        $jo->setCustNew($flag_cust_new);
 
         // validate service type
         $stype = $req->request->get('service_type');
@@ -2882,6 +2908,14 @@ class APIController extends Controller implements LoggedController
         // set taxable
         $icrit->setIsTaxable(true);
 
+        // set JO source
+        // old app doesn't have separate jumpstart
+        $icrit->setSource(TransactionOrigin::CALL);
+
+        // set price tier
+        $pt_id = $this->pt_manager->getPriceTier($jo->getCoordinates());
+        $icrit->setPriceTier($pt_id);
+
         // check promo
         $promo_id = $req->request->get('promo_id');
         if (!empty($promo_id))

src/Controller/APIRoleController.php

@@ -326,7 +326,7 @@ class APIRoleController extends Controller
     protected function padAPIACLHierarchy(&$params)
     {
         // get acl keys hierarchy
-        $api_acl_data = $this->api_acl_gen->getACL();
+        $api_acl_data = $this->api_acl_gen->getACL('api');
         $params['api_acl_hierarchy'] = $api_acl_data['hierarchy'];
     }
 

src/Controller/CAPI/HubController.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Controller\CAPI;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\EntityManagerInterface;
+use Catalyst\ApiBundle\Controller\ApiController;
+use Catalyst\ApiBundle\Component\Response as APIResponse;
+
+use App\Entity\Hub;
+
+use Catalyst\AuthBundle\Service\ACLGenerator as ACLGenerator;
+
+class HubController extends ApiController
+{
+    protected $acl_gen;
+
+    public function __construct(ACLGenerator $acl_gen)
+    {
+        $this->acl_gen = $acl_gen;
+    }
+
+    public function getAll(EntityManagerInterface $em)
+    {
+        // get all hub data order by name
+        $this->denyAccessUnlessGranted('hub.list', null, 'No access.');
+
+        $results = $em->getRepository(Hub::class)->findBy([], ['name' => 'ASC']);
+
+        $hubs = [];
+        foreach($results as $res)
+        {
+            $hub_id = $res->getId();
+            $hub_name = $res->getName();
+            $hub_address = $res->getAddress();
+            $hub_branch_code = $res->getBranchCode();
+
+            $hubs[$hub_id] = [
+                'id' => $hub_id,
+                'name' => $hub_name,
+                'address' => $hub_address,
+                'branch_code' => $hub_branch_code,
+            ];
+        }
+
+        $data = [
+            'hubs' => $hubs,
+        ];
+        return new APIResponse(true, 'Hubs loaded.', $data);
+    }
+}

src/Controller/CAPI/JobOrderController.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Controller\CAPI;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\EntityManagerInterface;
+use Catalyst\ApiBundle\Controller\ApiController;
+use Catalyst\ApiBundle\Component\Response as APIResponse;
+
+use App\Entity\JobOrder;
+use App\Entity\Warranty;
+
+use App\Ramcar\JOStatus;
+
+use Catalyst\AuthBundle\Service\ACLGenerator as ACLGenerator;
+
+class JobOrderController extends ApiController
+{
+    protected $acl_gen;
+
+    public function __construct(ACLGenerator $acl_gen)
+    {
+        $this->acl_gen = $acl_gen;
+    }
+
+    public function getJobOrder($id, EntityManagerInterface $em)
+    {
+        $this->denyAccessUnlessGranted('joborder.find', null, 'No access.');
+
+        $jo = $em->getRepository(JobOrder::class)->find($id);
+
+        if ($jo == null)
+            return new APIResponse(false, 'No job order found with that number.', null, 404);
+
+        $data = $this->generateJobOrderData($jo, $em);
+
+        return new APIResponse(true, 'Job order found.', $data);
+    }
+
+    protected function generateJobOrderData($jo, EntityManagerInterface $em)
+    {
+        // customer vehicle
+        $cv = $jo->getCustomerVehicle();
+
+        // customer information
+        $customer = $jo->getCustomer();
+
+        // hub
+        $hub_name = '';
+        $hub = $jo->getHub();
+        if ($hub != null)
+            $hub_name = $hub->getName();
+
+        // check if JO is fulfilled, if not, we leave date_purchase blank
+        $date_purchase = '';
+        $serial = '';
+        $status = $jo->getStatus();
+        if ($status == JOStatus::FULFILLED)
+        {
+            if ($jo->getDateFulfill() != null)
+                $date_purchase = $jo->getDateFulfill()->format('M d, Y H:i');
+
+            // find warranty to get the serial using plate number
+            $serial = $this->getSerialFromWarranty($cv->getPlateNumber(), $em);
+        }
+
+        $jo_data = [
+            'id' => $jo->getID(),
+            'first_name' => $customer->getFirstName(),
+            'last_name' => $customer->getLastName(),
+            'mobile_number' => $customer->getPhoneMobile(),
+            'email' => $customer->getEmail(),
+            'plate_number' => $cv->getPlateNumber(),
+            'date_purchase' => $date_purchase,
+            'address' => $jo->getDeliveryAddress(),
+            'hub' => $hub_name,
+            'serial' => $serial,
+        ];
+
+        // invoice items
+        $items = [];
+        $jo_items = $jo->getInvoice()->getItems();
+        $non_battery_item_titles = ['Promo discount', 'Trade-in', 'Service'];
+        foreach ($jo_items as $item) 
+        {
+            $item_title = $item->getTitle();
+
+            // check if title has Promo discount, Trade-in, or Service
+            $flag_battery = $this->checkIfBatteryInvoiceItem($item_title, $non_battery_item_titles);
+            if ($flag_battery == true)
+            {
+                $items[] = [
+                    'title' => $item->getTitle(),
+                ];
+            }
+        }
+
+        $jo_data['items'] = $items;
+        
+        return $jo_data;
+    }
+
+    protected function checkIfBatteryInvoiceItem($item_title, $non_battery_item_titles)
+    {
+        foreach ($non_battery_item_titles as $nb_item_title)
+        {
+            $pos_result = stripos($item_title, $nb_item_title);
+
+            // if found, invoice item is not a battery item
+            if ($pos_result !== false)
+                return false;
+        }
+
+        return true;
+    }
+
+    protected function getSerialFromWarranty($plate_number, EntityManagerInterface $em)
+    {
+        // NOTE: Modify the search for the latest warranty. This seems hacky.
+        // get latest warranty using plate number
+        $warranty_results = $em->getRepository(Warranty::class)->findBy(
+            ['plate_number' => $plate_number],
+            ['date_create' => 'desc']
+        );
+
+        $serial = '';
+        if (!empty($warranty_results))
+        {
+            // get first entry
+            $warranty = current($warranty_results);
+
+            $serial = $warranty->getSerial();
+        }
+
+        return $serial;
+    }
+}

src/Controller/CAPI/RiderAppController.php

@@ -23,7 +23,9 @@ use App\Entity\BatterySize;
 use App\Entity\RiderAPISession;
 use App\Entity\User;
 use App\Entity\ApiUser as APIUser;
-
+use App\Entity\JobOrder;
+use App\Entity\SAPBattery;
+use App\Entity\WarrantySerial;
 use App\Service\RedisClientProvider;
 use App\Service\RiderCache;
 use App\Service\MQTTClient;
@@ -34,6 +36,7 @@ use App\Service\JobOrderHandlerInterface;
 use App\Service\InvoiceGeneratorInterface;
 use App\Service\RisingTideGateway;
 use App\Service\RiderTracker;
+use App\Service\PriceTierManager;
 
 use App\Ramcar\ServiceType;
 use App\Ramcar\TradeInType;
@@ -286,8 +289,9 @@ class RiderAppController extends ApiController
 
         // do we have a job order?
         // $jo = $rider->getActiveJobOrder();
+        // NOTE: we do not include job orders that have been cancelled
         $jo = $rider->getCurrentJobOrder();
-        if ($jo == null)
+        if ($jo == null || $jo->getStatus() == JOStatus::CANCELLED)
         {
             $data = [
                 'job_order' => null
@@ -382,6 +386,7 @@ class RiderAppController extends ApiController
                     'flag_coolant' => $jo->hasCoolant(),
                     'has_motolite' => $cv->hasMotoliteBattery(),
                     'delivery_status' => $jo->getDeliveryStatus(),
+                    'flag_sealant' => $jo->hasSealant(),
                 ]
             ];
         }
@@ -408,6 +413,11 @@ class RiderAppController extends ApiController
         if (!empty($msg))
             return new APIResponse(false, $msg);
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // TODO: refactor this into a jo handler class, so we don't have to repeat for control center
 
         // set jo status to in transit
@@ -458,6 +468,11 @@ class RiderAppController extends ApiController
             // TODO: this is a workaround for requeue, because rider app gets stuck in accept / decline screen
             return new APIResponse(true, $msg);
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // requeue it, instead of cancelling it
         $jo->requeue();
 
@@ -516,6 +531,11 @@ class RiderAppController extends ApiController
         // get rider's current job order
         $jo = $rider->getCurrentJobOrder();
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB);
 
@@ -556,6 +576,11 @@ class RiderAppController extends ApiController
         // get rider's current job order
         $jo = $rider->getCurrentJobOrder();
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB_PRE_JO);
 
@@ -596,6 +621,11 @@ class RiderAppController extends ApiController
         // get rider's current job order
         $jo = $rider->getCurrentJobOrder();
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB_PRE_JO);
 
@@ -636,6 +666,11 @@ class RiderAppController extends ApiController
         // get rider's current job order
         $jo = $rider->getCurrentJobOrder();
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_START);
 
@@ -677,6 +712,11 @@ class RiderAppController extends ApiController
         // set jo status to in progress
         $jo->setStatus(JOStatus::IN_PROGRESS);
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE);
 
@@ -735,6 +775,11 @@ class RiderAppController extends ApiController
         // get rider's current job order
         $jo = $rider->getCurrentJobOrder();
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB);
 
@@ -758,6 +803,54 @@ class RiderAppController extends ApiController
        return new APIResponse(true, 'Rider arrive at hub.', $data);
     }
 
+    public function getBatterySizes(Request $req, EntityManagerInterface $em)
+    {
+        // get capi user
+        $capi_user = $this->getUser();
+        if ($capi_user == null)
+            return new APIResponse(false, 'User not found.');
+
+        // get rider id from capi user metadata
+        $rider = $this->getRiderFromCAPI($capi_user, $em);
+        if ($rider == null)
+            return new APIResponse(false, 'No rider found.');
+
+        // get sizes
+        $qb = $em->getRepository(BatterySize::class)
+            ->createQueryBuilder('bs');
+
+        $sizes = $qb->select('bs.id, bs.name')
+            ->orderBy('bs.name', 'asc')
+            ->getQuery()
+            ->getResult();
+
+        // response
+        return new APIResponse(true, '', [
+            'sizes' => $sizes,
+        ]);
+    }
+
+    public function getTradeInTypes(Request $req, EntityManagerInterface $em)
+    {
+        // get capi user
+        $capi_user = $this->getUser();
+        if ($capi_user == null)
+            return new APIResponse(false, 'User not found.');
+
+        // get rider id from capi user metadata
+        $rider = $this->getRiderFromCAPI($capi_user, $em);
+        if ($rider == null)
+            return new APIResponse(false, 'No rider found.');
+
+        // get trade-in types
+        $types = TradeInType::getCollection();
+
+        // response
+        return new APIResponse(true, '', [
+            'types' => $types,
+        ]);
+    }
+
     public function payment(Request $req, EntityManagerInterface $em, JobOrderHandlerInterface $jo_handler,
                             RisingTideGateway $rt, WarrantyHandler $wh, MQTTClient $mclient, MQTTClientApiv2 $mclientv2, FCMSender $fcmclient, TranslatorInterface $translator)
     {
@@ -777,6 +870,22 @@ class RiderAppController extends ApiController
         if (!empty($msg))
             return new APIResponse(false, $msg);
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
+        // need to check if service type is battery sales
+        // if so, serial is a required parameter
+        $serial = $req->request->get('serial', '');
+        if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
+        {
+            /*
+            if (empty($serial))
+                return new APIResponse(false, 'Missing parameter(s): serial');
+            */
+        }
+
         // set invoice to paid
         $jo->getInvoice()->setStatus(InvoiceStatus::PAID);
 
@@ -828,7 +937,6 @@ class RiderAppController extends ApiController
         // create warranty
         if($jo_handler->checkIfNewBattery($jo))
         {
-            $serial = null;
             $warranty_class = $jo->getWarrantyClass();
             $first_name = $jo->getCustomer()->getFirstName();
             $last_name = $jo->getCustomer()->getLastName();
@@ -912,6 +1020,11 @@ class RiderAppController extends ApiController
         // get rider's current job order
         $jo = $rider->getCurrentJobOrder();
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB_POST_JO);
 
@@ -953,6 +1066,11 @@ class RiderAppController extends ApiController
         // get rider's current job order
         $jo = $rider->getCurrentJobOrder();
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB_POST_JO);
 
@@ -1099,7 +1217,178 @@ class RiderAppController extends ApiController
         return new APIResponse(true, 'Batteries found.', $data);
     }
 
-    public function changeService(Request $req, EntityManagerInterface $em, InvoiceGeneratorInterface $ic)
+    public function getBatteryInfo(Request $req, $serial, EntityManagerInterface $em)
+    {
+        if (empty($serial))
+        {
+            return new APIResponse(false, 'Missing parameter(s): serial');
+        }
+
+        // get capi user
+        $capi_user = $this->getUser();
+        if ($capi_user == null)
+            return new APIResponse(false, 'User not found.');
+
+        // get rider id from capi user metadata
+        $rider = $this->getRiderFromCAPI($capi_user, $em);
+        if ($rider == null)
+            return new APIResponse(false, 'No rider found.');
+
+        // find battery given serial/sap_code and flag_active is true
+        $serial = $em->getRepository(WarrantySerial::class)->find($serial);
+
+        if (empty($serial)) {
+            return new APIResponse(false, 'Warranty serial number not found.');
+        }
+
+        $sap_battery = $em->getRepository(SAPBattery::class)->find($serial->getSKU());
+
+        if (empty($sap_battery)) {
+            return new APIResponse(false, 'No battery info found.');
+        }
+
+        $battery = [
+            'id' => $sap_battery->getID(),
+            'brand' => $sap_battery->getBrand()->getName(),
+            'size' => $sap_battery->getSize()->getName(),
+            'size_id' => $sap_battery->getSize()->getID(),
+            'trade_in_type' => TradeInType::MOTOLITE,
+            'container_size' => $sap_battery->getContainerSize()->getName(),
+        ];
+
+        return new APIResponse(true, 'Battery info found.', [
+            'battery' => $battery,
+        ]);
+    }
+
+    public function updateJobOrder(Request $req, EntityManagerInterface $em, InvoiceGeneratorInterface $ic, PriceTierManager $pt_manager)
+    {
+        $items = json_decode(file_get_contents('php://input'), true);
+
+        // get job order id
+        if (!isset($items['jo_id']))
+            return new APIResponse(false, 'Missing parameter(s): jo_id');
+
+        // validate jo_id
+        $jo_id = $items['jo_id'];
+        if (empty($jo_id) || $jo_id == null)
+            return new APIResponse(false, 'Missing parameter(s): jo_id');
+
+        // get capi user
+        $capi_user = $this->getUser();
+        if ($capi_user == null)
+            return new APIResponse(false, 'User not found.');
+
+        // get rider id from capi user metadata
+        $rider = $this->getRiderFromCAPI($capi_user, $em);
+        if ($rider == null)
+            return new APIResponse(false, 'No rider found.');
+
+        // get the job order
+        $jo = $em->getRepository(JobOrder::class)->find($jo_id);
+
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
+        // check if we have trade in items
+        $ti_items = [];
+        if (isset($items['trade_in_items']))
+        {
+            // validate the trade in items first
+            $ti_items = $items['trade_in_items'];
+            $msg = $this->validateTradeInItems($em, $ti_items);
+            if (!empty($msg))
+                return new APIResponse(false, $msg);
+        }
+
+        // get the service type
+        if (!isset($items['stype_id']))
+            return new APIResponse(false, 'Missing parameter(s): stype_id');
+
+        // validate service type
+        $stype_id = $items['stype_id'];
+        if (!ServiceType::validate($stype_id))
+            return new APIResponse(false, 'Invalid service type - ' . $stype_id);
+
+        // save service type
+        $jo->setServiceType($stype_id);
+
+        // validate promo if any. Promo not required
+        $promo = null;
+        if (isset($items['promo_id']))
+        {
+            $promo_id = $items['promo_id'];
+            $promo = $em->getRepository(Promo::class)->find($promo_id);
+            if ($promo == null)
+                return new APIResponse(false, 'Invalid promo id - ' . $promo_id);
+        }
+
+        // get other parameters, if any: has motolite battery, has warranty doc, with coolant, payment method, with sealant
+        if (isset($items['flag_motolite_battery']))
+        {
+            // get customer vehicle from jo
+            $cv = $jo->getCustomerVehicle();
+            $has_motolite =  $items['flag_motolite_battery'];
+            if ($has_motolite == 'true')
+                $cv->setHasMotoliteBattery(true);
+            else
+                $cv->setHasMotoliteBattery(false);
+
+            $em->persist($cv);
+                
+        }
+        if (isset($items['flag_warranty_doc']))
+        {
+            // TODO: what do we do?
+        }
+        if (isset($items['flag_coolant']))
+        {
+            $has_coolant = $items['flag_coolant'];
+            if ($has_coolant == 'true')
+                $jo->setHasCoolant(true);
+            else
+                $jo->setHasCoolant(false);
+           
+        }
+        if (isset($items['mode_of_payment']))
+        {
+            $payment_method = $items['payment_method'];
+            if (!ModeOfPayment::validate($payment_method))
+                $payment_method = ModeOfPayment::CASH;
+            $jo->setModeOfPayment($payment_method);
+        }
+
+        if (isset($items['flag_sealant']))
+        {
+            $has_sealant = $items['flag_sealant'];
+            if ($has_sealant == 'true')
+                $jo->setHasSealant(true);
+            else
+                $jo->setHasSealant(false);
+        }
+
+        // get capi user
+        $capi_user = $this->getUser();
+        if ($capi_user == null)
+            return new APIResponse(false, 'User not found.');
+
+        // get rider id from capi user metadata
+        $rider = $this->getRiderFromCAPI($capi_user, $em);
+        if ($rider == null)
+            return new APIResponse(false, 'No rider found.');
+
+        // need to get the existing invoice items using jo id and invoice id
+        $existing_ii = $this->getInvoiceItems($em, $jo);
+
+        $this->generateUpdatedInvoice($em, $ic, $jo, $existing_ii, $ti_items, $promo, $pt_manager);
+
+        $data = [];
+        return new APIResponse(true, 'Job order updated.', $data);
+    }
+
+    public function changeService(Request $req, EntityManagerInterface $em, InvoiceGeneratorInterface $ic, PriceTierManager $pt_manager)
     {
         // $this->debugRequest($req);
 
@@ -1120,6 +1409,11 @@ class RiderAppController extends ApiController
         if (!empty($msg))
             return new APIResponse(false, $msg);
 
+        // check if JO can be modified first
+        if (!$this->checkJOProgressionAllowed($em, $jo, $rider)) {
+            return new APIResponse(false, 'Job order can no longer be modified.');
+        }
+
         // check service type
         $stype_id = $req->request->get('stype_id');
         if (!ServiceType::validate($stype_id))
@@ -1159,6 +1453,13 @@ class RiderAppController extends ApiController
         else
             $jo->setHasCoolant(false);
 
+        // sealant
+        $flag_sealant = $req->request->get('flag_sealant', 'false');
+        if ($flag_sealant == 'true')
+            $jo->setHasSealant(true);
+        else
+            $jo->setHasSealant(false);
+
         // has motolite battery
         $cv =  $jo->getCustomerVehicle();
         $has_motolite = $req->request->get('has_motolite', 'false');
@@ -1203,6 +1504,10 @@ class RiderAppController extends ApiController
         $crit->setHasCoolant($jo->hasCoolant());
         $crit->setIsTaxable();
 
+        // set price tier
+        $pt_id = $pt_manager->getPriceTier($jo->getCoordinates());
+        $crit->setPriceTier($pt_id);
+
         if ($promo != null)
             $crit->addPromo($promo);
 
@@ -1241,6 +1546,168 @@ class RiderAppController extends ApiController
         return new APIResponse(true, 'Job order service changed.', $data);
     }
 
+    protected function generateUpdatedInvoice(EntityManagerInterface $em, InvoiceGeneratorInterface $ic, JobOrder $jo, $existing_ii, $trade_in_items, $promo, PriceTierManager $pt_manager)
+    {
+        // get the service type
+        $stype = $jo->getServiceType();
+
+        // get the source
+        $source = $jo->getSource();
+
+        // get the customer vehicle
+        $cv = $jo->getCustomerVehicle();
+
+        // get coolant if any
+        $flag_coolant = $jo->hasCoolant();
+
+        // get sealant if any
+        $flag_sealant = $jo->hasSealant();
+
+        // check if new promo is null
+        if ($promo == null)
+        {
+            // promo not updated from app so check existing invoice
+            // get the promo id from existing invoice item
+            $promo_id = $existing_ii['promo_id'];
+            if ($promo_id == null)
+                $promo = null;
+            else
+                $promo = $em->getRepository(Promo::class)->find($promo_id);
+        }
+
+        // populate Invoice Criteria
+        $icrit = new InvoiceCriteria();
+        $icrit->setServiceType($stype)
+            ->setCustomerVehicle($cv)
+            ->setSource($source)
+            ->setHasCoolant($flag_coolant)
+            ->setHasSealant($flag_sealant)
+            ->setIsTaxable();
+
+        // set price tier
+        $pt_id = $pt_manager->getPriceTier($jo->getCoordinates());
+        $icrit->setPriceTier($pt_id);
+
+        // at this point, all information should be valid
+        // assuming JO information is already valid since this 
+        // is in the system already
+        // add promo if any to criteria
+        if ($promo != null)
+            $icrit->addPromo($promo);
+
+        // get the battery purchased from existing invoice items
+        // add the batteries ordered to criteria
+        $ii_items = $existing_ii['invoice_items'];
+        foreach ($ii_items as $ii_item)
+        {
+            $batt_id = $ii_item['batt_id'];
+            $qty = $ii_item['qty'];
+
+            $battery = $em->getRepository(Battery::class)->find($batt_id);
+
+            $icrit->addEntry($battery, null, $qty);
+        }
+
+        // add the trade in items to the criteria
+        foreach ($trade_in_items as $ti_item)
+        {
+            $batt_size_id = $ti_item['battery_size_id'];
+            $qty = $ti_item['qty'];
+            $trade_in_type = $ti_item['trade_in_type'];
+
+            $batt_size = $em->getRepository(BatterySize::class)->find($batt_size_id);
+
+            $icrit->addTradeInEntry($batt_size, $trade_in_type, $qty);
+        }
+
+        // call generateInvoice
+        $invoice = $ic->generateInvoice($icrit);
+
+        // remove previous invoice
+        $old_invoice = $jo->getInvoice();
+        $em->remove($old_invoice);
+        $em->flush();
+
+        // save new invoice
+        $jo->setInvoice($invoice);
+        $em->persist($invoice);
+
+        // log event?
+        $event = new JOEvent();
+        $event->setDateHappen(new DateTime())
+            ->setTypeID(JOEventType::RIDER_EDIT)
+            ->setJobOrder($jo)
+            ->setRider($jo->getRider());
+        $em->persist($event);
+
+        $em->flush();
+    }
+
+    protected function getInvoiceItems(EntityManagerInterface $em, JobOrder $jo)
+    {
+        $jo_id = $jo->getID();
+        $conn = $em->getConnection();
+
+        // need to get the ordered battery id and quantity from invoice item
+        // and the promo from invoice
+        $query_sql = 'SELECT ii.battery_id AS battery_id, ii.qty AS qty, i.promo_id AS promo_id
+            FROM invoice_item ii, invoice i
+            WHERE ii.invoice_id = i.id
+            AND i.job_order_id = :jo_id
+            AND ii.battery_id IS NOT NULL';
+
+        $query_stmt = $conn->prepare($query_sql);
+        $query_stmt->bindValue('jo_id', $jo_id);
+
+        $results = $query_stmt->executeQuery();
+
+        $promo_id = null;
+        $invoice_items = [];
+        while ($row = $results->fetchAssociative())
+        {
+            $promo_id = $row['promo_id'];
+            $invoice_items[] = [
+                'batt_id' => $row['battery_id'],
+                'qty' => $row['qty'],
+                'trade_in' => ''
+            ];
+        }
+
+        $data = [
+            'promo_id' => $promo_id,
+            'invoice_items' => $invoice_items
+        ];
+
+        return $data;
+    }
+
+    protected function validateTradeInItems(EntityManagerInterface $em, $ti_items)
+    {
+        $msg = '';
+        foreach ($ti_items as $ti_item)
+        {
+            $bs_id = $ti_item['battery_size_id'];
+            $ti_type = $ti_item['trade_in_type'];
+
+            // validate the battery size id
+            $batt_size = $em->getRepository(BatterySize::class)->find($bs_id);
+            if ($batt_size == null)
+            {
+                $msg = 'Invalid battery size for trade in: ' . $bs_id;
+                return $msg;
+            }
+
+            // validate the trade in type
+            if (!TradeInType::validate($ti_type))
+            {
+                $msg = 'Invalid trade in type: ' . $ti_type;
+                return $msg;
+            }
+        }
+
+        return $msg;
+    }
+
     protected function getCAPIUser($id, EntityManagerInterface $em)
     {
         $capi_user = $em->getRepository(APIUser::class)->find($id);
@@ -1320,6 +1787,42 @@ class RiderAppController extends ApiController
         return $msg;
     }
 
+    protected function checkJOProgressionAllowed(EntityManagerInterface $em, JobOrder $jo, &$rider)
+    {
+        $allowed = true;
+
+        error_log("JO delivery status is " . $jo->getDeliveryStatus() . " (not allowed: " . DeliveryStatus::CANCELLED . ")");
+        error_log("JO status is " . $jo->getStatus() . " (not allowed: " . JOStatus::CANCELLED . ")");
+        
+        // TODO: add more statuses to block if needed, hence. this is a failsafe in case MQTT is not working.
+        // check delivery status
+        switch ($jo->getDeliveryStatus())
+        {
+            case DeliveryStatus::CANCELLED:
+                $allowed = false;
+                break;
+        }
+
+        // check JO status as well
+        switch ($jo->getStatus())
+        {
+            case JOStatus::CANCELLED:
+                $allowed = false;
+                break;
+        }
+
+        // if this is the rider's current JO, set to null
+        if (!$allowed) {
+            if ($rider->getCurrentJobOrder() === $jo) {
+                $rider->setCurrentJobOrder();
+                $em->persist($rider);
+                $em->flush();
+            }
+        }
+
+        return $allowed;
+    }
+
     protected function debugRequest(Request $req)
     {
         $all = $req->request->all();

src/Controller/CustomerAppAPI/AccountController.php

@@ -0,0 +1,207 @@
+<?php
+
+namespace App\Controller\CustomerAppAPI;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Catalyst\ApiBundle\Component\Response as ApiResponse;
+use App\Entity\CustomerDeleteRequest;
+use App\Entity\Customer;
+use App\Service\RisingTideGateway;
+use DateTime;
+
+class AccountController extends ApiController
+{
+    public function deleteAccount(RisingTideGateway $rt, Request $req, TranslatorInterface $translator)
+    {
+        // validate params
+        $missing = $this->hasMissingParams($req, [
+            'phone_number',
+        ]);
+
+        if ($missing) {
+            return new ApiResponse(false, $missing);
+        }
+
+        // user input
+        $phone_number = $req->request->get('phone_number');
+        $reason = $req->request->get('reason');
+
+        // use the test code if we're using a test number or are on test mode
+        $code = $this->getConfirmCode($phone_number);
+
+        $success_msg = 'We have sent a confirmation code to the submitted phone number if it is valid.';
+
+        // initialize model
+        $obj = new CustomerDeleteRequest();
+
+        // check if a customer record exists for this phone number
+        $cust_obj = $this->findCustomerByNumber($phone_number);
+        if (empty($cust_obj)) {
+            // return a random id anyway if we don't find this customer
+            return new ApiResponse(true, $success_msg, [
+                'request_id' => $obj->getID(),
+            ]);
+        }
+
+        // phone number is valid, we continue building the model
+        $obj->setPhoneNumber($phone_number);
+        $obj->setReason($reason);
+        $obj->setConfirmCode($code);
+
+        // send sms to number if not in test mode
+        if ($this->getOtpMode() != 'test') {
+            $this->sendConfirmationCode($rt, $phone_number, $code, $translator);
+        }
+
+        // save the model
+        $obj->setDateCodeSent(new DateTime());
+        $this->em->persist($obj);
+        $this->em->flush();
+
+        // response
+        return new ApiResponse(true, $success_msg, [
+            'request_id' => $obj->getID(),
+        ]);
+    }
+
+    public function validateDeleteCode(Request $req)
+    {
+        // validate params
+        $missing = $this->hasMissingParams($req, [
+            'request_id',
+            'code',
+        ]);
+
+        if ($missing) {
+            return new ApiResponse(false, $missing);
+        }
+
+        // user input
+        $code = $req->request->get('code');
+        $request_id = $req->request->get('request_id');
+
+        // get the request
+        $obj = $this->em->getRepository(CustomerDeleteRequest::class)->findOneBy([
+            'id' => $request_id,
+            'confirm_code' => $code,
+            'flag_confirmed' => false,
+            'flag_completed' => false,
+        ]);
+        if (empty($obj)) {
+            return new ApiResponse(false, 'Your confirmation code is invalid.');
+        }
+
+        // check if a customer record exists for this phone number
+        $cust_obj = $this->findCustomerByNumber($obj->getPhoneNumber());
+        if (empty($cust_obj)) {
+            return new ApiResponse(false, 'No account exists for this phone number.');
+        }
+
+        // confirm the request
+        $obj->setConfirmed(true);
+        $obj->setDateConfirmed(new DateTime());
+        $obj->setCustomer($cust_obj);
+        $this->em->flush();
+
+        // response
+        return new ApiResponse(true, 'Your request has been submitted for processing.');
+    }
+
+    public function resendCode(Request $req, RisingTideGateway $rt, TranslatorInterface $translator)
+    {
+        // validate params
+        $missing = $this->hasMissingParams($req, [
+            'request_id',
+        ]);
+
+        if ($missing) {
+            return new ApiResponse(false, $missing);
+        }
+
+        // user input
+        $request_id = $req->request->get('request_id');
+        $now = time();
+
+        // get the request
+        $obj = $this->em->getRepository(CustomerDeleteRequest::class)->findOneBy([
+            'id' => $request_id,
+            'flag_confirmed' => false,
+            'flag_completed' => false,
+        ]);
+        if (empty($obj)) {
+            return new ApiResponse(false, 'Invalid request details provided.');
+        }
+
+        // prevent resend spamming
+        if ($now - $obj->getDateCodeSent()->getTimestamp() < 300) {
+            return new ApiResponse(false, 'You can only request a confirm code every 5 mins.');
+        }
+
+        $success_msg = 'We have re-sent a confirmation code to the submitted phone number if it is valid.';
+
+        // check if a customer record exists for this phone number
+        $cust_obj = $this->findCustomerByNumber($obj->getPhoneNumber());
+        if (empty($cust_obj)) {
+            // return successful without resending code if we don't find this customer
+            return new ApiResponse(true, $success_msg);
+        }
+
+        // use the test code if we're using a test number or are on test mode
+        $phone_number = $obj->getPhoneNumber();
+        $code = $this->getConfirmCode($phone_number);
+
+        // send sms to number if not in test mode
+        if ($this->getOtpMode()!= 'test') {
+            $this->sendConfirmationCode($rt, $phone_number, $code, $translator);
+        }
+
+        // update last sent timestamp
+        $obj->setDateCodeSent(new DateTime());
+        $this->em->flush();
+
+        // response
+        return new ApiResponse(true, $success_msg);
+    }
+
+    protected function getConfirmCode($phone_number)
+    {
+        // check for hardcoded phone number for app store testing
+        $test_numbers = explode(",", $_ENV['TEST_PHONE_NUMBERS']);
+
+        if (in_array($phone_number, $test_numbers) || $this->getOtpMode() == 'test') {
+            $code = "123456";
+        } else {
+            // generate code
+            $code = $this->generateConfirmCode();
+        }
+
+        return $code;
+    }
+
+    protected function generateConfirmCode()
+    {
+        return sprintf("%06d", mt_rand(100000, 999999));
+    }
+
+    protected function sendConfirmationCode(RisingTideGateway $rt, $phone_number, $code, TranslatorInterface $translator)
+    {
+        // send sms to number
+        $message = $translator->trans('message.confirmation_code') .  ' ' . $code;
+        $rt->sendSMS($phone_number, $translator->trans('message.battery_brand_allcaps'), $message);
+    }
+
+    protected function findCustomerByNumber($number)
+    {
+        $cust_obj = $this->em->getRepository(Customer::class)->findOneBy([
+            'phone_mobile' => $number,
+        ]);
+
+        return $cust_obj;
+    }
+
+    protected function getOtpMode()
+    {
+        return $_ENV['OTP_MODE'];
+    }
+}

src/Controller/CustomerAppAPI/ApiController.php

@@ -144,6 +144,7 @@ class ApiController extends BaseApiController
     {
         // TODO: workaround for now, we get static image of battery based on model name
         $filename = trim(strtolower($batt->getModel()->getName())) . '_mobile.jpg';
+        $filename = str_replace(" ", "_", $filename);
         $file_path = $req->getSchemeAndHttpHost() . $this->generateUrl('static_battery_image') . '/' . $filename;
 
         return $file_path;
@@ -161,6 +162,6 @@ class ApiController extends BaseApiController
 
     protected function getGeoErrorMessage()
     {
-        return 'Oops! Our service is limited to some areas in Metro Manila, Laguna, Cavite, Pampanga and Baguio only. We will update you as soon as we are able to cover your area';
+        return 'Our services are currently limited to some areas in Metro Manila, Baguio, Batangas, Laguna, Cavite, Pampanga, and Palawan. We will update you as soon as we are available in your area. Thank you for understanding. Keep safe!';
     }
 }

src/Controller/CustomerAppAPI/AppController.php

@@ -12,6 +12,7 @@ class AppController extends ApiController
         // validate params
         $missing = $this->hasMissingParams($req, [
             'version',
+            'os',
         ]);
 
         if ($missing) {
@@ -21,21 +22,23 @@ class AppController extends ApiController
         $need_update = false;
         $msg = 'Version is up to date.';
 
-        $api_version = $this->getParameter('api_version');
-
-        $app_version = $req->query->get('version');
-        // putting this in for the future, in case we have diverging versions
         $os = $req->query->get('os');
-        $platform = $req->query->get('platform');
 
-        $api_v = explode('.', $api_version);
-        $app_v = explode('.', $app_version);
+        // putting this in for the future, in case we have diverging versions
+        //$platform = $req->query->get('platform');
 
-        if ($api_v[0] < $app_v[0]) {
+        // get only the major version numbers
+        $app_version = $req->query->get('version');
+        $app_major = substr($app_version, 0, strripos($app_version, "."));
+
+        $latest_version = $this->getParameter($os . '_app_version');
+        $latest_major = substr($latest_version, 0, strripos($latest_version, "."));
+
+        if ($latest_major < $app_major) {
             return new ApiResponse(false, 'Invalid application version: ' . $app_version);
         }
 
-        if ($api_v[0] > $app_v[0]) {
+        if ($latest_major > $app_major) {
             $need_update = true;
             $msg = 'Your version is outdated and needs an update to use the latest features RES-Q has to offer.';
         }
@@ -43,6 +46,7 @@ class AppController extends ApiController
         // response
         return new ApiResponse(true, '', [
             'need_update' => $need_update,
+            'latest_version' => $latest_version,
             'message' => $msg,
         ]);
     }

src/Controller/CustomerAppAPI/AuthController.php

@@ -85,7 +85,9 @@ class AuthController extends ApiController
         $otp_mode = $_ENV['OTP_MODE'];
 
         // check for hardcoded phone number for app store testing
-        if ($phone_number == '639221111111') {
+        $test_numbers = explode(",", $_ENV['TEST_PHONE_NUMBERS']);
+
+        if (in_array($phone_number, $test_numbers)) {
             $code = '123456';
             $this->session->setConfirmCode($code)
                 ->setPhoneNumber($phone_number);

src/Controller/CustomerAppAPI/InsuranceController.php

@@ -0,0 +1,364 @@
+<?php
+
+namespace App\Controller\CustomerAppAPI;
+
+use Symfony\Component\HttpFoundation\Request;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Catalyst\ApiBundle\Component\Response as ApiResponse;
+
+use App\Service\InsuranceConnector;
+use App\Service\PayMongoConnector;
+
+use App\Entity\InsuranceApplication;
+use App\Entity\GatewayTransaction;
+use App\Entity\CustomerVehicle;
+
+use App\Ramcar\InsuranceApplicationStatus;
+use App\Ramcar\InsuranceMVType;
+use App\Ramcar\InsuranceClientType;
+use App\Ramcar\TransactionStatus;
+use App\Ramcar\InsuranceBodyType;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+use DateTime;
+
+class InsuranceController extends ApiController
+{
+    protected $client;
+
+    public function __construct(EntityManagerInterface $em, KernelInterface $kernel, InsuranceConnector $client)
+    {
+        parent::__construct($em, $kernel);
+        $this->client = $client;
+    }
+
+    public function createApplication(Request $req, PayMongoConnector $paymongo, UrlGeneratorInterface $router)
+    {
+        // validate params
+        $validity = $this->validateRequest($req, [
+            // internal
+            'customer_vehicle_id',
+
+            // client info
+            'client_type',
+            'first_name',
+            //'middle_name', // not required
+            'surname',
+            'corporate_name',
+
+            // client contact info
+            'address_number',
+            //'address_street', // not required
+            //'address_building', // not required
+            'address_barangay',
+            'address_city',
+            'address_province',
+            'zipcode',
+            'mobile_number',
+            'email_address',
+            
+            // car info
+            'make',
+            'model',
+            'series',
+            'color',
+            //'plate_number', // NOTE: we get this from the internal cv record instead
+            'mv_file_number',
+            'motor_number',
+            'serial_chasis', // NOTE: this is how it's spelled on their API
+            'year_model',
+            'mv_type_id',
+            'body_type',
+            //'is_public', // not required, boolean, only show field if mv_type_id in [4, 13]
+            //'orcr_file', // this is a file
+
+            // mv_type_id specific fields
+            //'vehicle_use_type', // not required, only show field if mv_type_id is not in [4, 13]. accepted values are: 'commercial', 'private'
+        ]);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // conditionally require is_public or vehicle_use_type
+        switch ($req->request->get('mv_type_id')) {
+            case 4:
+            case 13:
+                if (empty($req->request->get('is_public'))) {
+                    return new ApiResponse(false, 'Missing required parameter(s): is_public is required when mv_type_id is in [4, 13]');
+                }
+                break;
+            default:
+                if (empty($req->request->get('vehicle_use_type'))) {
+                    return new ApiResponse(false, 'Missing required parameter(s): vehicle_use_type is required when mv_type_id is not in [4, 13]');
+                }
+                break;
+        }
+
+        // require the orcr file
+        if ($req->files->get('orcr_file') === null) {
+            return new ApiResponse(false, 'Missing required file: orcr_file');
+        }
+
+        // get our listener url
+        $notif_url = $router->generate('insurance_listener', [], UrlGeneratorInterface::ABSOLUTE_URL);
+
+        // get customer and cv info
+        $cust = $this->session->getCustomer();
+        $cv = $this->em->getRepository(CustomerVehicle::class)->find($req->request->get('customer_vehicle_id'));
+        if ($cv == null) {
+            return new ApiResponse(false, 'Invalid customer vehicle id.');
+        }
+
+        // confirm that customer vehicle belongs to customer
+        if ($cv->getCustomer()->getID() != $cust->getID()) {
+            return new ApiResponse(false, 'Vehicle does not belong to customer.');
+        }
+
+        // process all our inputs first
+        $input = $req->request->all();
+        
+        if (!isset($input['is_public'])) {
+            $input['is_public'] = false;
+        }
+
+        $input['line'] = $this->getLineType($input['mv_type_id'], $input['vehicle_use_type'], $input['is_public']);
+
+        // submit insurance application
+        $result = $this->client->createApplication(
+            $cv,
+            $notif_url,
+            $input,
+            $req->files->get('orcr_file')
+        );
+        if (!$result['success']) {
+            return new ApiResponse(false, $result['error']['message']);
+        }
+
+        $premium_amount_int = (int)bcmul($result['response']['premium'], 100);
+
+        // build checkout item and metadata
+        $items = [
+            [
+                'name' => "Insurance Premium",
+                'description' => "Premium fee for vehicle insurance",
+                'quantity' => 1,
+                'amount' => $premium_amount_int,
+                'currency' => 'PHP',
+            ],
+        ];
+
+        $now = new DateTime();
+
+        // create gateway transaction
+        $gt = new GatewayTransaction();
+        $gt->setCustomer($cust);
+        $gt->setDateCreate($now);
+        $gt->setAmount($premium_amount_int);
+        $gt->setStatus(TransactionStatus::PENDING);
+        $gt->setGateway('paymongo'); // TODO: define values elsewhere
+        $gt->setType('insurance_premium'); // TODO: define values elsewhere
+        $this->em->persist($gt);
+        $this->em->flush();
+
+        // create paymongo checkout resource
+        $checkout = $paymongo->createCheckout(
+            $cust,
+            $items,
+            $gt->getID(),
+            "Motolite RES-Q Vehicle Insurance",
+            $router->generate('paymongo_payment_success', [], UrlGeneratorInterface::ABSOLUTE_URL),
+            $router->generate('paymongo_payment_cancelled', [], UrlGeneratorInterface::ABSOLUTE_URL),
+            ['transaction_id' => $gt->getID()], // NOTE: passing this here too for payment resource metadata
+        );
+        if (!$checkout['success']) {
+            return new ApiResponse(false, $checkout['error']['message']);
+        }
+
+        $checkout_url = $checkout['response']['data']['attributes']['checkout_url'];
+
+        // add checkout url and id to transaction metadata
+        $gt->setExtTransactionId($checkout['response']['data']['id']);
+        $gt->setMetadata([
+            'checkout_url' => $checkout_url,
+        ]);
+
+        // store application in db
+        $app = new InsuranceApplication();
+        $app->setDateSubmit($now);
+        $app->setCustomer($cust);
+        $app->setCustomerVehicle($cv);
+        $app->setGatewayTransaction($gt);
+        $app->setStatus(InsuranceApplicationStatus::CREATED);
+        $app->setExtTransactionId($result['response']['id']);
+        $app->setMetadata($input);
+        $this->em->persist($app);
+
+        // save everything
+        $this->em->flush();
+
+        // return
+        return new ApiResponse(true, '', [
+            'app_id' => $app->getID(),
+            'checkout_url' => $checkout_url,
+            'premium_amount' => (string)$result['response']['premium'],
+        ]);
+    }
+
+    public function getVehicleMakers(Request $req)
+    {
+        // validate params
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get maker list
+        $result = $this->client->getVehicleMakers();
+        if (!$result['success']) {
+            return new ApiResponse(false, $result['error']['message']);
+        }
+
+        return new ApiResponse(true, '', [
+            'makers' => $result['response']['data']['vehicleMakers'],
+        ]);
+    }
+
+    public function getVehicleModels($maker_id, Request $req)
+    {
+        // validate params
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get maker list
+        $result = $this->client->getVehicleModels($maker_id);
+        if (!$result['success']) {
+            return new ApiResponse(false, $result['error']['message']);
+        }
+
+        return new ApiResponse(true, '', [
+            'models' => $result['response']['data']['vehicleModels'],
+        ]);
+    }
+
+    public function getVehicleTrims($model_id, Request $req)
+    {
+        // validate params
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get maker list
+        $result = $this->client->getVehicleTrims($model_id);
+        if (!$result['success']) {
+            return new ApiResponse(false, $result['error']['message']);
+        }
+
+        return new ApiResponse(true, '', [
+            'trims' => $result['response']['data']['vehicleTrims'],
+        ]);
+    }
+
+    public function getMVTypes(Request $req)
+    {
+        // validate params
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        return new ApiResponse(true, '', [
+            'mv_types' => InsuranceMVType::getCollection(),
+        ]);
+    }
+
+    public function getClientTypes(Request $req)
+    {
+        // validate params
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        return new ApiResponse(true, '', [
+            'mv_types' => InsuranceClientType::getCollection(),
+        ]);
+    }
+
+    public function getPremiumsBanner(Request $req)
+    {
+        // validate params
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        return new ApiResponse(true, '', [
+            'url' => $this->getParameter('insurance_premiums_banner_url'),
+        ]);
+    }
+
+    public function getBodyTypes(Request $req)
+    {
+        // validate params
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        $bt_collection = InsuranceBodyType::getCollection();
+        $body_types = [];
+
+        // NOTE: formatting it this way to match how insurance third party API returns their own stuff, so it's all handled one way on the app
+        foreach ($bt_collection as $bt_key => $bt_name) {
+            $body_types[] = [
+                'id' => $bt_key,
+                'name' => $bt_name,
+            ];
+        }
+
+        return new ApiResponse(true, '', [
+            'body_types' => $body_types,
+        ]);
+    }
+
+    protected function getLineType($mv_type_id, $vehicle_use_type, $is_public = false)
+    {
+        $line = '';
+
+        // NOTE: this is a bit of a hack since we're hardcoding values, but this is fine for now
+        switch ($mv_type_id) {
+            case '3':
+                $line = 'mcoc';
+                break;
+            case '4':
+            case '13':
+                if ($is_public) {
+                    $line = 'lcoc';
+                } else {
+                    $line = 'mcoc';
+                }
+                break;
+            default:
+                if ($vehicle_use_type === 'commercial') {
+                    $line = 'ccoc';
+                } else {
+                    $line = 'pcoc';
+                }
+                break;
+        }
+
+        return $line;
+    }
+}

src/Controller/CustomerAppAPI/InvoiceController.php

@@ -4,17 +4,23 @@ namespace App\Controller\CustomerAppAPI;
 
 use Symfony\Component\HttpFoundation\Request;
 use Catalyst\ApiBundle\Component\Response as ApiResponse;
+use CrEOF\Spatial\PHP\Types\Geometry\Point;
 
 use App\Service\InvoiceGeneratorInterface;
+use App\Service\PriceTierManager;
 use App\Ramcar\InvoiceCriteria;
 use App\Ramcar\TradeInType;
+use App\Ramcar\TransactionOrigin;
 use App\Entity\CustomerVehicle;
 use App\Entity\Promo;
 use App\Entity\Battery;
+use App\Entity\BatterySize;
+use App\Entity\Customer;
+use App\Entity\CustomerMetadata;
 
 class InvoiceController extends ApiController
 {
-    public function getEstimate(Request $req, InvoiceGeneratorInterface $ic)
+    public function getEstimate(Request $req, InvoiceGeneratorInterface $ic, PriceTierManager $pt_manager)
     {
         // $this->debugRequest($req);
 
@@ -23,7 +29,6 @@ class InvoiceController extends ApiController
             'service_type',
             'cv_id',
             // 'batt_id',
-            'trade_in',
         ]);
 
         if (!$validity['is_valid']) {
@@ -36,6 +41,18 @@ class InvoiceController extends ApiController
             return new ApiResponse(false, 'No customer information found.');
         }
 
+        // get customer location from customer_metadata using customer id
+        $lng = $req->request->get('longitude');
+        $lat = $req->request->get('latitude');
+
+        if ((empty($lng)) || (empty($lat)))
+        {
+            // use customer metadata location as basis
+            $coordinates = $this->getCustomerMetadata($cust);
+        }
+        else
+            $coordinates = new Point($lng, $lat);
+
         // make invoice criteria
         $icrit = new InvoiceCriteria();
         $icrit->setServiceType($req->request->get('service_type'));
@@ -81,26 +98,51 @@ class InvoiceController extends ApiController
 
         // check trade-in
         // only allow motolite, other, none
-        $trade_in = $req->request->get('trade_in');
-        switch ($trade_in) {
+        $trade_in_batt = $req->request->get('trade_in_batt');
+        $trade_in_type = $req->request->get('trade_in_type');
+        
+        switch ($trade_in_type) {
             case TradeInType::MOTOLITE:
             case TradeInType::OTHER:
                 break;
 
             default:
-                $trade_in = '';
+                $trade_in_type = '';
                 break;
         }
 
-        // right now, the app does not include trade-ins but this might change in the future
-        if (empty($trade_in))
-            $icrit->addEntry($batt, null, 1);
-        else
-            $icrit->addEntry($batt, $trade_in, 1);
+        // add the actual battery item first
+        $icrit->addEntry($batt, null, 1);
+
+        // DEBUG
+
+        // if we have a trade in, add it as well
+        if (!empty($trade_in_type) && !empty($trade_in_batt)) {
+            $ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
+            if (!empty($ti_batt_obj)) {
+                $ti_batt_size_obj = $ti_batt_obj->getSize();
+                $icrit->addTradeInEntry($ti_batt_size_obj, $trade_in_type, 1);
+            }
+        }
 
         // set if taxable
         $icrit->setIsTaxable();
 
+        // set JO source
+        $icrit->setSource(TransactionOrigin::MOBILE_APP);
+
+        // set price tier
+        $pt_id = 0;
+        if ($coordinates != null)
+        {
+            error_log('coordinates are not null');
+            $pt_id = $pt_manager->getPriceTier($coordinates);
+        }
+        else
+            error_log('null?');
+
+        $icrit->setPriceTier($pt_id);
+
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
 
@@ -136,4 +178,28 @@ class InvoiceController extends ApiController
         // response
         return new ApiResponse(true, '', $data);
     }
+
+    protected function getCustomerMetadata(Customer $cust)
+    {
+        $coordinates = null;
+
+        // check if customer already has existing metadata
+        $c_meta = $this->em->getRepository(CustomerMetadata::class)->findOneBy(['customer' => $cust]);
+        if ($c_meta != null)
+        {
+            $meta_data = $c_meta->getAllMetaInfo();
+            foreach ($meta_data as $m_info)
+            {
+                if ((isset($m_info['longitude'])) && (isset($m_info['latitude'])))
+                {
+                    $lng = $m_info['longitude'];
+                    $lat = $m_info['latitude'];
+
+                    $coordinates = new Point($lng, $lat);
+                }
+            }
+        }
+
+        return $coordinates;
+    }
 }

src/Controller/CustomerAppAPI/JobOrderController.php

@@ -20,6 +20,8 @@ use App\Service\HubSelector;
 use App\Service\HubDistributor;
 use App\Service\HubFilterLogger;
 use App\Service\HubFilteringGeoChecker;
+use App\Service\JobOrderManager;
+use App\Service\PriceTierManager;
 use App\Ramcar\ServiceType;
 use App\Ramcar\APIRiderStatus;
 use App\Ramcar\InvoiceCriteria;
@@ -33,6 +35,7 @@ use App\Ramcar\WarrantyClass;
 use App\Ramcar\HubCriteria;
 use App\Ramcar\DeliveryStatus;
 use App\Entity\Battery;
+use App\Entity\BatterySize;
 use App\Entity\Hub;
 use App\Entity\Promo;
 use App\Entity\JOEvent;
@@ -482,13 +485,16 @@ class JobOrderController extends ApiController
         HubSelector $hub_select,
         HubDistributor $hub_dist,
         HubFilterLogger $hub_filter_logger,
-        HubFilteringGeoChecker $hub_geofence
+        HubFilteringGeoChecker $hub_geofence,
+        JobOrderManager $jo_manager,
+        PriceTierManager $pt_manager
     ) {
+        //error_log("CREATING JOB ORDER WITH PARAMS " . print_r($req->request->all(), true));
+
         // validate params
         $validity = $this->validateRequest($req, [
             'service_type',
             'cv_id',
-            'trade_in',
             'long',
             'lat',
             'warranty',
@@ -500,7 +506,8 @@ class JobOrderController extends ApiController
         }
 
         // trade in type
-        $trade_in = $req->request->get('trade_in');
+        $trade_in_batt = $req->request->get('trade_in_batt');
+        $trade_in_type = $req->request->get('trade_in_type', '');
 
         // address
         $address = $req->request->get('delivery_address', 'Set by mobile application');
@@ -571,6 +578,8 @@ class JobOrderController extends ApiController
             $flag_advance_order = true;
         // $flag_advance_order = $advance_order ? true : false;
 
+        //error_log("RUNNING QUERY NEXT");
+
         $jo = new JobOrder();
         $jo->setSource(TransactionOrigin::MOBILE_APP)
             ->setStatus(JOStatus::PENDING)
@@ -578,7 +587,7 @@ class JobOrderController extends ApiController
             ->setTier1Notes('')
             ->setTier2Notes('')
             ->setDeliveryAddress($address)
-            ->setTradeInType($trade_in)
+            ->setTradeInType($trade_in_type)
             ->setDeliveryInstructions($instructions)
             // TODO: error check for valid mode of payment
             ->setModeOfPayment($req->request->get('mode_of_payment'))
@@ -594,7 +603,16 @@ class JobOrderController extends ApiController
         //        ->setErrorMessage('No customer information found');
         //    return $res->getReturnResponse();
         // }
+
+        // check if customer has more than one job order already
+        $flag_cust_new = false;
+
+        $cust_jo_count = $jo_manager->getCustomerJobOrderCount($cust->getID());
+        if ($cust_jo_count <= 1)
+            $flag_cust_new = true;
+
         $jo->setCustomer($cust);
+        $jo->setCustNew($flag_cust_new);
 
         // validate service type
         $stype = $req->request->get('service_type');
@@ -630,6 +648,8 @@ class JobOrderController extends ApiController
             $icrit->addPromo($promo);
         }
 
+        //error_log("CONTINUING QUERY BUILDING");
+
         // check customer vehicle
         $cv = $this->em->getRepository(CustomerVehicle::class)->find($req->request->get('cv_id'));
         if ($cv == null) {
@@ -658,41 +678,68 @@ class JobOrderController extends ApiController
         $icrit->addBattery($batt);
         */
 
-        // NOTE: trade in is currently not supported. Would it be better
-        // if we remove trade-in as a required parameter? Or just leave it be 
-        // and simply not process it?
         // check trade-in
         // only allow motolite, other, none
-        switch ($trade_in) {
+        switch ($trade_in_type) {
             case TradeInType::MOTOLITE:
             case TradeInType::OTHER:
                 break;
 
             default:
-                $trade_in = '';
+                $trade_in_type = '';
                 break;
         }
 
-        // right now, the app does not include trade-ins but this might change in the future
-        if (empty($trade_in))
-            $icrit->addEntry($batt, null, 1);
-        else
-            $icrit->addEntry($batt, $trade_in, 1);
+        // add the actual battery item first
+        $icrit->addEntry($batt, null, 1);
+
+        // if we have a trade in, add it as well
+        if (!empty($trade_in_type) && !empty($trade_in_batt)) {
+            $ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
+            if (!empty($ti_batt_obj)) {
+                $ti_batt_size_obj = $ti_batt_obj->getSize();
+                $icrit->addTradeInEntry($ti_batt_size_obj, $trade_in_type, 1);
+            }
+        }
 
         // set taxable
         $icrit->setIsTaxable();
 
+        // set JO source
+        $icrit->setSource(TransactionOrigin::MOBILE_APP);
+
+        // set price tier
+        $pt_id = $pt_manager->getPriceTier($jo->getCoordinates());
+        $icrit->setPriceTier($pt_id);
+
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
         $jo->setInvoice($invoice);
 
+        //error_log("GENERATED INVOICE");
+
+        // save here first so we have a JO ID which is required for the hub selector
+        $this->em->persist($invoice);
+        $this->em->persist($jo);
+        $this->em->flush();
+
         // assign hub and rider
         // check if hub is null
         if ($hub == null) {
+            //error_log("NO HUB");
+
             // TODO: need to factor out the setting of HubCriteria fields
             $hub_criteria = new HubCriteria();
             $hub_criteria->setPoint($jo->getCoordinates());
 
+            // set job order info
+            $hub_criteria->setJobOrderId($jo->getID())
+                ->setJoType($jo->getServiceType())
+                ->setJoOrigin($jo->getSource())
+                ->setCustomerClass($cust->getCustomerClassification())
+                ->setOrderDate($jo->getDateCreate())
+                ->setServiceType($jo->getServiceType());
+
             // get distance limit for mobile from env
             // get value of hub_filter_enable from env
             $limit_distance = $_ENV['CUST_DISTANCE_LIMIT'];
@@ -730,6 +777,10 @@ class JobOrderController extends ApiController
 
             $hub_criteria->setCustomerId($customer_id);
 
+            // set filter flags for inventory and available riders
+            $hub_criteria->setInventoryCheck();
+            $hub_criteria->setRidersCheck();
+
             // find nearest hubs
             $nearest_hubs = $hub_select->find($hub_criteria);
 
@@ -808,6 +859,8 @@ class JobOrderController extends ApiController
                 }
             }
         } else {
+            //error_log("HAS HUB: " . $hub->getID());
+
             $jo->setHub($hub);
             $jo->setStatus(JOStatus::RIDER_ASSIGN);
             $jo->setStatusAutoAssign(AutoAssignStatus::HUB_ASSIGNED);
@@ -819,8 +872,10 @@ class JobOrderController extends ApiController
             $hub_dist->incrementJoCountForHub($hub);
         }
 
+        //error_log("DONE SELECTING HUB");
+
+        // save additional hub related changes
         $this->em->persist($jo);
-        $this->em->persist($invoice);
 
         // add event log for JO
         $event = new JOEvent();
@@ -931,6 +986,8 @@ class JobOrderController extends ApiController
             }
         }
 
+        //error_log("DONE CREATING JOB ORDER " . $jo->getID());
+
         // response
         return new ApiResponse(true, '', [
             'jo_id' => $jo->getID(),
@@ -953,14 +1010,15 @@ class JobOrderController extends ApiController
         HubSelector $hub_select,
         HubDistributor $hub_dist,
         HubFilterLogger $hub_filter_logger,
-        HubFilteringGeoChecker $hub_geofence
+        HubFilteringGeoChecker $hub_geofence,
+        JobOrderManager $jo_manager,
+        PriceTierManager $pt_manager
     ) {
         // validate params
         $validity = $this->validateRequest($req, [
             'service_type',
             'cv_id',
             // 'batt_id',
-            'trade_in',
             'long',
             'lat',
             'warranty',
@@ -972,7 +1030,8 @@ class JobOrderController extends ApiController
         }
 
         // trade in type
-        $trade_in = $req->request->get('trade_in');
+        $trade_in_batt = $req->request->get('trade_in_batt');
+        $trade_in_type = $req->request->get('trade_in_type', '');
 
         // address
         $address = $req->request->get('delivery_address', 'Set by mobile application');
@@ -998,7 +1057,7 @@ class JobOrderController extends ApiController
             ->setTier1Notes('')
             ->setTier2Notes('')
             ->setDeliveryAddress($address)
-            ->setTradeInType($trade_in)
+            ->setTradeInType($trade_in_type)
             ->setDeliveryInstructions($instructions)
             // TODO: error check for valid mode of payment
             ->setModeOfPayment($req->request->get('mode_of_payment'));
@@ -1008,7 +1067,16 @@ class JobOrderController extends ApiController
         if ($cust == null) {
             return new ApiResponse(false, 'No customer information found.');
         }
+
+        // check if customer has more than one job order already
+        $flag_cust_new = false;
+
+        $cust_jo_count = $jo_manager->getCustomerJobOrderCount($cust->getID());
+        if ($cust_jo_count <= 1)
+            $flag_cust_new = true;
+
         $jo->setCustomer($cust);
+        $jo->setCustNew($flag_cust_new);
 
         // validate service type
         $stype = $req->request->get('service_type');
@@ -1074,20 +1142,37 @@ class JobOrderController extends ApiController
 
         // check trade-in
         // only allow motolite, other, none
-        switch ($trade_in) {
+        switch ($trade_in_type) {
             case TradeInType::MOTOLITE:
             case TradeInType::OTHER:
                 break;
 
             default:
-                $trade_in = '';
+                $trade_in_type = '';
                 break;
         }
 
+        // add the actual battery item first
+        $icrit->addEntry($batt, null, 1);
+
+        // if we have a trade in, add it as well
+        if (!empty($trade_in_type) && !empty($trade_in_batt)) {
+            $ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
+            if (!empty($ti_batt_obj)) {
+                $battery_size = $ti_batt_obj->getSize();
+                $icrit->addTradeInEntry($battery_size, $trade_in_type, 1);
+            }
+        }
+
         // set taxable
         $icrit->setIsTaxable();
 
-        $icrit->addEntry($batt, $trade_in, 1);
+        // set JO source
+        $icrit->setSource(TransactionOrigin::MOBILE_APP);
+
+        // set price tier
+        $pt_id = $pt_manager->getPriceTier($jo->getCoordinates());
+        $icrit->setPriceTier($pt_id);
 
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);

src/Controller/CustomerAppAPI/VehicleController.php

@@ -4,11 +4,19 @@ namespace App\Controller\CustomerAppAPI;
 
 use Symfony\Component\HttpFoundation\Request;
 use Catalyst\ApiBundle\Component\Response as ApiResponse;
+use CrEOF\Spatial\PHP\Types\Geometry\Point;
 
 use App\Entity\CustomerVehicle;
+use App\Entity\JobOrder;
 use App\Entity\VehicleManufacturer;
 use App\Entity\Vehicle;
-
+use App\Entity\ItemType;
+use App\Ramcar\JOStatus;
+use App\Ramcar\ServiceType;
+use App\Ramcar\TradeInType;
+use App\Ramcar\InsuranceApplicationStatus;
+use App\Service\PayMongoConnector;
+use App\Service\PriceTierManager;
 use DateTime;
 
 class VehicleController extends ApiController
@@ -107,6 +115,34 @@ class VehicleController extends ApiController
 
     }
 
+    public function getVehicle(Request $req, $id, PayMongoConnector $paymongo)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get customer vehicle
+        $cv = $this->em->getRepository(CustomerVehicle::class)->find($id);
+
+        // check if it exists
+        if ($cv == null) {
+            return new ApiResponse(false, 'Vehicle does not exist.');
+        }
+
+        // check if it's owned by customer
+        if ($cv->getCustomer()->getID() != $this->session->getCustomer()->getID()) {
+            return new ApiResponse(false, 'Invalid vehicle.');
+        }
+
+        // response
+        return new ApiResponse(true, '', [
+            'vehicle' => $this->generateVehicleInfo($cv, true, $paymongo),
+        ]);
+    }
+
     public function updateVehicle(Request $req, $id)
     {
         // check requirements
@@ -141,7 +177,40 @@ class VehicleController extends ApiController
         ]);
     }
 
-    public function listVehicles(Request $req)
+    public function getTradeInEstimate(Request $req, $id)
+    {
+        // check requirements
+        $validity = $this->validateRequest($req);
+
+        if (!$validity['is_valid']) {
+            return new ApiResponse(false, $validity['error']);
+        }
+
+        // get customer vehicle
+        $cv = $this->em->getRepository(CustomerVehicle::class)->find($id);
+
+        // check if it exists
+        if ($cv == null) {
+            return new ApiResponse(false, 'Vehicle does not exist.');
+        }
+
+        // check if it's owned by customer
+        if ($cv->getCustomer()->getID() != $this->session->getCustomer()->getID()) {
+            return new ApiResponse(false, 'Invalid vehicle.');
+        }
+
+        // check trade in value
+        $result = $this->getTIEstimateByCV($cv);
+
+        // response
+        return new ApiResponse(true, '', [
+            'trade_in_batt' => $result['trade_in_batt'],
+            'trade_in_type' => $result['trade_in_type'],
+            'trade_in_value' => $result['trade_in_value'],
+        ]);
+    }
+
+    public function listVehicles(Request $req, PayMongoConnector $paymongo)
     {
         // validate params
         $validity = $this->validateRequest($req);
@@ -162,37 +231,7 @@ class VehicleController extends ApiController
         // only get the customer's vehicles whose flag_active is true
         $cvs = $this->em->getRepository(CustomerVehicle::class)->findBy(['flag_active' => true, 'customer' => $cust]);
         foreach ($cvs as $cv) {
-            $battery_id = null;
-            if ($cv->getCurrentBattery() != null)
-                $battery_id = $cv->getCurrentBattery()->getID();
-
-            $wty_ex = null;
-            if ($cv->getWarrantyExpiration() != null)
-                $wty_ex = $cv->getWarrantyExpiration()->format('Y-m-d');
-
-            $warranty = $this->findWarranty($cv->getPlateNumber());
-
-            $cv_name = '';
-            if ($cv->getName() != null)
-                $cv_name = $cv->getName();
-
-            $cv_list[] = [
-                'cv_id' => $cv->getID(),
-                'mfg_id' => $cv->getVehicle()->getManufacturer()->getID(),
-                'make_id' => $cv->getVehicle()->getID(),
-                'name' => $cv_name,
-                'plate_num' => $cv->getPlateNumber(),
-                'model_year' => $cv->getModelYear(),
-                'color' => $cv->getColor(),
-                'condition' => $cv->getStatusCondition(),
-                'fuel_type' => $cv->getFuelType(),
-                'wty_code' => $cv->getWarrantyCode(),
-                'wty_expire' => $wty_ex,
-                'curr_batt_id' => $battery_id,
-                'is_motolite' => $cv->hasMotoliteBattery() ? 1 : 0,
-                'is_active' => $cv->isActive() ? 1 : 0,
-                'warranty' => $warranty,
-            ];
+            $cv_list[] = $this->generateVehicleInfo($cv, true, $paymongo);
         }
 
         // response
@@ -201,7 +240,7 @@ class VehicleController extends ApiController
         ]);
     }
 
-    public function getCompatibleBatteries(Request $req, $vid)
+    public function getCompatibleBatteries(Request $req, $vid, PriceTierManager $pt_manager)
     {
         // validate params
         $validity = $this->validateRequest($req);
@@ -216,11 +255,43 @@ class VehicleController extends ApiController
             return new ApiResponse(false, 'Invalid vehicle.');
         }
 
+        // get location from request
+        $lng = $req->query->get('longitude', '');
+        $lat = $req->query->get('latitude', '');
+
+        $batts = $vehicle->getActiveBatteries();
+        $pt_id = 0;
+        if ((!(empty($lng))) && (!(empty($lat))))
+        {
+            // get the price tier
+            $coordinates = new Point($lng, $lat);
+
+            $pt_id = $pt_manager->getPriceTier($coordinates);
+        }        
+
         // batteries
         $batt_list = [];
-        $batts = $vehicle->getBatteries();
         foreach ($batts as $batt) {
             // TODO: Add warranty_tnv to battery information
+            // check if customer location is in a price tier location
+            if ($pt_id == 0)
+                $price = $batt->getSellingPrice();
+            else
+            {
+                // get item type for battery
+                $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'battery']);
+                if ($item_type == null)
+                    $price = $batt->getSellingPrice();
+                else
+                {
+                    $item_type_id = $item_type->getID();
+                    $batt_id = $batt->getID();
+
+                    // find the item price given price tier id and battery id
+                    $price = $pt_manager->getItemPrice($pt_id, $item_type_id, $batt_id);
+                }
+            }
+            
             $batt_list[] = [
                 'id' => $batt->getID(),
                 'mfg_id' => $batt->getManufacturer()->getID(),
@@ -229,7 +300,7 @@ class VehicleController extends ApiController
                 'model_name' => $batt->getModel()->getName(),
                 'size_id' => $batt->getSize()->getID(),
                 'size_name' => $batt->getSize()->getName(),
-                'price' => $batt->getSellingPrice(),
+                'price' => $price,
                 'wty_private' => $batt->getWarrantyPrivate(),
                 'wty_commercial' => $batt->getWarrantyCommercial(),
                 'image_url' => $this->getBatteryImageURL($req, $batt),
@@ -284,6 +355,159 @@ class VehicleController extends ApiController
         // response
         return new ApiResponse();
     }
+    
+    protected function getTIEstimateByCV($cv)
+    {
+        // compute for trade in value
+        $trade_in_batt = null;
+        $trade_in_value = 0;
+        $trade_in_type = TradeInType::OTHER;
+        $previous_jo_found = false;
+
+        // check for last battery replacement JO
+        $last_jo = $this->em->getRepository(JobOrder::class)->findOneBy([
+                'service_type' => [
+                    ServiceType::BATTERY_REPLACEMENT_NEW, ServiceType::BATTERY_REPLACEMENT_WARRANTY
+                ],
+                'status' => JOStatus::FULFILLED,
+                'cus_vehicle' => $cv,
+            ], ['date_create' => 'desc']);
+
+        if (!empty($last_jo)) {
+            $items = $last_jo->getInvoice()->getItems();
+
+            foreach ($items as $item) {
+                // find the first battery item and get its trade-in value
+                $item_battery = $item->getBattery();
+                if (!empty($item_battery)) {
+                    $trade_in_type = TradeInType::MOTOLITE;
+                    $trade_in_batt = $item_battery->getID();
+                    $previous_jo_found = true;
+                    $size = $item_battery->getSize();
+                    $trade_in_value = $size->getTIPriceMotolite();
+                    break;
+                }
+            }
+        }
+
+        // TODO: possibly refactor this bit
+        // if no valid previous JO is found, base the trade-in value on recommended batteries
+        if (!$previous_jo_found) {
+            $comp_batteries = $cv->getVehicle()->getBatteries();
+            
+            // get the lowest trade-in value from the list of batteries
+            if (!empty($comp_batteries)) {
+                foreach ($comp_batteries as $battery) {
+                    $size = $battery->getSize();
+                    $size_ti = $size->getTIPriceOther();
+
+                    // get the lowest value or set if not set yet
+                    if ($size_ti < $trade_in_value || $trade_in_value == 0) {
+                        $trade_in_value = $size_ti;
+                        $trade_in_batt = $battery->getID();
+                    }
+                }
+            }
+        }
+
+        return [
+            'trade_in_batt' => $trade_in_batt,
+            'trade_in_type' => $trade_in_type,
+            'trade_in_value' => $trade_in_value,
+        ];
+    }
+
+    protected function generateVehicleInfo(CustomerVehicle $cv, $include_insurance = false, PayMongoConnector $paymongo)
+    {
+        $battery_id = null;
+        if ($cv->getCurrentBattery() != null)
+            $battery_id = $cv->getCurrentBattery()->getID();
+
+        $wty_ex = null;
+        if ($cv->getWarrantyExpiration() != null)
+            $wty_ex = $cv->getWarrantyExpiration()->format('Y-m-d');
+
+        $warranty = $this->findWarranty($cv->getPlateNumber());
+
+        $cv_name = '';
+        if ($cv->getName() != null)
+            $cv_name = $cv->getName();
+
+        $row = [
+            'cv_id' => $cv->getID(),
+            'mfg_id' => $cv->getVehicle()->getManufacturer()->getID(),
+            'make_id' => $cv->getVehicle()->getID(),
+            'name' => $cv_name,
+            'plate_num' => $cv->getPlateNumber(),
+            'model_year' => $cv->getModelYear(),
+            'color' => $cv->getColor(),
+            'condition' => $cv->getStatusCondition(),
+            'fuel_type' => $cv->getFuelType(),
+            'wty_code' => $cv->getWarrantyCode(),
+            'wty_expire' => $wty_ex,
+            'curr_batt_id' => $battery_id,
+            'is_motolite' => $cv->hasMotoliteBattery() ? 1 : 0,
+            'is_active' => $cv->isActive() ? 1 : 0,
+            'warranty' => $warranty,
+        ];
+
+        // get latest insurance row
+        if ($include_insurance) {
+            $insurance = null;
+            $iobj = $cv->getLatestInsuranceApplication();
+            if (!empty($iobj)) {
+                $gt = $iobj->getGatewayTransaction();
+                $date_complete = $iobj->getDateComplete();
+                $date_expire = $iobj->getDateExpire();
+                $status = $iobj->getStatus();
+
+                error_log("\r\nTHIS IS THE CURRENT STATUS: " . $status . "\r\n");
+
+                // handle the very transient state between a payment being made and receiving the paymongo webhook
+                // TODO: maybe handle this more elegantly. issue is not sure it is a good idea to update the db for this very transient status as the webhook listener also updates this status right away
+                switch ($status) {
+                    case InsuranceApplicationStatus::CREATED:
+                        // get latest status on this checkout from paymongo
+                        $checkout = $paymongo->getCheckout($gt->getExtTransactionId());
+
+                        if ($checkout['success']) {
+                            $payment_intent = $checkout['response']['data']['attributes']['payment_intent'] ?? null;
+                            if (!empty($payment_intent)) {
+                                $intent_status = $payment_intent['attributes']['status'] ?? null;
+                                
+                                // TODO: define these paymongo payment intent statuses elsewhere
+                                if ($intent_status === 'processing' || $intent_status === 'succeeded') {
+                                    $status = InsuranceApplicationStatus::PAID;
+                                }
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+
+                $insurance = [
+                    'id' => $iobj->getID(),
+                    'ext_transaction_id' => $iobj->getExtTransactionId(),
+                    'status' => $status,
+                    'coc_url' => $iobj->getCOC(),
+                    'checkout_url' => $gt->getMetadata()['checkout_url'],
+                    'transaction_status' => $gt->getStatus(),
+                    'premium_amount' => (string)bcdiv($gt->getAmount(), 100), // NOTE: hard expressing as string so it's consistent
+                    'date_submit' => $iobj->getDateSubmit()->format('Y-m-d H:i:s'),
+                    'date_complete' => $date_complete ? $date_complete->format('Y-m-d H:i:s') : null,
+                    'date_expire' => $date_expire ? $date_expire->format('Y-m-d H:i:s') : null,
+                ];
+
+                // get information changelog
+                $insurance['changelog'] = $iobj->getMetadata()['changes'] ?? [];
+            }
+
+            $row['latest_insurance'] = $insurance;
+        }
+
+        return $row;
+    }
 
     protected function checkVehicleRequirements(Request $req)
     {

src/Controller/InsuranceController.php

@@ -2,22 +2,128 @@
 
 namespace App\Controller;
 
+use App\Ramcar\InsuranceApplicationStatus;
+use App\Service\FCMSender;
+use App\Service\InsuranceConnector;
+use App\Entity\InsuranceApplication;
 use Doctrine\ORM\EntityManagerInterface;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
+use DateTime;
+
 class InsuranceController extends Controller
 {
-    public function listen(Request $req, EntityManagerInterface $em)
+    protected $ic;
+    protected $em;
+    protected $fcmclient;
+
+    public function __construct(InsuranceConnector $ic, EntityManagerInterface $em, FCMSender $fcmclient)
+    {
+        $this->ic = $ic;
+        $this->em = $em;
+        $this->fcmclient = $fcmclient;
+    }
+
+    public function listen(Request $req)
     {
         $payload = $req->request->all();
-        error_log(print_r($payload, true));
+
+        // log this callback
+        $this->ic->log('CALLBACK', "[]", json_encode($payload), 'callback');
+
+        // if no transaction code given, silently fail
+        if (empty($payload['transaction_code'])) {
+            error_log("Invalid insurance callback received: " . print_r($payload, true));
+
+            return $this->json([
+                'success' => true,
+            ]);
+        }
+
+        // get event type and process accordingly
+        $event_name = $payload['transaction_code'];
+
+        switch ($event_name) {
+            case 'GR002':
+                return $this->handleAuthenticated($payload);
+                break;
+            case 'GR003':
+                return $this->handleUpdateMade($payload);
+                break;
+            default:
+                break;
+        }
 
         return $this->json([
             'success' => true,
             'payload' => $payload,
         ]);
     }
+
+    protected function handleAuthenticated($payload)
+    {
+        $obj = $this->getApplication($payload['id']);
+        $now = new DateTime();
+        $expiry = DateTime::createFromFormat("Y-m-d", $payload['expiry_date']);
+
+        if (!empty($obj)) {
+            // mark as completed
+            $obj->setStatus(InsuranceApplicationStatus::COMPLETED);
+            $obj->setDateComplete($now);
+            $obj->setDateExpire($expiry);
+            $obj->setCOC($payload['coc_url']);
+            $this->em->flush();
+
+            // send notification
+            $this->fcmclient->sendEvent($obj->getCustomer(), "insurance_fcm_title_completed", "insurance_fcm_body_completed", [
+                'cv_id' => $obj->getCustomerVehicle()->getID(),
+            ]);
+        }
+
+        return $this->json([
+            'success' => true,
+        ]);
+    }
+
+    protected function handleUpdateMade($payload)
+    {
+        $obj = $this->getApplication($payload['id']);
+
+        if (!empty($obj)) {
+            $metadata = $obj->getMetadata();
+
+            // initialize change list if not present
+            if (empty($metadata['changes'])) {
+                $metadata['changes'] = [];
+            }
+
+            $now = new DateTime;
+            $metadata['changes'][$now->format('Y-m-d H:i:s')] = $payload['data'];
+
+            // update metadata to record change
+            $obj->setMetadata($metadata);
+            $this->em->flush();
+
+            // send notification
+            $this->fcmclient->sendEvent($obj->getCustomer(), "insurance_fcm_title_updated", "insurance_fcm_body_updated", [
+                'cv_id' => $obj->getCustomerVehicle()->getID(),
+            ]);
+        }
+
+        return $this->json([
+            'success' => true,
+        ]);
+    }
+
+    protected function getApplication($transaction_id)
+    {
+        $result = $this->em->getRepository(InsuranceApplication::class)->findBy([
+            'ext_transaction_id' => $transaction_id,
+        ], [], 1);
+
+        return !empty($result) ? $result[0] : false;
+    }
 }

src/Controller/ItemPricingController.php

@@ -0,0 +1,269 @@
+<?php
+
+namespace App\Controller;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+use App\Entity\PriceTier;
+use App\Entity\Battery;
+use App\Entity\ServiceOffering;
+use App\Entity\ItemType;
+use App\Entity\ItemPrice;
+
+class ItemPricingController extends Controller
+{
+    /**
+     * @Menu(selected="item_pricing")
+     * @IsGranted("item_pricing.update")
+     */
+    public function index (EntityManagerInterface $em)
+    {
+        // get all the price tiers
+        $price_tiers = $em->getRepository(PriceTier::class)->findAll();
+
+        // get all item types
+        $item_types = $em->getRepository(ItemType::class)->findBy([], ['name' => 'asc']);
+
+        // get all the items/batteries
+        // load only batteries upon initial loading
+        $items = $this->getBatteries($em);
+
+        // set the default item type to battery
+        $default_it = $em->getRepository(ItemType::class)->findOneBy(['code' => 'battery']);
+
+        $params = [
+            'sets' => [
+                'price_tiers' => $price_tiers,
+                'item_types' => $item_types,
+            ],
+            'items' => $items,
+            'default_item_type_id' => $default_it->getID(),
+        ];
+
+        return $this->render('item-pricing/form.html.twig', $params);
+    }
+
+    /**
+     * @Menu(selected="item_pricing")
+     * @IsGranted("item_pricing.update")
+     */
+    public function formSubmit(Request $req, EntityManagerInterface $em)
+    {
+        $pt_id = $req->request->get('price_tier_id');
+        $it_id = $req->request->get('item_type_id');
+        $prices = $req->request->get('price');
+
+        // get the item type
+        $item_type = $em->getRepository(ItemType::class)->find($it_id);
+
+        if ($item_type->getCode() == 'battery')
+        {
+            // get batteries
+            $items = $em->getRepository(Battery::class)->findBy(['flag_active' => true], ['id' => 'asc']);
+        }
+        else
+        {
+            // get service offerings
+            $items = $em->getRepository(ServiceOffering::class)->findBy([], ['id' => 'asc']);
+        }
+
+        // on default price tier
+        if ($pt_id == 0)
+        {
+            // default price tier, update battery or service offering, depending on item type
+            // NOTE: battery and service offering prices or fees are stored as decimal.
+            foreach ($items as $item)
+            {
+                $item_id = $item->getID();
+                if (isset($prices[$item_id]))
+                {
+                    // check item type
+                    if ($item_type->getCode() == 'battery')
+                        $item->setSellingPrice($prices[$item_id]);
+                    else
+                        $item->setFee($prices[$item_id]);
+                }
+            }
+        }
+        else
+        {
+            // get the price tier
+            $price_tier = $em->getRepository(PriceTier::class)->find($pt_id);
+
+            $item_prices = $price_tier->getItemPrices();
+
+            // clear the tier's item prices for the specific item type
+            foreach ($item_prices as $ip)
+            {
+                if ($ip->getItemType() == $item_type)
+                    $em->remove($ip);
+            }
+
+            // update the tier's item prices
+            foreach ($items as $item)
+            {
+                $item_id = $item->getID();
+
+                $item_price = new ItemPrice();
+
+                $item_price->setItemType($item_type)
+                    ->setPriceTier($price_tier)
+                    ->setItemID($item_id);
+
+                if (isset($prices[$item_id]))
+                {
+                    $item_price->setPrice($prices[$item_id] * 100);
+                }
+                else
+                {
+                    $item_price->setPrice($item->getPrice() * 100);
+                }
+
+                // save
+                $em->persist($item_price);
+            } 
+        }
+
+        $em->flush();
+
+        return $this->redirectToRoute('item_pricing');
+    }
+
+    /**
+     * @IsGranted("item_pricing.update")
+     */
+    public function itemPrices(EntityManagerInterface $em, $pt_id, $it_id)
+    {
+        $pt_prices = [];
+
+        // get the item type
+        $it = $em->getRepository(ItemType::class)->find($it_id);
+
+        // check if default prices are needed
+        if ($pt_id != 0)
+        {
+            // get the price tier
+            $pt = $em->getRepository(PriceTier::class)->find($pt_id);
+
+            // get the items under the price tier
+            $pt_items = $pt->getItemPrices();
+
+            foreach ($pt_items as $pt_item)
+            {
+                // make item price hash
+                $pt_prices[$pt_item->getItemID()] = $pt_item->getPrice();
+            }
+        }
+
+        // get the prices from battery or service offering, depending on item type
+        if ($it->getCode() == 'battery')
+        {
+            // get batteries
+            $items = $em->getRepository(Battery::class)->findBy(['flag_active' => true], ['id' => 'asc']);
+        }
+        else
+        {
+            // get service offerings
+            $items = $em->getRepository(ServiceOffering::class)->findBy([], ['id' => 'asc']);
+        }
+
+        $data_items = [];
+        foreach ($items as $item)
+        {
+            $item_id = $item->getID();
+
+            // get default price
+            if ($it->getCode() == 'battery')
+            {
+                $price = $item->getSellingPrice();
+                $name = $item->getModel()->getName() . ' ' . $item->getSize()->getName();
+            }
+            else
+            {
+                $price = $item->getFee();
+                $name = $item->getName();
+            }
+
+            // check if tier has price for item
+            if (isset($pt_prices[$item_id]))
+            {
+                $pt_price = $pt_prices[$item_id];
+
+                // actual price
+                $price = number_format($pt_price / 100, 2, '.', '');
+            }
+
+            $actual_price = $price;
+
+            $data_items[] = [
+                'id' => $item_id,
+                'name' => $name,
+                'item_type_id' => $it->getID(),
+                'item_type' => $it->getName(),
+                'price' => $actual_price,
+            ];
+        }
+
+        // response
+        return new JsonResponse([
+            'items' => $data_items,
+        ]);
+    }
+
+    protected function getBatteries(EntityManagerInterface $em)
+    {
+        // get the item type for battery
+        $batt_item_type = $em->getRepository(ItemType::class)->findOneBy(['code' => 'battery']);
+
+        // get all active batteries
+        $batts = $em->getRepository(Battery::class)->findBy(['flag_active' => true], ['id' => 'asc']);
+        foreach ($batts as $batt)
+        {
+            $batt_set[$batt->getID()] = [
+                'name' => $batt->getModel()->getName() . ' ' . $batt->getSize()->getName(),
+                'item_type_id' => $batt_item_type->getID(),
+                'item_type' => $batt_item_type->getName(),
+                'price' => $batt->getSellingPrice(),
+            ];
+        }
+
+        return [
+            'items' => $batt_set,
+        ];
+    }
+
+    protected function getServiceOfferings(EntityeManagerInterface $em)
+    {
+        // get the item type for service offering
+        $service_item_type = $em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+
+        // get all service offerings
+        $services = $em->getRepository(ServiceOffering::class)->findBy([], ['id' => 'asc']);
+        $service_set = [];
+        foreach ($services as $service)
+        {
+            $service_set[$service->getID()] = [
+                'name' => $service->getName(),
+                'item_type_id' => $service_item_type->getID(),
+                'item_type' => $service_item_type->getName(),
+                'price' => $service->getFee(),
+            ];
+        }
+
+        return [
+            'items' => $service_set,
+        ];
+    }
+}

src/Controller/ItemTypeController.php

@@ -0,0 +1,251 @@
+<?php
+
+namespace App\Controller;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
+
+use App\Entity\ItemType;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+class ItemTypeController extends Controller
+{
+    /**
+     * @Menu(selected="item_type_list")
+     * @IsGranted("item_type.list")
+     */
+    public function index ()
+    {
+        return $this->render('item-type/list.html.twig');
+    }
+
+    /**
+     * @IsGranted("item_type.list")
+     */
+    public function datatableRows(Request $req)
+    {
+        // get query builder
+        $qb = $this->getDoctrine()
+                ->getRepository(ItemType::class)
+                ->createQueryBuilder('q');
+
+        // get datatable params
+        $datatable = $req->request->get('datatable');
+
+        // count total records
+        $tquery = $qb->select('COUNT(q)');
+        $this->setQueryFilters($datatable, $tquery);
+        $total = $tquery->getQuery()
+            ->getSingleScalarResult();
+
+        // get current page number
+        $page = $datatable['pagination']['page'] ?? 1;
+
+        $perpage = $datatable['pagination']['perpage'];
+        $offset = ($page - 1) * $perpage;
+
+        // add metadata
+        $meta = [
+            'page' => $page,
+            'perpage' => $perpage,
+            'pages' => ceil($total / $perpage),
+            'total' => $total,
+            'sort' => 'asc',
+            'field' => 'id'
+        ];
+
+        // build query
+        $query = $qb->select('q');
+        $this->setQueryFilters($datatable, $query);
+
+        // check if sorting is present, otherwise use default
+        if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
+            $order = $datatable['sort']['sort'] ?? 'asc';
+            $query->orderBy('q.' . $datatable['sort']['field'], $order);
+        } else {
+            $query->orderBy('q.id', 'asc');
+        }
+
+        // get rows for this page
+        $obj_rows = $query->setFirstResult($offset)
+            ->setMaxResults($perpage)
+            ->getQuery()
+            ->getResult();
+
+        // process rows
+        $rows = [];
+        foreach ($obj_rows as $orow) {
+            // add row data
+            $row['id'] = $orow->getID();
+            $row['name'] = $orow->getName();
+
+            // add row metadata
+            $row['meta'] = [
+                'update_url' => '',
+                'delete_url' => ''
+            ];
+
+            // add crud urls
+            if ($this->isGranted('item_type.update'))
+                $row['meta']['update_url'] = $this->generateUrl('item_type_update_form', ['id' => $row['id']]);
+            if ($this->isGranted('item_type.delete'))
+                $row['meta']['delete_url'] = $this->generateUrl('item_type_delete', ['id' => $row['id']]);
+
+            $rows[] = $row;
+        }
+
+        // response
+        return $this->json([
+            'meta' => $meta,
+            'data' => $rows
+        ]);
+    }
+
+    /**
+     * @Menu(selected="item_type.list")
+     * @IsGranted("item_type.add")
+     */
+    public function addForm()
+    {
+        $item_type = new ItemType();
+        $params = [
+            'obj' => $item_type,
+            'mode' => 'create',
+        ];
+
+        // response
+        return $this->render('item-type/form.html.twig', $params);
+    }
+
+    /**
+     * @IsGranted("item_type.add")
+     */
+    public function addSubmit(Request $req, EntityManagerInterface $em, ValidatorInterface $validator)
+    {
+        $item_type = new ItemType();
+
+        $this->setObject($item_type, $req);
+
+        // validate
+        $errors = $validator->validate($item_type);
+
+        // initialize error list
+        $error_array = [];
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        }
+
+        // validated! save the entity
+        $em->persist($item_type);
+        $em->flush();
+
+        // return successful response
+        return $this->json([
+            'success' => 'Changes have been saved!'
+        ]);
+    }
+
+    /**
+     * @Menu(selected="item_type_list")
+     * @ParamConverter("item_type", class="App\Entity\ItemType")
+     * @IsGranted("item_type.update")
+     */
+    public function updateForm($id, EntityManagerInterface $em, ItemType $item_type)
+    {
+        $params = [];
+        $params['obj'] = $item_type;
+        $params['mode'] = 'update';
+
+        // response
+        return $this->render('item-type/form.html.twig', $params);
+    }
+
+    /**
+     * @ParamConverter("item_type", class="App\Entity\ItemType")
+     * @IsGranted("item_type.update")
+     */
+    public function updateSubmit(Request $req, EntityManagerInterface $em, ValidatorInterface $validator, ItemType $item_type)
+    {
+        $this->setObject($item_type, $req);
+
+        // validate
+        $errors = $validator->validate($item_type);
+
+        // initialize error list
+        $error_array = [];
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        }
+
+        // validated! save the entity
+        $em->flush();
+
+        // return successful response
+        return $this->json([
+            'success' => 'Changes have been saved!'
+        ]);
+    }
+
+    /**
+     * @ParamConverter("item_type", class="App\Entity\ItemType")
+     * @IsGranted("item_type.delete")
+     */
+    public function deleteSubmit(EntityManagerInterface $em, ItemType $item_type)
+    {
+        // delete this object
+        $em->remove($item_type);
+        $em->flush();
+
+        // response
+        $response = new Response();
+        $response->setStatusCode(Response::HTTP_OK);
+        $response->send();
+    }
+
+
+    protected function setObject(ItemType $obj, Request $req)
+    {
+        // set and save values
+        $obj->setName($req->request->get('name'))
+            ->setCode($req->request->get('code'));
+    }
+
+    protected function setQueryFilters($datatable, QueryBuilder $query)
+    {
+        if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
+            $query->where('q.name LIKE :filter')
+                ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
+        }
+    }
+}

src/Controller/JobOrderController.php

@@ -7,6 +7,7 @@ use App\Ramcar\InvoiceCriteria;
 use App\Ramcar\CMBServiceType;
 use App\Ramcar\ServiceType;
 use App\Ramcar\JOCancelReasons;
+use App\Ramcar\TransactionOrigin;
 
 use App\Entity\CustomerVehicle;
 use App\Entity\Promo;
@@ -29,6 +30,7 @@ use App\Service\HubSelector;
 
 use App\Service\RiderTracker;
 use App\Service\MotivConnector;
+use App\Service\PriceTierManager;
 
 use App\Service\GeofenceTracker;
 use Symfony\Component\HttpFoundation\Request;
@@ -41,6 +43,8 @@ use Doctrine\ORM\EntityManagerInterface;
 
 use Catalyst\MenuBundle\Annotation\Menu;
 
+use CrEOF\Spatial\PHP\Types\Geometry\Point;
+
 class JobOrderController extends Controller
 {
     public function getJobOrders(Request $req, JobOrderHandlerInterface $jo_handler)
@@ -299,6 +303,7 @@ class JobOrderController extends Controller
                 $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['id' => $jo_id]);
                 $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]);
                 $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]);
+                $rows[$key]['meta']['view_url'] = $this->generateUrl('jo_all_view_form',['id' => $jo_id]);
             }
             
             if ($tier_params['unlock_route'] != '')
@@ -657,6 +662,32 @@ class JobOrderController extends Controller
         // response
         return $this->render($template, $params);
     }
+
+    /**
+     * @Menu(selected="jo_all")
+     */
+    public function allViewForm($id, JobOrderHandlerInterface $jo_handler,
+                            GISManagerInterface $gis, EntityManagerInterface $em)
+    {
+        $this->denyAccessUnlessGranted('jo_all.list', null, 'No access.');
+
+        try
+        {
+            $params = $jo_handler->initializeAllViewForm($id);
+        }
+        catch (NotFoundHttpException $e)
+        {
+            throw $this->createNotFoundException($e->getMessage());
+        }
+
+        $params['return_url'] = $this->generateUrl('jo_all');
+        $params['map_js_file'] = $gis->getJSJOFile();
+
+        $template = $params['template'];
+
+        // response
+        return $this->render($template, $params);
+    }
     
 
     public function pdfForm(Request $req, $id, JobOrderHandlerInterface $jo_handler)
@@ -713,7 +744,7 @@ class JobOrderController extends Controller
 
     }
 
-    public function generateInvoice(Request $req, InvoiceGeneratorInterface $ic)
+    public function generateInvoice(Request $req, InvoiceGeneratorInterface $ic, PriceTierManager $pt_manager)
     {
         // error_log('generating invoice...');
         $error = false;
@@ -723,6 +754,21 @@ class JobOrderController extends Controller
         $promo_id = $req->request->get('promo');
         $cvid = $req->request->get('cvid');
         $service_charges = $req->request->get('service_charges', []);
+        $flag_coolant = $req->request->get('flag_coolant', false);
+        $flag_sealant = $req->request->get('flag_sealant', false);
+
+        // coordinates
+        // need to check if lng and lat are set
+        $lng = $req->request->get('coord_lng', 0);
+        $lat = $req->request->get('coord_lat', 0);
+
+        $price_tier = 0;
+        if (!empty($lng) && !empty($lat))
+        {
+            $coordinates = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
+            $price_tier = $pt_manager->getPriceTier($coordinates);
+        }
+
 
         $em = $this->getDoctrine()->getManager();
 
@@ -738,8 +784,11 @@ class JobOrderController extends Controller
         $criteria = new InvoiceCriteria();
         $criteria->setServiceType($stype)
             ->setCustomerVehicle($cv)
-            ->setIsTaxable();
-
+            ->setIsTaxable()
+            ->setSource(TransactionOrigin::CALL)
+            ->setPriceTier($price_tier)
+            ->setHasCoolant($flag_coolant)
+            ->setHasSealant($flag_sealant);
 
         /*
         // if it's a jumpstart or troubleshoot only, we know what to charge already

src/Controller/PayMongoController.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Controller;
+
+use App\Entity\GatewayTransaction;
+use App\Ramcar\TransactionStatus;
+use App\Service\PayMongoConnector;
+use Doctrine\ORM\EntityManagerInterface;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use DateTime;
+
+class PayMongoController extends Controller
+{
+    protected $pm;
+    protected $em;
+
+    public function __construct(PayMongoConnector $pm, EntityManagerInterface $em)
+    {
+        $this->pm = $pm;
+        $this->em = $em;
+    }
+
+    public function listen(Request $req)
+    {
+        $payload = json_decode($req->getContent(), true);
+
+        // log this callback
+        $this->pm->log('CALLBACK', "[]", $req->getContent(), 'callback');
+
+        // if no event type given, silently fail
+        if (empty($payload['data'])) {
+            error_log("Invalid paymongo callback received: " . print_r($payload, true));
+            return $this->json([
+                'success' => true,
+            ]);
+        }
+
+        // get event type and process accordingly
+        $attr = $payload['data']['attributes'];
+        $event = $attr['data'];
+        $event_name = $attr['type'];
+
+        switch ($event_name) {
+            case "payment.paid":
+                return $this->handlePaymentPaid($event);
+            case "payment.failed":
+                return $this->handlePaymentFailed($event);
+            case "payment.refunded": // TODO: handle refunds
+            case "payment.refund.updated":
+            case "checkout_session.payment.paid":
+            default:
+                break;
+        }
+
+        return $this->json([
+            'success' => true,
+        ]);
+    }
+
+    protected function handlePaymentPaid($event)
+    {
+        $metadata = $event['attributes']['metadata'];
+        $obj = $this->getTransaction($metadata['transaction_id']);
+
+        if (!empty($obj)) {
+            // mark as paid
+            $obj->setStatus(TransactionStatus::PAID);
+            $obj->setDatePay(new DateTime());
+            $this->em->flush();
+        }
+
+        return $this->json([
+            'success' => true,
+        ]);
+    }
+
+    protected function handlePaymentFailed($event)
+    {
+        // TODO: do something about failed payments?
+        return $this->json([
+            'success' => true,
+        ]);
+    }
+
+    protected function getTransaction($id)
+    {
+        //$class_name = 'App\\Entity\\' . $type;
+        //$instance = new $class_name;
+
+        return $this->em->getRepository(GatewayTransaction::class)->find($id);
+    }
+
+    public function paymentSuccess(Request $req)
+    {
+        return $this->render('paymongo/success.html.twig');
+    }
+
+    public function paymentCancelled(Request $req)
+    {
+        return $this->render('paymongo/cancelled.html.twig');
+    }
+}

src/Controller/PriceTierController.php

@@ -0,0 +1,355 @@
+<?php
+
+namespace App\Controller;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\EntityManagerInterface;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+use App\Entity\PriceTier;
+use App\Entity\SupportedArea;
+
+class PriceTierController extends Controller
+{
+    /**
+     * @Menu(selected="price_tier_list")
+     * @IsGranted("price_tier.list")
+     */
+    public function index()
+    {
+        return $this->render('price-tier/list.html.twig');
+    }
+
+    /**
+     * @IsGranted("price_tier.list")
+     */
+    public function datatableRows(Request $req)
+    {
+        // get query builder
+        $qb = $this->getDoctrine()
+                ->getRepository(PriceTier::class)
+                ->createQueryBuilder('q');
+
+        // get datatable params
+        $datatable = $req->request->get('datatable');
+
+        // count total records
+        $tquery = $qb->select('COUNT(q)');
+        $this->setQueryFilters($datatable, $tquery);
+        $total = $tquery->getQuery()
+            ->getSingleScalarResult();
+
+        // get current page number
+        $page = $datatable['pagination']['page'] ?? 1;
+
+        $perpage = $datatable['pagination']['perpage'];
+        $offset = ($page - 1) * $perpage;
+
+        // add metadata
+        $meta = [
+            'page' => $page,
+            'perpage' => $perpage,
+            'pages' => ceil($total / $perpage),
+            'total' => $total,
+            'sort' => 'asc',
+            'field' => 'id'
+        ];
+
+        // build query
+        $query = $qb->select('q');
+        $this->setQueryFilters($datatable, $query);
+
+        // check if sorting is present, otherwise use default
+        if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
+            $order = $datatable['sort']['sort'] ?? 'asc';
+            $query->orderBy('q.' . $datatable['sort']['field'], $order);
+        } else {
+            $query->orderBy('q.id', 'asc');
+        }
+
+        // get rows for this page
+        $obj_rows = $query->setFirstResult($offset)
+            ->setMaxResults($perpage)
+            ->getQuery()
+            ->getResult();
+
+        // process rows
+        $rows = [];
+        foreach ($obj_rows as $orow) {
+            // add row data
+            $row['id'] = $orow->getID();
+            $row['name'] = $orow->getName();
+
+            // add row metadata
+            $row['meta'] = [
+                'update_url' => '',
+                'delete_url' => ''
+            ];
+
+            // add crud urls
+            if ($this->isGranted('price_tier.update'))
+                $row['meta']['update_url'] = $this->generateUrl('price_tier_update_form', ['id' => $row['id']]);
+            if ($this->isGranted('service_offering.delete'))
+                $row['meta']['delete_url'] = $this->generateUrl('price_tier_delete', ['id' => $row['id']]);
+
+            $rows[] = $row;
+        }
+
+        // response
+        return $this->json([
+            'meta' => $meta,
+            'data' => $rows
+        ]);
+    }
+
+    /**
+     * @Menu(selected="price_tier.list")
+     * @IsGranted("price_tier.add")
+     */
+    public function addForm(EntityManagerInterface $em)
+    {
+        $pt = new PriceTier();
+
+        // get the supported areas
+        $sets = $this->generateFormSets($em);
+
+        $params = [
+            'obj' => $pt,
+            'sets' => $sets,
+            'mode' => 'create',
+        ];
+
+        // response
+        return $this->render('price-tier/form.html.twig', $params);
+    }
+
+    /**
+     * @IsGranted("price_tier.add")
+     */
+    public function addSubmit(Request $req, EntityManagerInterface $em, ValidatorInterface $validator)
+    {
+        // initialize error list
+        $error_array = [];
+
+        $pt = new PriceTier();
+
+        $error_array = $this->validateRequest($em, $req);
+
+        $this->setObject($pt, $req);
+
+        // validate
+        $errors = $validator->validate($pt);
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        }
+
+        // validated! save the entity
+        $em->persist($pt);
+
+        // set the price tier id for the selected supported areas
+        $this->updateSupportedAreas($em, $pt, $req);
+
+        $em->flush();
+
+        // return successful response
+        return $this->json([
+            'success' => 'Changes have been saved!'
+        ]);
+    }
+
+    /**
+     * @Menu(selected="price_tier_list")
+     * @ParamConverter("pt", class="App\Entity\PriceTier")
+     * @IsGranted("price_tier.update")
+     */
+    public function updateForm($id, EntityManagerInterface $em, PriceTier $pt)
+    {
+        // get the supported areas
+        $sets = $this->generateFormSets($em, $pt);
+
+        $params = [
+            'obj' => $pt,
+            'sets' => $sets,
+            'mode' => 'update',
+        ];
+
+        // response
+        return $this->render('price-tier/form.html.twig', $params);
+    }
+
+    /**
+     * @ParamConverter("pt", class="App\Entity\PriceTier")
+     * @IsGranted("price_tier.update")
+     */
+    public function updateSubmit(Request $req, EntityManagerInterface $em, ValidatorInterface $validator, PriceTier $pt)
+    {
+        // initialize error list
+        $error_array = [];
+
+        // clear supported areas of price tier
+        $this->clearPriceTierSupportedAreas($em, $pt);
+
+        $error_array = $this->validateRequest($em, $req);
+        $this->setObject($pt, $req);
+
+        // validate
+        $errors = $validator->validate($pt);
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        }
+
+        // set the price tier id for the selected supported areas
+        $this->updateSupportedAreas($em, $pt, $req);
+
+        // validated! save the entity
+        $em->flush();
+
+        // return successful response
+        return $this->json([
+            'success' => 'Changes have been saved!'
+        ]);
+    }
+
+    /**
+     * @ParamConverter("pt", class="App\Entity\PriceTier")
+     * @IsGranted("price_tier.delete")
+     */
+    public function deleteSubmit(EntityManagerInterface $em, PriceTier $pt)
+    {
+        // clear supported areas of price tier
+        $this->clearPriceTierSupportedAreas($em, $pt);
+
+        // delete this object
+        $em->remove($pt);
+        $em->flush();
+
+        // response
+        $response = new Response();
+        $response->setStatusCode(Response::HTTP_OK);
+        $response->send();
+    }
+
+    protected function validateRequest(EntityManagerInterface $em, Request $req)
+    {
+        // get areas
+        $areas = $req->request->get('areas');
+
+        // check if no areas selected aka empty
+        if (!empty($areas))
+        {
+            foreach ($areas as $area_id)
+            {
+                $supported_area = $em->getRepository(SupportedArea::class)->find($area_id);
+
+                if ($supported_area == null)
+                    return ['areas' => 'Invalid area'];
+
+                // check if supported area already belongs to a price tier
+                if ($supported_area->getPriceTier() != null)
+                    return ['areas' => 'Area already belongs to a price tier.'];
+            }
+        }
+
+        return null;
+    }
+
+    protected function setObject(PriceTier $obj, Request $req)
+    {
+        // clear supported areas first
+        $obj->clearSupportedAreas();
+
+        $obj->setName($req->request->get('name'));
+    }
+
+    protected function clearPriceTierSupportedAreas(EntityManagerInterface $em, PriceTier $obj)
+    {
+        // find the supported areas set with the price tier
+        $areas = $em->getRepository(SupportedArea::class)->findBy(['price_tier' => $obj]);
+
+        if (!empty($areas))
+        {
+            // set the price tier id for the supported areas to null
+            foreach ($areas as $area)
+            {
+                $area->setPriceTier(null);
+            }
+
+            $em->flush();
+        }
+    }
+
+    protected function updateSupportedAreas(EntityManagerInterface $em, PriceTier $obj, Request $req)
+    {
+        // get the selected areas
+        $areas = $req->request->get('areas');
+
+        // check if no areas selected aka empty
+        if (!empty($areas))
+        {
+            foreach ($areas as $area_id)
+            {
+                // get supported area
+                $supported_area = $em->getRepository(SupportedArea::class)->find($area_id);
+
+                if ($supported_area != null)
+                    $supported_area->setPriceTier($obj);
+            }
+        }
+    }
+
+    protected function generateFormSets(EntityManagerInterface $em, PriceTier $pt = null)
+    {
+        // get the supported areas with no price tier id or price tier id is set to the one that is being updated
+        $areas = $em->getRepository(SupportedArea::class)->findBy(['price_tier' => array(null, $pt)]);
+        $areas_set = [];
+        foreach ($areas as $area)
+        {
+            $areas_set[$area->getID()] = $area->getName();
+        }
+
+        return [
+            'areas' => $areas_set
+        ];
+    }
+
+    protected function setQueryFilters($datatable, QueryBuilder $query)
+    {
+        if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
+            $query->where('q.name LIKE :filter')
+                ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
+        }
+    }
+}

src/Controller/ReportController.php

@@ -236,6 +236,10 @@ class ReportController extends Controller
 
             $reason = $jor->getReason();
 
+            $dispatched_by = 'system';
+            if ($jor->getUser() != null)
+                $dispatched_by = $jor->getUser()->getFullName();
+
             $res[] = [
                $jo->getID(),
                $jo->getDateSchedule()->format('m/d/Y H:i'),
@@ -244,7 +248,7 @@ class ReportController extends Controller
                JORejectionReason::getName($jor->getReason()),
                $jor->getContactPerson(),
                $jor->getRemarks(),
-               $jor->getUser()->getFullName(),
+               !empty($jor->getUser()) ? $jor->getUser()->getFullName() : "",
                ServiceType::getName($jo->getServiceType()),
             ];
         }
@@ -536,7 +540,7 @@ class ReportController extends Controller
                 'Mobile Number',
                 'Landline Number',
                 'Office Number',
-                'Fax Number',
+                'Alternative Phone Number',
                 'Plate Number',
                 'Date Mobile App Downloaded',
                 'Mobile Number Using Mobile App',
@@ -706,7 +710,7 @@ class ReportController extends Controller
                 'Customer Mobile Phone',
                 'Customer Landline Phone',
                 'Customer Office Phone',
-                'Customer Fax Phone',
+                'Customer Alternative Phone',
                 'Customer Email Address',
                 'Customer Notes',
                 'Customer Has Third Party Privacy Policy?',
@@ -813,6 +817,7 @@ class ReportController extends Controller
                 'Plate Number',
                 'SKU',
                 'Serial Number',
+                'Inventory',
                 'Invoice/DR No.',
                 'Existing Battery',
                 'Rider Name',
@@ -1141,7 +1146,7 @@ class ReportController extends Controller
                 'Mobile Phone',
                 'Landline',
                 'Office Phone',
-                'Fax',
+                'Alternative Phone',
                 'Email Address',
                 'Vehicle Manufacturer',
                 'Vehicle Make',
@@ -1932,6 +1937,9 @@ class ReportController extends Controller
                 $fac_hub_coord_lat = $fac_hub->getCoordinates()->getLatitude();
             }
 
+            // get inventory count
+            $inventory = $jo->getInventoryCount();
+
             // find date and time when JO was assigned a hub
             $datetime_hub_assign_jo = '';
             $date_hub_assign_jo = '';
@@ -2254,6 +2262,7 @@ class ReportController extends Controller
                 $plate_number,
                 $sku,
                 $serial,
+                $inventory,
                 $jo->getORName(),
                 $existing_batt,
                 $rider_name,

src/Controller/ResqJobOrderController.php

@@ -14,6 +14,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Catalyst\MenuBundle\Annotation\Menu;
 
 use App\Entity\JobOrder;
+use App\Entity\Rider;
 
 use App\Service\JobOrderHandlerInterface;
 
@@ -22,6 +23,9 @@ use App\Ramcar\JOStatus;
 use App\Ramcar\ServiceType;
 use App\Ramcar\WillingToWaitContent;
 use App\Ramcar\CustomerClassification;
+use App\Ramcar\CustomerNotWaitReason;
+
+use DateTime;
 
 class ResqJobOrderController extends Controller
 {
@@ -39,7 +43,7 @@ class ResqJobOrderController extends Controller
     /**
      * @IsGranted("jo_resq_proc.list")
      */
-    public function datatableRows(Request $req, JobOrderHandlerInterface $jo_handler)
+    public function datatableRows(EntityManagerInterface $em, Request $req, $tier, JobOrderHandlerInterface $jo_handler)
     {
         // get query builder
         $qb = $this->getDoctrine()
@@ -52,7 +56,14 @@ class ResqJobOrderController extends Controller
         // count total records
         $tquery = $qb->select('COUNT(q)');
 
-        $this->setQueryFilters($datatable, $tquery, $qb, JOStatus::PENDING, TransactionOrigin::MOBILE_APP);
+        // right now, tier is either proc or all
+        if ($tier == 'proc')
+            $this->setQueryFilters($datatable, $tquery, $qb, $tier);
+        else
+        {
+            // default to all
+            $this->setQueryFilters($datatable, $tquery, $qb, $tier);
+        }
 
         $total = $tquery->getQuery()
             ->getSingleScalarResult();
@@ -74,9 +85,17 @@ class ResqJobOrderController extends Controller
         ];
 
         // build query
+        $qb = $em->getRepository(JobOrder::class)
+            ->createQueryBuilder('q');
         $query = $qb->select('q');
 
-        $this->setQueryFilters($datatable, $query, $qb, JOStatus::PENDING, TransactionOrigin::MOBILE_APP);
+        if ($tier == 'proc')
+            $this->setQueryFilters($datatable, $query, $qb, $tier);
+        else
+        {
+            // default to all
+            $this->setQueryFilters($datatable, $query, $qb, $tier);
+        }
 
         // check if sorting is present, otherwise use default
         if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
@@ -110,7 +129,13 @@ class ResqJobOrderController extends Controller
             // check if customer is not willing to wait
             $will_not_wait = $orow->getWillWait();
             if ($will_not_wait == WillingToWaitContent::NOT_WILLING_TO_WAIT)
-                $is_emergency = true;
+            {
+                // check if reason is emergency or rush
+                $reason = $orow->getReasonNotWait();
+                if (($reason == CustomerNotWaitReason::EMERGENCY) ||
+                    ($reason == CustomerNotWaitReason::RUSH_REQUEST))
+                    $is_emergency = true;
+            }
 
             // add row data
             $row['id'] = $orow->getID();
@@ -125,6 +150,9 @@ class ResqJobOrderController extends Controller
             $row['is_mobile'] = $orow->getSource() == TransactionOrigin::MOBILE_APP;
             $row['is_vip'] = $is_vip;
             $row['is_emergency'] = $is_emergency;
+            $row['flag_cust_new'] = $orow->isCustNew();
+            $row['date_assign'] = !empty($orow->getDateAssign()) ? $orow->getDateAssign()->format("c") : null;
+            $row['date_fulfill'] = !empty($orow->getDateFulfill()) ? $orow->getDateFulfill()->format("c") : null;
 
             $processor = $orow->getProcessedBy();
             if ($processor == null)
@@ -132,11 +160,28 @@ class ResqJobOrderController extends Controller
             else
                 $row['processor'] = $orow->getProcessedBy()->getFullName();
 
+            // get the assigned hub, if any
+            $assigned_hub = $orow->getHub();
+            if ($assigned_hub ==  null)
+                $row['assigned_hub'] = '';
+            else
+                $row['assigned_hub'] = $orow->getHub()->getName();
+
             // add the items for Actions
             $jo_id = $orow->getID();
 
-            $row['meta']['update_url'] = $this->generateUrl('jo_proc_form', ['id' => $jo_id, 'origin' => 'resq']);
-            $row['meta']['unlock_url'] = $this->generateUrl('jo_proc_unlock', ['id' => $jo_id, 'origin' => 'resq']);
+            if ($tier == 'proc')
+            {
+                $row['meta']['update_url'] = $this->generateUrl('jo_proc_form', ['id' => $jo_id, 'origin' => 'resq']);
+                $row['meta']['unlock_url'] = $this->generateUrl('jo_proc_unlock', ['id' => $jo_id, 'origin' => 'resq']);
+            }
+            else
+            {
+                // default to all
+                $row['meta']['update_url'] = $this->generateUrl('jo_all_form', ['id' => $jo_id, 'origin' => 'resq']);
+                $row['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id, 'origin' => 'resq']);
+                $row['meta']['view_url'] = $this->generateUrl('jo_all_view_form',['id' => $jo_id, 'origin' => 'resq']);
+            }
 
             $rows[] = $row;
         }
@@ -148,11 +193,77 @@ class ResqJobOrderController extends Controller
         ]);
     }
 
-    protected function setQueryFilters($datatable, &$query, $qb, $status, $source)
+    /**
+     * @Menu(selected="jo_resq_all")
+     * @IsGranted("jo_resq_all.list")
+     */
+    public function listAll(EntityManagerInterface $em)
     {
-        $query->where('q.status = :status')
-            ->andWhere('q.source = :source')
-            ->setParameter('status', $status)
-            ->setParameter('source', $source);
+        $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
+
+        // get riders for dropdown
+        $params['riders'] = $em->getRepository(Rider::class)->findAll();
+
+        return $this->render('resq-job-order/list.all.html.twig', $params);
+    }
+
+    protected function setQueryFilters($datatable, &$query, $qb, $tier)
+    {
+        switch ($tier)
+        {
+            case 'proc':
+                $query->where('q.status = :status')
+                    ->andWhere('q.source = :source')
+                    ->setParameter('status', JOStatus::PENDING)
+                    ->setParameter('source', TransactionOrigin::MOBILE_APP);
+
+                if (isset($datatable['query']['data-rows-search']))
+                {
+                    $query->andWhere('q.plate_number like :filter')
+                        ->orWhere('q.phone_mobile like :filter')
+                        ->orWhere('q.first_name like :filter')
+                        ->orWhere('q.last_name like :filter')
+                        ->setParameter('filter', $datatable['query']['data-rows-search'] . '%');
+                }
+
+                break;
+            case 'all':
+                if (isset($datatable['query']['data-rows-search']))
+                {
+                    $query->andWhere('q.plate_number like :filter')
+                        ->orWhere('q.phone_mobile like :filter')
+                        ->orWhere('q.first_name like :filter')
+                        ->orWhere('q.last_name like :filter')
+                        ->setParameter('filter', $datatable['query']['data-rows-search'] . '%');
+                }
+                if (isset($datatable['query']['rider']))
+                {
+                    $query->innerJoin('q.rider', 'r')
+                        ->andWhere('r.id = :rider_id')
+                        ->setParameter('rider_id', $datatable['query']['rider']);
+                }
+                if (isset($datatable['query']['schedule_date']))
+                {
+                    $start = $datatable['query']['schedule_date'][0] . ' ' . '00:00:00';
+                    $end = $datatable['query']['schedule_date'][1] . ' ' . '23:59:00';
+
+                    $date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start);
+                    $date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end);
+
+                    $query->andWhere('q.date_schedule >= :date_start')
+                        ->andWhere('q.date_schedule <= :date_end')
+                        ->setParameter('date_start', $date_start)
+                        ->setParameter('date_end', $date_end);
+                }
+
+                $query->andWhere('q.source = :source')
+                    ->setParameter('source', TransactionOrigin::MOBILE_APP);
+                
+                break;
+            default:
+                $query->where('q.source = :source')
+                    ->setParameter('source', TransactionOrigin::MOBILE_APP);
+                break; 
+        }
     }
 }

src/Controller/ServiceOfferingController.php

@@ -0,0 +1,252 @@
+<?php
+
+namespace App\Controller;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+use App\Entity\ServiceOffering;
+
+class ServiceOfferingController extends Controller
+{
+    /**
+     * @Menu(selected="service_offering_list")
+     * @IsGranted("service_offering.list")
+     */
+    public function index()
+    {
+        return $this->render('service-offering/list.html.twig');
+    }
+
+    /**
+     * @IsGranted("service_offering.list")
+     */
+    public function datatableRows(Request $req)
+    {
+        // get query builder
+        $qb = $this->getDoctrine()
+                ->getRepository(ServiceOffering::class)
+                ->createQueryBuilder('q');
+
+        // get datatable params
+        $datatable = $req->request->get('datatable');
+
+        // count total records
+        $tquery = $qb->select('COUNT(q)');
+        $this->setQueryFilters($datatable, $tquery);
+        $total = $tquery->getQuery()
+            ->getSingleScalarResult();
+
+        // get current page number
+        $page = $datatable['pagination']['page'] ?? 1;
+
+        $perpage = $datatable['pagination']['perpage'];
+        $offset = ($page - 1) * $perpage;
+
+        // add metadata
+        $meta = [
+            'page' => $page,
+            'perpage' => $perpage,
+            'pages' => ceil($total / $perpage),
+            'total' => $total,
+            'sort' => 'asc',
+            'field' => 'id'
+        ];
+
+        // build query
+        $query = $qb->select('q');
+        $this->setQueryFilters($datatable, $query);
+
+        // check if sorting is present, otherwise use default
+        if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
+            $order = $datatable['sort']['sort'] ?? 'asc';
+            $query->orderBy('q.' . $datatable['sort']['field'], $order);
+        } else {
+            $query->orderBy('q.id', 'asc');
+        }
+
+        // get rows for this page
+        $obj_rows = $query->setFirstResult($offset)
+            ->setMaxResults($perpage)
+            ->getQuery()
+            ->getResult();
+
+        // process rows
+        $rows = [];
+        foreach ($obj_rows as $orow) {
+            // add row data
+            $row['id'] = $orow->getID();
+            $row['name'] = $orow->getName();
+            $row['fee'] = $orow->getFee();
+
+            // add row metadata
+            $row['meta'] = [
+                'update_url' => '',
+                'delete_url' => ''
+            ];
+
+            // add crud urls
+            if ($this->isGranted('service_offering.update'))
+                $row['meta']['update_url'] = $this->generateUrl('service_offering_update_form', ['id' => $row['id']]);
+            if ($this->isGranted('service_offering.delete'))
+                $row['meta']['delete_url'] = $this->generateUrl('service_offering_delete', ['id' => $row['id']]);
+
+            $rows[] = $row;
+        }
+
+        // response
+        return $this->json([
+            'meta' => $meta,
+            'data' => $rows
+        ]);
+    }
+
+    /**
+     * @Menu(selected="service_offering.list")
+     * @IsGranted("service_offering.add")
+     */
+    public function addForm()
+    {
+        $service_offering = new ServiceOffering();
+        $params = [
+            'service_offering' => $service_offering,
+            'mode' => 'create',
+        ];
+
+        // response
+        return $this->render('service-offering/form.html.twig', $params);
+    }
+
+    /**
+     * @IsGranted("service_offering.add")
+     */
+    public function addSubmit(Request $req, EntityManagerInterface $em, ValidatorInterface $validator)
+    {
+        $service_offering = new ServiceOffering();
+
+        $this->setObject($service_offering, $req);
+
+        // validate
+        $errors = $validator->validate($service_offering);
+
+        // initialize error list
+        $error_array = [];
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        }
+
+        // validated! save the entity
+        $em->persist($service_offering);
+        $em->flush();
+
+        // return successful response
+        return $this->json([
+            'success' => 'Changes have been saved!'
+        ]);
+    }
+
+    /**
+     * @Menu(selected="service_offering_list")
+     * @ParamConverter("service_offering", class="App\Entity\ServiceOffering")
+     * @IsGranted("service_offering.update")
+     */
+    public function updateForm($id, EntityManagerInterface $em, ServiceOffering $service_offering)
+    {
+        $params = [];
+        $params['service_offering'] = $service_offering;
+        $params['mode'] = 'update';
+
+        // response
+        return $this->render('service-offering/form.html.twig', $params);
+    }
+
+    /**
+     * @ParamConverter("service_offering", class="App\Entity\ServiceOffering")
+     * @IsGranted("service_offering.update")
+     */
+    public function updateSubmit(Request $req, EntityManagerInterface $em, ValidatorInterface $validator, ServiceOffering $service_offering)
+    {
+        $this->setObject($service_offering, $req);
+
+        // validate
+        $errors = $validator->validate($service_offering);
+
+        // initialize error list
+        $error_array = [];
+
+        // add errors to list
+        foreach ($errors as $error) {
+            $error_array[$error->getPropertyPath()] = $error->getMessage();
+        }
+
+        // check if any errors were found
+        if (!empty($error_array)) {
+            // return validation failure response
+            return $this->json([
+                'success' => false,
+                'errors' => $error_array
+            ], 422);
+        }
+
+        // validated! save the entity
+        $em->flush();
+
+        // return successful response
+        return $this->json([
+            'success' => 'Changes have been saved!'
+        ]);
+    }
+
+    /**
+     * @ParamConverter("service_offering", class="App\Entity\ServiceOffering")
+     * @IsGranted("service_offering.delete")
+     */
+    public function deleteSubmit(EntityManagerInterface $em, ServiceOffering $service_offering)
+    {
+        // delete this object
+        $em->remove($service_offering);
+        $em->flush();
+
+        // response
+        $response = new Response();
+        $response->setStatusCode(Response::HTTP_OK);
+        $response->send();
+    }
+
+    protected function setObject(ServiceOffering $obj, Request $req)
+    {
+        // set and save values
+        $obj->setName($req->request->get('name'))
+            ->setCode($req->request->get('code'))
+            ->setFee($req->request->get('fee'));
+    }
+
+    protected function setQueryFilters($datatable, QueryBuilder $query)
+    {
+        if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
+            $query->where('q.name LIKE :filter')
+                ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
+        }
+    }
+}

src/Controller/TAPI/BatteryController.php

@@ -13,6 +13,11 @@ use Catalyst\ApiBundle\Component\Response as APIResponse;
 use App\Ramcar\APIResult;
 
 use App\Entity\Vehicle;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
+
+use CrEOF\Spatial\PHP\Types\Geometry\Point;
 
 use Catalyst\AuthBundle\Service\ACLGenerator as ACLGenerator;
 
@@ -25,7 +30,7 @@ class BatteryController extends ApiController
         $this->acl_gen = $acl_gen;
     }
 
-    public function getCompatibleBatteries(Request $req, $vid, EntityManagerInterface $em)
+    public function getCompatibleBatteries(Request $req, $vid, EntityManagerInterface $em, PriceTierManager $pt_manager)
     {
         $this->denyAccessUnlessGranted('tapi_battery_compatible.list', null, 'No access.');
 
@@ -43,13 +48,44 @@ class BatteryController extends ApiController
             return new APIResponse(false, $message);
         }
 
+        // get location from request
+        $lng = $req->request->get('longitude', '');
+        $lat = $req->request->get('latitude', '');
+
+        $batts = $vehicle->getActiveBatteries();
+        $pt_id = 0;
+        if ((!(empty($lng))) && (!(empty($lat))))
+        {
+            // get the price tier
+            $coordinates = new Point($lng, $lat);
+
+            $pt_id = $pt_manager->getPriceTier($coordinates);
+        }
+
         // batteries
         $batt_list = [];
-        // $batts = $vehicle->getBatteries();
-        $batts = $vehicle->getActiveBatteries();
         foreach ($batts as $batt)
         {
             // TODO: Add warranty_tnv to battery information
+            // check if customer location is in a price tier location
+            if ($pt_id == 0)
+                $price = $batt->getSellingPrice();
+            else
+            {
+                // get item type for battery
+                $item_type = $em->getRepository(ItemType::class)->findOneBy(['code' => 'battery']);
+                if ($item_type == null)
+                    $price = $batt->getSellingPrice();
+                else
+                {
+                    $item_type_id = $item_type->getID();
+                    $batt_id = $batt->getID();
+
+                    // find the item price given price tier id and battery id 
+                    $price = $pt_manager->getItemPrice($pt_id, $item_type_id, $batt_id);
+                }
+            }
+
             $batt_list[] = [
                 'id' => $batt->getID(),
                 'mfg_id' => $batt->getManufacturer()->getID(),
@@ -58,7 +94,7 @@ class BatteryController extends ApiController
                 'model_name' => $batt->getModel()->getName(),
                 'size_id' => $batt->getSize()->getID(),
                 'size_name' => $batt->getSize()->getName(),
-                'price' => $batt->getSellingPrice(),
+                'price' => $price,
                 'wty_private' => $batt->getWarrantyPrivate(),
                 'wty_commercial' => $batt->getWarrantyCommercial(),
                 'image_url' => $this->getBatteryImageURL($req, $batt),

src/Controller/TAPI/JobOrderController.php

@@ -45,6 +45,8 @@ use App\Service\HubFilteringGeoChecker;
 use App\Service\RiderTracker;
 use App\Service\PromoLogger;
 use App\Service\MapTools;
+use App\Service\JobOrderManager;
+use App\Service\PriceTierManager;
 
 use App\Entity\JobOrder;
 use App\Entity\CustomerVehicle;
@@ -78,7 +80,8 @@ class JobOrderController extends ApiController
                                        FCMSender $fcmclient,
                                        RiderAssignmentHandlerInterface $rah, PromoLogger $promo_logger,
                                        HubSelector $hub_select, HubDistributor $hub_dist, HubFilterLogger $hub_filter_logger,
-                                       HubFilteringGeoChecker $hub_geofence, EntityManagerInterface $em)
+                                       HubFilteringGeoChecker $hub_geofence, EntityManagerInterface $em, JobOrderManager $jo_manager,
+                                       PriceTierManager $pt_manager)
     {
         $this->denyAccessUnlessGranted('tapi_jo.request', null, 'No access.');
 
@@ -107,7 +110,7 @@ class JobOrderController extends ApiController
 
         // get data from request
         $data = [];
-        $status = $this->getJobOrderRequestInfo($req, $em, $data);
+        $status = $this->getJobOrderRequestInfo($req, $em, $jo_manager, $data);
         if ($status != null)
             return new APIResponse(false, $status);
 
@@ -136,7 +139,8 @@ class JobOrderController extends ApiController
             ->setModeOfPayment($data['payment_mode'])
             ->setAdvanceOrder($data['is_advance_order'])
             ->setStatusAutoAssign(AutoAssignStatus::NOT_ASSIGNED)
-            ->setLandmark($data['landmark']);
+            ->setLandmark($data['landmark'])
+            ->setCustNew($data['flag_cust_new']);
 
         $jo->setCustomer($data['customer']);
         $jo->setCustomerVehicle($data['customer_vehicle']);
@@ -160,7 +164,20 @@ class JobOrderController extends ApiController
         // set taxable
         $icrit->setIsTaxable();
 
-        $icrit->addEntry($data['batt'], $data['trade_in_type'], 1);
+        // set JO source
+        $icrit->setSource(TransactionOrigin::THIRD_PARTY);
+
+        // set price tier
+        $pt_id = $pt_manager->getPriceTier($jo->getCoordinates());
+        $icrit->setPriceTier($pt_id);
+
+        // add the actual battery item first
+        $icrit->addEntry($data['batt'], null, 1);
+
+        // if we have a trade in, add it as well, assuming trade in battery == battery purchased
+        if (!empty($data['trade_in_type'])) {
+            $icrit->addEntry($data['batt'], $data['trade_in_type'], 1);
+        }
 
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
@@ -222,6 +239,10 @@ class JobOrderController extends ApiController
             // find nearest hubs
             $nearest_hubs = $hub_select->find($hub_criteria);
 
+            // set filter flags for inventory and available riders
+            $hub_criteria->setInventoryCheck();
+            $hub_criteria->setRidersCheck();
+
             if (!empty($nearest_hubs))
             {
                 // go through the hub list, find the nearest hub
@@ -449,6 +470,12 @@ class JobOrderController extends ApiController
 
         $icrit->addEntry($data['battery'], $data['trade_in_type'], 1);
 
+        // set taxable
+        $icrit->setIsTaxable(); 
+
+        // set JO source
+        $icrit->setSource('third_party');
+
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
 
@@ -1236,7 +1263,7 @@ class JobOrderController extends ApiController
         return $file_path;
     }
 
-    protected function getJobOrderRequestInfo(Request $req, EntityManagerInterface $em, &$data)
+    protected function getJobOrderRequestInfo(Request $req, EntityManagerInterface $em, JobOrderManager $jo_manager, &$data)
     {
         $error = $this->validateJORequest($req, $em);
         if ($error != null)
@@ -1359,7 +1386,7 @@ class JobOrderController extends ApiController
         ];
 
         // process customer and vehicle information
-        $cust_data = $this->processCustomerAndVehicleInformation($c_data, $em);
+        $cust_data = $this->processCustomerAndVehicleInformation($c_data, $em, $jo_manager);
 
         $data = [
             'trade_in_type' => $trade_in_type,
@@ -1379,6 +1406,7 @@ class JobOrderController extends ApiController
             'customer_vehicle' => $cust_data['customer_vehicle'],
             'source' => TransactionOrigin::THIRD_PARTY,
             'warranty_class' => $warranty_class,
+            'flag_cust_new' => $cust_data['flag_cust_new'],
         ];
 
         return null;
@@ -1535,7 +1563,7 @@ class JobOrderController extends ApiController
         return null;
     }
 
-    protected function processCustomerAndVehicleInformation($data, EntityManagerInterface $em)
+    protected function processCustomerAndVehicleInformation($data, EntityManagerInterface $em, JobOrderManager $jo_manager)
     {
         $c_data = [];
 
@@ -1552,6 +1580,7 @@ class JobOrderController extends ApiController
 
         // find customer + customer vehicle combo
         $cust_vehicle = $this->findCustomerAndCustomerVehicle($data, $em);
+        $flag_cust_new = false;
         if ($cust_vehicle == null)
         {
             // find customer given phone number
@@ -1587,7 +1616,8 @@ class JobOrderController extends ApiController
 
                 // add customer vehicle
                 $cust_vehicle = $this->createCustomerVehicle($em, $cust, $data);
-                
+
+                $flag_cust_new = true;                
             }
             else
             {
@@ -1598,9 +1628,18 @@ class JobOrderController extends ApiController
             $em->flush();
         }
 
+        // check if customer has more than one job order already
+        if ($cust != null)
+        {
+            $cust_jo_count = $jo_manager->getCustomerJobOrderCount($cust->getID());
+            if ($cust_jo_count <= 1)
+                $flag_cust_new = true;
+        }
+
         $c_data = [
             'customer' => $cust_vehicle->getCustomer(),
             'customer_vehicle' => $cust_vehicle,
+            'flag_cust_new' => $flag_cust_new,
         ];
 
         return $c_data;

src/Controller/TicketController.php

@@ -105,6 +105,7 @@ class TicketController extends Controller
             $row['status'] = TicketStatus::getName($orow->getStatus());
             $row['ticket_type'] = $orow->getTicketTypeText();
             $row['plate_number'] = $orow->getPlateNumber();
+            $row['flag_late_doc'] = $orow->isLateDoc();
 
             // add row metadata
             $row['meta'] = [
@@ -260,6 +261,12 @@ class TicketController extends Controller
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
+        // is this a late documentation
+        $flag_late_doc = $req->request->get('flag_late_doc', false);
+
+        // reason for late documentation
+        $late_doc_reason = $flag_late_doc ? $req->request->get('late_doc_reason') : null;
+
         // set and save values
         $obj->setFirstName($first_name)
             ->setLastName($last_name)
@@ -273,7 +280,9 @@ class TicketController extends Controller
             ->setCreatedBy($this->getUser())
             ->setSourceOfAwareness($soa_type)
             ->setRemarks($remarks)
-            ->setOtherDescription($other_desc);
+            ->setOtherDescription($other_desc)
+            ->setLateDoc($flag_late_doc)
+            ->setLateDocReason($late_doc_reason);
 
         // if assigned to customer, set association
         if ($customer_id) {
@@ -471,6 +480,12 @@ class TicketController extends Controller
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
+        // is this a late documentation
+        $flag_late_doc = $req->request->get('flag_late_doc', false);
+
+        // reason for late documentation
+        $late_doc_reason = $flag_late_doc ? $req->request->get('late_doc_reason') : null;
+
         // set and save values
         $obj->setFirstName($first_name)
             ->setLastName($last_name)
@@ -482,7 +497,9 @@ class TicketController extends Controller
             ->setPlateNumber($req->request->get('plate_number'))
             ->setSourceOfAwareness($soa_type)
             ->setRemarks($remarks)
-            ->setOtherDescription($other_desc);
+            ->setOtherDescription($other_desc)
+            ->setLateDoc($flag_late_doc)
+            ->setLateDocReason($late_doc_reason);
 
         // initialize error list
         $error_array = [];

src/Controller/VehicleController.php

@@ -70,11 +70,14 @@ class VehicleController extends Controller
 
         // build query
         $query = $qb->select('q')
-            ->addSelect('mfg.name as mfg_name');
+            ->addSelect('mfg.name as mfg_name')
+            ->addSelect('mfg.id as mfg_id');
 
         // add filters to query
         $this->setQueryFilters($datatable, $query);
 
+        error_log("test");
+
         // check if sorting is present, otherwise use default
         if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
             $prefix = '';
@@ -85,7 +88,8 @@ class VehicleController extends Controller
             $order = $datatable['sort']['sort'] ?? 'asc';
             $query->orderBy($prefix . $datatable['sort']['field'], $order);
         } else {
-            $query->orderBy('mfg_name', 'asc');
+            $query->orderBy('mfg_name', 'asc')
+                ->addOrderBy('q.make', 'asc');
         }
 
         // get rows for this page
@@ -100,6 +104,7 @@ class VehicleController extends Controller
             // add row data
             $row['id'] = $orow[0]->getID();
             $row['mfg_name'] = $orow['mfg_name'];
+            $row['mfg_id'] = $orow['mfg_id'];
             $row['make'] = $orow[0]->getMake();
             $row['model_year_from'] = $orow[0]->getModelYearFrom();
             $row['model_year_to'] = $orow[0]->getModelYearTo();

src/Entity/CustomerDeleteRequest.php

@@ -0,0 +1,209 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use DateTime;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="customer_delete_request")
+ */
+class CustomerDeleteRequest
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="string", length=50)
+     */
+    protected $id;
+
+    // phone number
+    /**
+     * @ORM\Column(type="string", length=12)
+     */
+    protected $phone_number;
+
+    // reason for account deletion
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    protected $reason;
+
+    // confirm code that we send via SMS
+    /**
+     * @ORM\Column(type="string", length=6, nullable=true)
+     */
+    protected $confirm_code;
+
+    // if this request has been confirmed via SMS
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    protected $flag_confirmed;
+
+    // if this request has been completed
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    protected $flag_completed;
+
+    // date request was created
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    protected $date_created;
+
+    // date and time that the confirmation code was last sent
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_code_sent;
+
+    // date request was confirmed
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_confirmed;
+
+    // date customer was created
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_completed;
+
+    // link to customer
+    /**
+     * @ORM\ManyToOne(targetEntity="Customer")
+     * @ORM\JoinColumn(name="customer_id", referencedColumnName="id", nullable=true)
+     */
+    protected $customer;
+
+    public function __construct()
+    {
+        $this->id = $this->generateKeyID();
+        $this->flag_confirmed = false;
+        $this->flag_completed = false;
+        $this->date_created = new DateTime();
+        $this->date_code_sent = null;
+        $this->date_confirmed = null;
+        $this->date_completed = null;
+        $this->reason = null;
+        $this->customer = null;
+    }
+
+    public function generateKeyID()
+    {
+        // use uniqid with unix timestamp prefix for now
+        return uniqid(time());
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setPhoneNumber($num)
+    {
+        $this->phone_number = $num;
+        return $this;
+    }
+
+    public function getPhoneNumber()
+    {
+        return $this->phone_number;
+    }
+
+    public function setReason($reason)
+    {
+        $this->reason = $reason;
+        return $this;
+    }
+
+    public function getReason()
+    {
+        return $this->reason;
+    }
+
+    public function setConfirmCode($code)
+    {
+        $this->confirm_code = $code;
+        return $this;
+    }
+
+    public function getConfirmCode()
+    {
+        return $this->confirm_code;
+    }
+
+    public function setConfirmed($flag = true)
+    {
+        $this->flag_confirmed = $flag;
+        return $this;
+    }
+
+    public function isConfirmed()
+    {
+        return $this->flag_confirmed;
+    }
+
+    public function setCompleted($flag = true)
+    {
+        $this->flag_completed = $flag;
+        return $this;
+    }
+
+    public function isCompleted()
+    {
+        return $this->flag_completed;
+    }
+
+    public function getDateCreated()
+    {
+        return $this->date_created;
+    }
+
+    public function setDateCodeSent(DateTime $date)
+    {
+        $this->date_code_sent = $date;
+        return $this;
+    }
+
+    public function getDateCodeSent()
+    {
+        return $this->date_code_sent;
+    }
+
+    public function setDateConfirmed(DateTime $date)
+    {
+        $this->date_confirmed = $date;
+        return $this;
+    }
+
+    public function getDateConfirmed()
+    {
+        return $this->date_confirmed;
+    }
+
+    public function setDateCompleted(DateTime $date)
+    {
+        $this->date_completed = $date;
+        return $this;
+    }
+
+    public function getDateCompleted()
+    {
+        return $this->date_completed;
+    }
+
+    public function setCustomer(Customer $cust = null)
+    {
+        $this->customer = $cust;
+        return $this;
+    }
+
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+}

src/Entity/CustomerSession.php

@@ -20,7 +20,7 @@ class CustomerSession
      */
     protected $id;
 
-    // link to customer er
+    // link to customer
     /**
      * @ORM\ManyToOne(targetEntity="Customer")
      * @ORM\JoinColumn(name="customer_id", referencedColumnName="id", nullable=true)

src/Entity/CustomerVehicle.php

@@ -2,11 +2,13 @@
 
 namespace App\Entity;
 
+use App\Ramcar\InsuranceApplicationStatus;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
 
 use Symfony\Component\Validator\Constraints as Assert;
 use DateTime;
+use Doctrine\Common\Collections\Criteria;
 
 /**
  * @ORM\Entity
@@ -114,10 +116,15 @@ class CustomerVehicle
      */
     protected $flag_active;
 
+    // link to insurance
+    /**
+     * @ORM\OneToMany(targetEntity="InsuranceApplication", mappedBy="customer_vehicle")
+     */
+    protected $insurance_applications;
+
     public function __construct()
     {
         $this->flag_active = true;
-
         $this->job_orders = new ArrayCollection();
     }
 
@@ -282,4 +289,21 @@ class CustomerVehicle
     {
         return $this->flag_active;
     }
+
+    public function getInsuranceApplications()
+    {
+        return $this->insurance_applications;
+    }
+
+    public function getLatestInsuranceApplication()
+    {
+        $criteria = Criteria::create()
+            ->where(Criteria::expr()->notIn('status', [InsuranceApplicationStatus::CANCELLED]))
+            ->orderBy(['date_submit' => Criteria::DESC])
+            ->setMaxResults(1);
+
+        $result = $this->insurance_applications->matching($criteria);
+
+        return !empty($result) ? $result[0] : null;
+    }
 }

src/Entity/GatewayTransaction.php

@@ -0,0 +1,193 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use App\Ramcar\TransactionStatus;
+use Symfony\Component\Validator\Constraints as Assert;
+
+use DateTime;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="gateway_transaction")
+ */
+class GatewayTransaction
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Customer", inversedBy="transactions")
+     * @ORM\JoinColumn(name="customer_id", referencedColumnName="id")
+     */
+    protected $customer;
+
+    // date ticket was created
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    protected $date_create;
+
+    // date ticket was paid
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_pay;
+
+    // amount
+    /**
+     * @ORM\Column(type="bigint")
+     * @Assert\NotBlank()
+     */
+    protected $amount;
+
+    // status of the transaction
+    /**
+     * @ORM\Column(type="string", length=50)
+     * @Assert\NotBlank()
+     */
+    protected $status;
+
+    // type of transaction
+    /**
+     * @ORM\Column(type="string", length=50)
+     * @Assert\NotBlank()
+     */
+    protected $type;
+
+    // gateway used for transaction
+    /**
+     * @ORM\Column(type="string", length=50)
+     * @Assert\NotBlank()
+     */
+    protected $gateway;
+
+    // external transaction id
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    protected $ext_transaction_id;
+
+    // other data related to the transaction
+    /**
+     * @ORM\Column(type="json")
+     */
+    protected $metadata;
+
+    public function __construct()
+    {
+        $this->date_create = new DateTime();
+        $this->status = TransactionStatus::PENDING;
+        $this->metadata = [];
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setCustomer(Customer $customer)
+    {
+        $this->customer = $customer;
+        return $this;
+    }
+
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+
+    public function setDateCreate(DateTime $date)
+    {
+        $this->date_create = $date;
+        return $this;
+    }
+
+    public function getDateCreate()
+    {
+        return $this->date_create;
+    }
+
+    public function setDatePay(DateTime $date)
+    {
+        $this->date_pay = $date;
+        return $this;
+    }
+
+    public function getDatePay()
+    {
+        return $this->date_pay;
+    }
+
+    public function setAmount($amount)
+    {
+        $this->amount = $amount;
+        return $this;
+    }
+
+    public function getAmount()
+    {
+        return $this->amount;
+    }
+
+    public function setStatus($status)
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    public function setType($type)
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    public function setGateway($gateway)
+    {
+        $this->gateway = $gateway;
+        return $this;
+    }
+
+    public function getGateway()
+    {
+        return $this->gateway;
+    }
+
+    public function setExtTransactionId($transaction_id)
+    {
+        $this->ext_transaction_id = $transaction_id;
+        return $this;
+    }
+
+    public function getExtTransactionId()
+    {
+        return $this->ext_transaction_id;
+    }
+
+    public function setMetadata($metadata)
+    {
+        $this->metadata = $metadata;
+        return $this;
+    }
+
+    public function getMetadata()
+    {
+        return $this->metadata;
+    }
+}

src/Entity/Hub.php

@@ -114,7 +114,9 @@ class Hub
     public function getAvailableRiders()
     {
         $crit = Criteria::create();
-        $crit->where(Criteria::expr()->eq('flag_available', true));
+        $crit->where(Criteria::expr()->eq('flag_available', true))
+            ->where(Criteria::expr()->eq('flag_active', true))
+            ->where(Criteria::expr()->eq('current_job_order', null));
 
         return $this->riders->matching($crit);
     }

src/Entity/InsuranceApplication.php

@@ -0,0 +1,226 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Validator\Constraints as Assert;
+
+use DateTime;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="insurance_application")
+ */
+class InsuranceApplication
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    // link to customer
+    /**
+     * @ORM\ManyToOne(targetEntity="Customer")
+     * @ORM\JoinColumn(name="customer_id", referencedColumnName="id")
+     */
+    protected $customer;
+
+    // link to customer vehicle
+    /**
+     * @ORM\ManyToOne(targetEntity="CustomerVehicle", inversedBy="insurance")
+     * @ORM\JoinColumn(name="customer_vehicle_id", referencedColumnName="id")
+     * @Assert\NotBlank()
+     */
+    protected $customer_vehicle;
+
+    // gateway transaction
+    /**
+     * @ORM\OneToOne(targetEntity="GatewayTransaction")
+     * @ORM\JoinColumn(name="gateway_transaction_id", referencedColumnName="id")
+     */
+    protected $gateway_transaction;
+
+    // status
+    /**
+     * @ORM\Column(type="string", length=32)
+     */
+    protected $status;
+
+    // URL of COC
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    protected $coc_url;
+
+    // date the application was submitted
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    protected $date_submit;
+
+    // date the application was paid
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_pay;
+
+    // date the application was marked as completed by the insurance api
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_complete;
+
+    // date the application is set to expire
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    protected $date_expire;
+
+    // external transaction id
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    protected $ext_transaction_id;
+
+    // form data when submitting the application
+    /**
+     * @ORM\Column(type="json")
+     */
+    protected $metadata;
+
+    public function __construct()
+    {
+        $this->date_submit = new DateTime();
+        $this->date_pay = null;
+        $this->date_complete = null;
+        $this->date_expire = null;
+        $this->metadata = [];
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setCustomer(Customer $cust = null)
+    {
+        $this->customer = $cust;
+        return $this;
+    }
+
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+
+    public function setCustomerVehicle(CustomerVehicle $cv = null)
+    {
+        $this->customer_vehicle = $cv;
+        return $this;
+    }
+
+    public function getCustomerVehicle()
+    {
+        return $this->customer_vehicle;
+    }
+
+    public function setDateSubmit(DateTime $date)
+    {
+        $this->date_submit = $date;
+        return $this;
+    }
+
+    public function getDateSubmit()
+    {
+        return $this->date_submit;
+    }
+
+    public function setGatewayTransaction(GatewayTransaction $transaction)
+    {
+        $this->gateway_transaction = $transaction;
+        return $this;
+    }
+
+    public function getGatewayTransaction()
+    {
+        return $this->gateway_transaction;
+    }
+
+    public function setStatus($status)
+    {
+        return $this->status = $status;
+    }
+
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    public function setCOC($url)
+    {
+        return $this->coc_url = $url;
+    }
+
+    public function getCOC()
+    {
+        return $this->coc_url;
+    }
+
+    public function setDatePay(DateTime $date)
+    {
+        $this->date_pay = $date;
+        return $this;
+    }
+
+    public function getDatePay()
+    {
+        return $this->date_pay;
+    }
+
+    public function setDateComplete(DateTime $date)
+    {
+        $this->date_complete = $date;
+        return $this;
+    }
+
+    public function getDateComplete()
+    {
+        return $this->date_complete;
+    }
+
+    public function setDateExpire(DateTime $date)
+    {
+        $this->date_expire = $date;
+        return $this;
+    }
+
+    public function getDateExpire()
+    {
+        return $this->date_expire;
+    }
+
+    public function setExtTransactionId($transaction_id)
+    {
+        $this->ext_transaction_id = $transaction_id;
+        return $this;
+    }
+
+    public function getExtTransactionId()
+    {
+        return $this->ext_transaction_id;
+    }
+
+    public function setMetadata($metadata)
+    {
+        return $this->metadata = $metadata;
+    }
+
+    public function getMetadata()
+    {
+        return $this->metadata;
+    }
+}

src/Entity/InvoiceItem.php

@@ -50,10 +50,24 @@ class InvoiceItem
      */
     protected $battery;
 
+    // battery size for trade in items
+    /**
+     * @ORM\ManyToOne(targetEntity="BatterySize")
+     * @ORM\JoinColumn(name="battery_size_id", referencedColumnName="id")
+     */
+    protected $battery_size;
+
+    // trade in type
+    /**
+     * @ORM\Column(type="string", length=20)
+     */
+    protected $trade_in_type;
+
     public function __construct()
     {
         $this->title = '';
         $this->price = 0.0;
+        $this->trade_in_type = '';
     }
 
     public function getID()
@@ -115,4 +129,26 @@ class InvoiceItem
     {
         return $this->battery;
     }
+
+    public function setBatterySize(BatterySize $battery_size)
+    {
+        $this->battery_size = $battery_size;
+        return $this;
+    }
+
+    public function getBatterySize()
+    {
+        return $this->battery_size;
+    }
+
+    public function setTradeInType(string $trade_in_type)
+    {
+        $this->trade_in_type = $trade_in_type;
+        return $this;
+    }
+
+    public function getTradeInType()
+    {
+        return $this->trade_in_type;
+    }
 }

src/Entity/ItemPrice.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="item_price")
+ */
+
+class ItemPrice
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="PriceTier", inversedBy="item_prices")
+     * @ORM\JoinColumn(name="price_tier_id", referencedColumnName="id")
+     */
+    protected $price_tier;
+
+    // item type
+    /**
+     * @ORM\ManyToOne(targetEntity="ItemType", inversedBy="items")
+     * @ORM\JoinColumn(name="item_type_id", referencedColumnName="id")
+     */
+    protected $item_type;
+
+    // could be battery id or service offering id, loosely coupled
+    /**
+     * @ORM\Column(type="integer")
+     */
+    protected $item_id;
+
+    // current price
+    // NOTE: we need to move the decimal point two places to the left to get actual value
+    //       we want to avoid floating point problems
+    /**
+     * @ORM\Column(type="integer")
+     */
+    protected $price;
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setPriceTier(PriceTier $price_tier)
+    {
+        $this->price_tier = $price_tier;
+        return $this;
+    }
+
+    public function getPriceTier()
+    {
+        return $this->price_tier;
+    }
+
+    public function setItemType(ItemType $item_type)
+    {
+        $this->item_type = $item_type;
+        return $this;
+    }
+
+    public function getItemType()
+    {
+        return $this->item_type;
+    }
+
+    public function setItemID($item_id)
+    {
+        $this->item_id = $item_id;
+        return $this;
+    }
+
+    public function getItemID()
+    {
+        return $this->item_id;
+    }
+
+    public function setPrice($price)
+    {
+        $this->price = $price;
+        return $this;
+    }
+
+    public function getPrice()
+    {
+        return $this->price;
+    }
+}

src/Entity/ItemType.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="item_type", indexes={
+ *     @ORM\Index(name="item_type_idx", columns={"code"})
+ * })
+ */
+
+class ItemType
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $name;
+
+    /**
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $code;
+
+    // items under an item type
+    /**
+     * @ORM\OneToMany(targetEntity="ItemPrice", mappedBy="item_type")
+     */
+    protected $items;
+
+    public function __construct()
+    {
+        $this->code = '';
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setCode($code)
+    {
+        $this->code = $code;
+        return $this;
+    }
+
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    public function getItems()
+    {
+        return $this->items;
+    }
+}

src/Entity/JobOrder.php

@@ -429,6 +429,24 @@ class JobOrder
      */
     protected $cust_location;
 
+    // inventory count of hub at time of hub assignment
+    /**
+     * @ORM\Column(type="smallint")
+     */
+    protected $inventory_count;
+
+    // flag to indicate if customer is new aka has one or less job order in system
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    protected $flag_cust_new;
+
+    // only for tire service, if it requires sealant or not
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    protected $flag_sealant; 
+
     public function __construct()
     {
         $this->date_create = new DateTime();
@@ -446,6 +464,7 @@ class JobOrder
 		$this->trade_in_type = null;
         $this->flag_rider_rating = false;
         $this->flag_coolant = false;
+        $this->flag_sealant = false;
 
         $this->priority = 0;
         $this->meta = [];
@@ -453,6 +472,10 @@ class JobOrder
         $this->phone_mobile = '';
 
         $this->will_wait = WillingToWaitContent::WILLING_TO_WAIT;
+
+        $this->inventory_count = 0;
+
+        $this->flag_cust_new = false;
     }
 
     public function getID()
@@ -1217,4 +1240,38 @@ class JobOrder
     {
         return $this->cust_location;
     }
+
+    public function setInventoryCount($inventory_count)
+    {
+        $this->inventory_count = $inventory_count;
+        return $this;
+    }
+
+    public function getInventoryCount()
+    {
+        return $this->inventory_count;
+    }
+
+    public function setCustNew($flag_cust_new = true)
+    {
+        $this->flag_cust_new = $flag_cust_new;
+        return $this;
+    }
+
+    public function isCustNew()
+    {
+        return $this->flag_cust_new;
+    }
+
+    public function setHasSealant($flag = true)
+    {
+        $this->flag_sealant = $flag;
+        return $this;
+    }
+
+    public function hasSealant()
+    {
+        return $this->flag_sealant;
+    }
+
 }

src/Entity/MotoliteEvent.php

@@ -21,7 +21,7 @@ class MotoliteEvent
     protected $id;
 
     /**
-     * @ORM\Column(type="string", length=80)
+     * @ORM\Column(type="string", length=255)
      * @Assert\NotBlank()
      */
     protected $name;

src/Entity/PriceTier.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="price_tier")
+ */
+
+class PriceTier
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    // name of price tier
+    /**
+     * @ORM\Column(type="string", length=80)
+     */
+    protected $name;
+
+    // supported areas under price tier
+    /**
+     * @ORM\OneToMany(targetEntity="SupportedArea", mappedBy="price_tier");
+     */
+    protected $supported_areas;
+
+    // items under a price tier
+    /**
+     * @ORM\OneToMany(targetEntity="ItemPrice", mappedBy="price_tier")
+     */
+    protected $item_prices;
+
+    public function __construct()
+    {
+        $this->supported_areas = new ArrayCollection();
+        $this->items = new ArrayCollection();
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getSupportedAreaObjects()
+    {
+        return $this->supported_areas;
+    }
+
+    public function getSupportedAreas()
+    {
+        $str_supported_areas = [];
+        foreach ($this->supported_areas as $supported_area)
+            $str_supported_areas[] = $supported_area->getID();
+
+        return $str_supported_areas;
+    }
+
+    public function clearSupportedAreas()
+    {
+        $this->supported_areas->clear();
+        return $this;
+    }
+
+    public function getItemPrices()
+    {
+        return $this->item_prices;
+    }
+
+}

src/Entity/Role.php

@@ -6,6 +6,7 @@ use Catalyst\AuthBundle\Entity\Role as BaseRole;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 
 /**
@@ -16,6 +17,19 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
  */
 class Role extends BaseRole
 {
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $id;
+
+    /**
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $name;
+
     /**
      * @ORM\ManyToMany(targetEntity="User", mappedBy="roles", fetch="EXTRA_LAZY")
      */

src/Entity/ServiceOffering.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="service_offering", indexes={
+ *     @ORM\Index(name="service_offering_idx", columns={"code"}),
+ * })
+ */
+class ServiceOffering
+{
+    // unique id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $name;
+
+    /**
+     * @ORM\Column(type="string", length=80)
+     * @Assert\NotBlank()
+     */
+    protected $code;
+
+    // service fee
+    /**
+     * @ORM\Column(type="decimal", precision=9, scale=2)
+     */
+    protected $fee;
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setCode($code)
+    {
+        $this->code = $code;
+        return $this;
+    }
+
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    public function setFee($fee)
+    {
+        $this->fee = $fee;
+        return $this;
+    }
+
+    public function getFee()
+    {
+        return $this->fee;
+    }
+}
+

src/Entity/SupportedArea.php

@@ -39,9 +39,24 @@ class SupportedArea
      */
     protected $coverage_area;
 
+    // prevent certain hub filters from being used
+    /**
+     * @ORM\Column(type="json", nullable=true)
+     */
+    protected $hub_filter_exceptions;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="PriceTier", inversedBy="supported_areas")
+     * @ORM\JoinColumn(name="price_tier_id", referencedColumnName="id", nullable=true)
+     */
+    protected $price_tier;
+
     public function __construct()
     {
         $this->date_create = new DateTime();
+
+        $this->price_tier = null;
+        $this->hub_filter_exceptions = [];
     }
 
     public function getID()
@@ -57,7 +72,7 @@ class SupportedArea
 
     public function getDateCreate()
     {
-        return $this->date_Create;
+        return $this->date_create;
     }
 
     public function setName($name)
@@ -82,5 +97,27 @@ class SupportedArea
     {
         return $this->coverage_area;
     }
+
+    public function setPriceTier(PriceTier $price_tier = null)
+    {
+        $this->price_tier = $price_tier;
+        return $this;
+    }
+
+    public function getPriceTier()
+    {
+        return $this->price_tier;
+    }
+
+    public function setHubFilterExceptions($exceptions)
+    {
+        $this->hub_filter_exceptions = $exceptions;
+        return $this;
+    }
+
+    public function getHubFilterExceptions()
+    {
+        return $this->hub_filter_exceptions;
+    }
 }
 

src/Entity/Ticket.php

@@ -139,9 +139,22 @@ class Ticket
      */
     protected $other_description;
 
+    // is it a late documentation?
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     */
+    protected $flag_late_doc;
+
+    // reason for late documentation
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    protected $late_doc_reason;
+
     public function __construct()
     {
         $this->date_create = new DateTime();
+        $this->flag_late_doc = false;
     }
 
     public function getID()
@@ -354,4 +367,26 @@ class Ticket
     {
         return $this->other_description;
     }
+
+    public function setLateDoc($flag_late_doc = true)
+    {
+        $this->flag_late_doc = $flag_late_doc;
+        return $this;
+    }
+
+    public function isLateDoc()
+    {
+        return $this->flag_late_doc;
+    }
+
+    public function setLateDocReason($late_doc_reason)
+    {
+        $this->late_doc_reason = $late_doc_reason;
+        return $this;
+    }
+
+    public function getLateDocReason()
+    {
+        return $this->late_doc_reason;
+    }
 }

src/EntityListener/GatewayTransactionListener.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\EntityListener;
+
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\EntityManagerInterface;
+
+use App\Entity\GatewayTransaction;
+use App\Entity\InsuranceApplication;
+use App\Service\InsuranceConnector;
+use App\Ramcar\InsuranceApplicationStatus;
+use App\Ramcar\TransactionStatus;
+use DateTime;
+
+class GatewayTransactionListener
+{
+	protected $ic;
+    protected $em;
+
+    public function __construct(EntityManagerInterface $em, InsuranceConnector $ic)
+    {
+        $this->em = $em;
+        $this->ic = $ic;
+    }
+
+    public function postUpdate(GatewayTransaction $gt_obj, LifecycleEventArgs $args)
+    {
+        // get transaction changes
+        $em = $args->getEntityManager();
+        $uow = $em->getUnitOfWork();
+        $changeset = $uow->getEntityChangeSet($gt_obj);
+
+        if (array_key_exists('status', $changeset)) {
+            $field_changes = $changeset['status'];
+
+            $prev_value = $field_changes[0] ?? null;
+            $new_value = $field_changes[1] ?? null;
+
+            // only do something if the status has changed to paid
+            if ($prev_value !== $new_value && $new_value === TransactionStatus::PAID) {
+                // handle based on type
+                // TODO: add types here as we go. there's probably a better way to do this.
+                switch ($gt_obj->getType()) {
+                    case 'insurance_premium':
+                        return $this->handleInsurancePremium($gt_obj);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+    }
+
+    protected function handleInsurancePremium($gt_obj)
+    {
+        // get insurance application object
+        $obj = $this->em->getRepository(InsuranceApplication::class)->findOneBy([
+            'gateway_transaction' => $gt_obj,
+        ]);
+        
+        // make sure the object exists and has not been processed yet
+        if (!empty($obj) && $obj->getStatus() === InsuranceApplicationStatus::CREATED) {
+            // mark as paid
+            $obj->setDatePay(new DateTime());
+            $obj->setStatus(InsuranceApplicationStatus::PAID);
+            $this->em->flush();
+
+            // flag on api as paid
+            $result = $this->ic->tagApplicationPaid($obj->getExtTransactionId());
+
+            // something went wrong with insurance api
+            if (!$result['success'] || $result['response']['transaction_code'] !== 'GR004') {
+                error_log("INSURANCE MARK AS PAID FAILED FOR " . $obj->getID() . ": " . $result['error']['message']);
+            }
+        }
+    }
+}
+

src/InvoiceRule/BatteryReplacementWarranty.php

@@ -10,14 +10,20 @@ use App\Ramcar\ServiceType;
 use App\Ramcar\TradeInType;
 
 use App\Entity\Battery;
+use App\Entity\ServiceOffering;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
 
 class BatteryReplacementWarranty implements InvoiceRuleInterface
 {
     protected $em;
+    protected $pt_manager;
 
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
     {
         $this->em = $em;
+        $this->pt_manager = $pt_manager;
     }
 
     public function getID()
@@ -28,6 +34,7 @@ class BatteryReplacementWarranty implements InvoiceRuleInterface
     public function compute($criteria, &$total) 
     {
         $stype = $criteria->getServiceType();
+        $pt_id = $criteria->getPriceTier();
 
         $items = [];
         if ($stype == $this->getID())
@@ -39,7 +46,14 @@ class BatteryReplacementWarranty implements InvoiceRuleInterface
             {
                 $batt = $entry['battery'];
                 $qty = 1;
-                $price = $this->getServiceTypeFee();     
+
+                // check if price tier has item price
+                $pt_price = $this->getPriceTierItemPrice($pt_id);     
+
+                if ($pt_price == null)
+                    $price = $this->getServiceTypeFee();
+                else
+                    $price = $pt_price;
 
                 $items[] = [
                     'service_type' => $this->getID(),
@@ -59,10 +73,16 @@ class BatteryReplacementWarranty implements InvoiceRuleInterface
 
     public function getServiceTypeFee()
     {
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 0;
+        $code = 'battery_replacement_warranty_fee';
+
+        // find the service fee using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function validatePromo($criteria, $promo_id)
@@ -96,20 +116,46 @@ class BatteryReplacementWarranty implements InvoiceRuleInterface
                 $qty = $item['quantity'];
                 if ($qty < 1)
                     continue;
-
-                // if this is a trade in, add trade in
-                if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in']))
-                    $trade_in = $item['trade_in'];
-                else
+ 
+                if (empty($item['trade_in']))
+                {
                     $trade_in = null;
-
-                $criteria->addEntry($battery, $trade_in, $qty);
+                    $criteria->addEntry($battery, $trade_in, $qty);
+                }
             }
         }
 
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+            
+        // find the service offering
+        $code = 'battery_replacement_warranty_fee';
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
+
     protected function getTitle($battery)
     {
         $title = $battery->getModel()->getName() . ' ' . $battery->getSize()->getName() . ' - Service Unit';

src/InvoiceRule/BatterySales.php

@@ -10,14 +10,19 @@ use App\Ramcar\TradeInType;
 use App\Ramcar\ServiceType;
 
 use App\Entity\Battery;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
 
 class BatterySales implements InvoiceRuleInterface
 {  
     protected $em;
+    protected $pt_manager;
 
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
     {
         $this->em = $em;
+        $this->pt_manager = $pt_manager;
     }
 
     public function getID()
@@ -28,6 +33,7 @@ class BatterySales implements InvoiceRuleInterface
     public function compute($criteria, &$total)
     {
         $stype = $criteria->getServiceType();
+        $pt = $criteria->getPriceTier();
 
         $items = [];
         if ($stype == $this->getID())
@@ -36,19 +42,28 @@ class BatterySales implements InvoiceRuleInterface
             $entries = $criteria->getEntries();
             foreach($entries as $entry)
             {
-                $batt = $entry['battery'];
                 $qty = $entry['qty'];
                 $trade_in = null;
 
+                // check if entry is for trade in
                 if (isset($entry['trade_in']))
                     $trade_in = $entry['trade_in'];
 
-                $size = $batt->getSize();
-
+                // entry is a battery purchase
                 if ($trade_in == null)
                 {
-                    // battery purchase
-                    $price = $batt->getSellingPrice();
+                    // safe to get entry with battery key since CRM and apps
+                    // will set this for a battery purchase and trade_in will
+                    // will not be set
+                    $batt = $entry['battery'];
+
+                    // check if price tier has item price for battery
+                    $pt_price = $this->getPriceTierItemPrice($pt, $batt);
+
+                    if ($pt_price == null)
+                        $price = $batt->getSellingPrice();
+                    else
+                        $price = $pt_price;
 
                     $items[] = [
                         'service_type' => $this->getID(),
@@ -88,32 +103,49 @@ class BatterySales implements InvoiceRuleInterface
             // check if this is a valid battery
             foreach ($invoice_items as $item)
             {
-                $battery = $this->em->getRepository(Battery::class)->find($item['battery']);
-
-                if (empty($battery))
+                if (isset($item['battery']))
                 {
-                    $error = 'Invalid battery specified.';
-                    return $error;
-                }
+                    $battery = $this->em->getRepository(Battery::class)->find($item['battery']);
 
-                // quantity
-                $qty = $item['quantity'];
-                if ($qty < 1)
-                    continue;
+                    if (empty($battery))
+                    {
+                        $error = 'Invalid battery specified.';
+                        return $error;
+                    }
+
+                    // quantity
+                    $qty = $item['quantity'];
+                    if ($qty < 1)
+                        continue;
 
-                // if this is a trade in, add trade in
-                if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in']))
-                    $trade_in = $item['trade_in'];
-                else
                     $trade_in = null;
-
-                $criteria->addEntry($battery, $trade_in, $qty);
+                    $criteria->addEntry($battery, $trade_in, $qty);
+                }
             }
         }
 
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id, $batt)
+    {
+        // price tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type battery
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'battery']);
+        if ($item_type == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $batt->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getTitle($battery)
     {
         $title = $battery->getModel()->getName() . ' ' . $battery->getSize()->getName();

src/InvoiceRule/Fuel.php

@@ -2,13 +2,30 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
 use App\Ramcar\FuelType;
 use App\Ramcar\ServiceType;
 
+use App\Entity\ServiceOffering;
+use App\Entity\CustomerVehicle;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
+
 class Fuel implements InvoiceRuleInterface
-{   
+{
+    protected $em;
+    protected $pt_manager;
+
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
+    {
+        $this->em = $em;
+        $this->pt_manager = $pt_manager;
+    }
+
     public function getID()
     {   
         return 'fuel';
@@ -17,17 +34,21 @@ class Fuel implements InvoiceRuleInterface
     public function compute($criteria, &$total) 
     {
         $stype = $criteria->getServiceType();
+        $pt_id = $criteria->getPriceTier();
 
         $items = [];
         
         if ($stype == $this->getID())
         {
-            // check if customer vehicle has a motolite battery
             $cv = $criteria->getCustomerVehicle();
-            if ($cv->hasMotoliteBattery())
-                $fee = 0;
+
+            // check if price tier has item price
+            $pt_price = $this->getPriceTierItemPrice($pt_id, $cv);
+
+            if ($pt_price == null)
+                $service_price = $this->getServiceTypeFee($cv);
             else
-                $fee = $this->getServiceTypeFee();
+                $service_price = $pt_price;
 
             $ftype = $cv->getFuelType();
 
@@ -37,10 +58,10 @@ class Fuel implements InvoiceRuleInterface
                 'service_type' => $this->getID(),
                 'qty' => $qty,
                 'title' => $this->getServiceTitle($ftype),
-                'price' => $fee,
+                'price' => $service_price,
             ];
  
-            $qty_fee = bcmul($qty, $fee, 2);
+            $qty_fee = bcmul($qty, $service_price, 2);
             $total_price = $qty_fee;
 
             switch ($ftype)
@@ -48,7 +69,15 @@ class Fuel implements InvoiceRuleInterface
                 case FuelType::GAS:
                 case FuelType::DIESEL:
                     $qty = 1;
-                    $price = $this->getFuelFee($ftype);
+
+                    // check if price tier has item price for fuel type
+                    $pt_price = $this->getPriceTierFuelItemPrice($pt_id, $ftype);
+
+                    if ($pt_price == null)
+                        $price = $this->getFuelFee($ftype);
+                    else
+                        $price = $pt_price;
+
                     $items[] = [
                         'service_type' => $this->getID(),
                         'qty' => $qty,
@@ -82,29 +111,41 @@ class Fuel implements InvoiceRuleInterface
         return $items;
     }
 
-    public function getServiceTypeFee()
-    {   
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any changes are to be made, we just edit the file
-        // instead of the code
-        return 300;
+    public function getServiceTypeFee(CustomerVehicle $cv)
+    {
+        // check if customer vehicle has a motolite battery
+        // if yes, set the code to the motolite user service fee
+        if ($cv->hasMotoliteBattery())
+            $code = 'motolite_user_service_fee';
+        else
+            $code = 'fuel_service_fee';
+
+        // find the service fee using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function getFuelFee($fuel_type)
     {
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any changes are to be made, we just edit the file
-        // instead of the code
+        $code = '';
         if ($fuel_type == FuelType::GAS)
-        {
-            // gas fuel fee
-            return 340;
-        }
-        else
-        {
-            // diesel fuel fee
-            return 300;
-        }
+            $code = 'fuel_gas_fee';
+        if ($fuel_type == FuelType::DIESEL)
+            $code = 'fuel_diesel_fee';
+
+        // find the fuel fee for the specific fuel type  using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function validatePromo($criteria, $promo_id)
@@ -117,6 +158,70 @@ class Fuel implements InvoiceRuleInterface
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id, CustomerVehicle $cv)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+
+        // find the service offering
+        // check if customer vehicle has a motolite battery
+        // if yes, set the code to the motolite user service fee
+        if ($cv->hasMotoliteBattery())
+            $code = 'motolite_user_service_fee';
+        else
+            $code = 'fuel_service_fee';
+
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
+    protected function getPriceTierFuelItemPrice($pt_id, $fuel_type)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+
+        // find the service offering
+        $code = '';
+        if ($fuel_type == FuelType::GAS)
+            $code = 'fuel_gas_fee';
+        if ($fuel_type == FuelType::DIESEL)
+            $code = 'fuel_diesel_fee';
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getTitle($fuel_type)
     {
         $title = '4L - ' . ucfirst($fuel_type);

src/InvoiceRule/Jumpstart.php

@@ -2,10 +2,29 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
+use App\Entity\ServiceOffering;
+use App\Entity\CustomerVehicle;
+use App\Entity\ItemType;
+
+use App\Ramcar\TransactionOrigin;
+
+use App\Service\PriceTierManager;
+
 class Jumpstart implements InvoiceRuleInterface
-{   
+{
+    protected $em;
+    protected $pt_manager;
+
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
+    {
+        $this->em = $em;
+        $this->pt_manager = $pt_manager;
+    }
+
     public function getID()
     {   
         return 'jumpstart_troubleshoot';
@@ -14,12 +33,22 @@ class Jumpstart implements InvoiceRuleInterface
     public function compute($criteria, &$total)
     {
         $stype = $criteria->getServiceType();
+        $source = $criteria->getSource();
+        $pt_id = $criteria->getPriceTier();
 
         $items = [];
 
         if ($stype == $this->getID())
         {
-            $fee = $this->getServiceTypeFee();
+            $cv = $criteria->getCustomerVehicle();
+
+            // check if price tier has item price
+            $pt_price = $this->getPriceTierItemPrice($pt_id, $source, $cv);
+
+            if ($pt_price == null)
+                $price = $this->getServiceTypeFee($source, $cv);
+            else
+                $price = $pt_price;
 
             // add the service fee to items
             $qty = 1;
@@ -27,22 +56,27 @@ class Jumpstart implements InvoiceRuleInterface
                 'service_type' => $this->getID(),
                 'qty' => $qty,
                 'title' => $this->getServiceTitle(),
-                'price' => $fee,
+                'price' => $price,
             ];
 
-            $qty_price = bcmul($fee, $qty, 2);
+            $qty_price = bcmul($price, $qty, 2);
             $total['total_price'] = bcadd($total['total_price'], $qty_price, 2);
         }
 
         return $items;
     }
 
-    public function getServiceTypeFee()
-    {   
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 150;
+    public function getServiceTypeFee($source, CustomerVehicle $cv)
+    {
+        // get the service fee code, depending on the JO source and if customer vehicle has a motolite battery
+        $code = $this->getServiceFeeCode($cv, $source);
+
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function validatePromo($criteria, $promo_id)
@@ -55,10 +89,68 @@ class Jumpstart implements InvoiceRuleInterface
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id, $source, $cv)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+
+        // get the service fee code, depending on the JO source and if customer vehicle has a motolite battery
+        $code = $this->getServiceFeeCode($cv, $source);
+
+        // find the service offering
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getServiceTitle()
     {
         $title = 'Service - Troubleshooting fee'; 
 
         return $title;
     }
+
+    protected function getServiceFeeCode(CustomerVehicle $cv, $source)
+    {
+        // check the source of JO
+        // (1) if from app, service fee is 0 if motolite user. jumpstart fee for app  if non-motolite user.
+        // (2) any other source, jumpstart fees are charged whether motolite user or not. Service fees for non-motolite
+        //  and motolite users are now different (used to be the same)
+        if ($source == TransactionOrigin::MOBILE_APP)
+        {
+            if ($cv->hasMotoliteBattery())
+                $code = 'motolite_user_service_fee';
+            else
+                $code = 'jumpstart_fee_mobile_app';
+        }
+        else
+        {
+            error_log('hotline');
+            if ($cv->hasMotoliteBattery())
+            {
+                error_log('has motolite battery');
+                $code = 'motolite_user_jumpstart_fee';
+            }
+            else
+                $code = 'jumpstart_fee';
+        }
+
+        return $code;
+
+    }
 } 

src/InvoiceRule/JumpstartWarranty.php

@@ -2,10 +2,27 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
+use App\Entity\ServiceOffering;
+use App\Entity\ItemType;
+use App\Entity\CustomerVehicle;
+
+use App\Service\PriceTierManager;
+
 class JumpstartWarranty implements InvoiceRuleInterface
-{  
+{
+    protected $em;
+    protected $pt_manager;
+
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
+    {
+        $this->em = $em;
+        $this->pt_manager = $pt_manager;
+    }
+
     public function getID()
     {   
         return 'jumpstart_warranty';
@@ -14,12 +31,21 @@ class JumpstartWarranty implements InvoiceRuleInterface
     public function compute($criteria, &$total)
     {
         $stype = $criteria->getServiceType();
+        $pt_id = $criteria->getPriceTier();
 
         $items = [];
 
         if ($stype == $this->getID())
         {
-            $fee = $this->getServiceTypeFee();
+            $cv = $criteria->getCustomerVehicle();
+
+            // check if price tier has item price
+            $pt_price = $this->getPriceTierItemPrice($pt_id, $cv);
+
+            if ($pt_price == null)
+                $price = $this->getServiceTypeFee($cv);
+            else
+                $price = $pt_price;
 
             // add the service fee to items
             $qty = 1;
@@ -27,22 +53,33 @@ class JumpstartWarranty implements InvoiceRuleInterface
                 'service_type' => $this->getID(),
                 'qty' => $qty,
                 'title' => $this->getServiceTitle(),
-                'price' => $fee,
+                'price' => $price,
             ];
 
-            $qty_price = bcmul($fee, $qty, 2);
+            $qty_price = bcmul($price, $qty, 2);
             $total['total_price'] = bcadd($total['total_price'], $qty_price, 2);
         }
 
         return $items;
     }
 
-    public function getServiceTypeFee()
-    {   
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 0;
+    public function getServiceTypeFee(CustomerVehicle $cv)
+    {
+        // check if user has motolite battery. 
+        // Motolite users now have a service fee for jumpstart warranty
+        if ($cv->hasMotoliteBattery())
+            $code = 'motolite_user_jumpstart_warranty_fee';
+        else
+            $code = 'jumpstart_warranty_fee';
+
+        // find the service fee using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function validatePromo($criteria, $promo_id)
@@ -55,6 +92,39 @@ class JumpstartWarranty implements InvoiceRuleInterface
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id, CustomerVehicle $cv)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+
+        // find the service offering
+        // check if user has motolite battery. 
+        // Motolite users now have a service fee for jumpstart warranty
+        if ($cv->hasMotoliteBattery())
+            $code = 'motolite_user_jumpstart_warranty_fee';
+        else
+            $code = 'jumpstart_warranty_fee';
+
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getServiceTitle()
     {
         $title = 'Service - Troubleshooting fee';

src/InvoiceRule/Overheat.php

@@ -2,12 +2,29 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
 use App\Ramcar\ServiceType;
 
+use App\Entity\ServiceOffering;
+use App\Entity\CustomerVehicle;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
+
 class Overheat implements InvoiceRuleInterface
-{   
+{
+    protected $em;
+    protected $pt_manager;
+
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
+    {
+        $this->em = $em;
+        $this->pt_manager = $pt_manager;
+    }
+
     public function getID()
     {   
         return 'overheat';
@@ -17,17 +34,22 @@ class Overheat implements InvoiceRuleInterface
     {
         $stype = $criteria->getServiceType();
         $has_coolant = $criteria->hasCoolant();
+        $pt_id = $criteria->getPriceTier();
 
         $items = [];
 
         if ($stype == $this->getID())
         {
-            // check if customer vehicle has a motolite battery
             $cv = $criteria->getCustomerVehicle();
-            if ($cv->hasMotoliteBattery())
-                $fee = 0;
+
+            // check if price tier has item price
+            $pt_price = $this->getPriceTierItemPrice($pt_id, $cv);
+
+            if ($pt_price == null)
+                $price = $this->getServiceTypeFee($cv);
             else
-                $fee = $this->getServiceTypeFee();
+
+                $price = $pt_price;
 
             // add the service fee to items
             $qty = 1;
@@ -35,10 +57,10 @@ class Overheat implements InvoiceRuleInterface
                 'service_type' => $this->getID(),
                 'qty' => $qty,
                 'title' => $this->getServiceTitle(),
-                'price' => $fee,
+                'price' => $price,
             ];
 
-            $qty_fee = bcmul($qty, $fee, 2);
+            $qty_fee = bcmul($qty, $price, 2);
             $total_price = $qty_fee;
 
             if ($has_coolant)
@@ -61,20 +83,37 @@ class Overheat implements InvoiceRuleInterface
         return $items;
     }
 
-    public function getServiceTypeFee()
-    {   
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 300;
+    public function getServiceTypeFee(CustomerVehicle $cv)
+    {
+        $code = 'overheat_fee';
+
+        // check if customer vehicle has a motolite battery
+        // if yes, set the code to the motolite user service fee
+        if ($cv->hasMotoliteBattery())
+            $code = 'motolite_user_service_fee';
+
+        // find the service fee for overheat using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function getCoolantFee()
     {
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 1600;
+        $code = 'coolant_fee';
+
+        // find the service fee using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+            
+        return $fee->getFee();
     }
 
     public function validatePromo($criteria, $promo_id)
@@ -87,6 +126,39 @@ class Overheat implements InvoiceRuleInterface
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id, CustomerVehicle $cv)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+
+        // find the service offering
+        $code = 'overheat_fee';
+
+        // check if customer vehicle has a motolite battery
+        // if yes, set the code to the motolite user service fee
+        if ($cv->hasMotoliteBattery())
+            $code = 'motolite_user_service_fee';
+
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getServiceTitle()
     {
         $title = 'Service - ' . ServiceType::getName(ServiceType::OVERHEAT_ASSISTANCE);

src/InvoiceRule/PostRecharged.php

@@ -2,10 +2,26 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
+use App\Entity\ServiceOffering;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
+
 class PostRecharged implements InvoiceRuleInterface
-{   
+{
+    protected $em;
+    protected $pt_manager;
+
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
+    {
+        $this->em = $em;
+        $this->pt_manager = $pt_manager;
+    }
+
     public function getID()
     {   
         return 'post_recharged';
@@ -14,22 +30,29 @@ class PostRecharged implements InvoiceRuleInterface
     public function compute($criteria, &$total)
     {
         $stype = $criteria->getServiceType();
+        $pt_id = $criteria->getPriceTier();
 
         $items = [];
 
         if ($stype == $this->getID())
         {
-            $fee = $this->getServiceTypeFee();
+            // check if price tier has item price
+            $pt_price = $this->getPriceTierItemPrice($pt_id);
+
+            if ($pt_price == null)
+                $price = $this->getServiceTypeFee();
+            else
+                $price = $pt_price;
 
             $qty = 1;
             $items[] = [
                 'service_type' => $this->getID(),
                 'qty' => $qty,
                 'title' => $this->getServiceTitle(),
-                'price' => $fee,
+                'price' => $price,
             ];
 
-            $qty_price = bcmul($fee, $qty, 2);
+            $qty_price = bcmul($price, $qty, 2);
             $total['total_price'] = bcadd($total['total_price'], $qty_price, 2);
 
         }
@@ -38,11 +61,17 @@ class PostRecharged implements InvoiceRuleInterface
     }
 
     public function getServiceTypeFee()
-    {   
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 300;
+    {
+        $code = 'post_recharged_fee';
+
+        // find the service fee for post recharged using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function validatePromo($criteria, $promo_id)
@@ -55,6 +84,33 @@ class PostRecharged implements InvoiceRuleInterface
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+
+        // find the service offering
+        $code = 'post_recharged_fee';
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getServiceTitle()
     {
         $title = 'Recharge fee';

src/InvoiceRule/PostReplacement.php

@@ -2,10 +2,26 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
+use App\Entity\ServiceOffering;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
+
 class PostReplacement implements InvoiceRuleInterface
-{  
+{
+    protected $em;
+    protected $pt_manager;
+
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
+    {
+        $this->em = $em;
+        $this->pt_manager = $pt_manager;
+    }
+
     public function getID()
     {   
         return 'post_replacement';
@@ -14,22 +30,29 @@ class PostReplacement implements InvoiceRuleInterface
     public function compute($criteria, &$total)
     {
         $stype = $criteria->getServiceType();
+        $pt_id = $criteria->getPriceTier();
 
         $items = [];
 
         if ($stype == $this->getID())
         {
-            $fee = $this->getServiceTypeFee();
+            // check if price tier has item price
+            $pt_price = $this->getPriceTierItemPrice($pt_id);
+
+            if ($pt_price == null)
+                $price = $this->getServiceTypeFee();
+            else
+                $price = $pt_price;
 
             $qty = 1;
             $items[] = [
                 'service_type' => $this->getID(),
                 'qty' => $qty,
                 'title' => $this->getServiceTitle(),
-                'price' => $fee,
+                'price' => $price,
             ];
 
-            $qty_price = bcmul($fee, $qty, 2);
+            $qty_price = bcmul($price, $qty, 2);
             $total['total_price'] = bcadd($total['total_price'], $qty_price, 2);
         }
 
@@ -37,11 +60,17 @@ class PostReplacement implements InvoiceRuleInterface
     }
 
     public function getServiceTypeFee()
-    {   
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 0;
+    {
+        $code = 'post_replacement_fee';
+
+        // find the service fee using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function validatePromo($criteria, $promo_id)
@@ -54,6 +83,33 @@ class PostReplacement implements InvoiceRuleInterface
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+
+        // find the service offering
+        $code = 'post_replacement_fee';
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getServiceTitle()
     {
         $title = 'Battery replacement';

src/InvoiceRule/Tax.php

@@ -2,12 +2,28 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
 use App\Ramcar\ServiceType;
 
+use App\Entity\ServiceOffering;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
+
 class Tax implements InvoiceRuleInterface
 {
+    protected $em;
+    protected $pt_manager;
+
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
+    {
+        $this->em = $em;
+        $this->pt_manager = $pt_manager;
+    }
+
     public function getID()
     {
         return 'tax';
@@ -29,6 +45,7 @@ class Tax implements InvoiceRuleInterface
 
         // compute tax per item if service type is battery sales
         $stype = $criteria->getServiceType();
+        $pt = $criteria->getPriceTier();
 
         if ($stype == ServiceType::BATTERY_REPLACEMENT_NEW)
         {
@@ -47,7 +64,13 @@ class Tax implements InvoiceRuleInterface
                 $battery = $entry['battery'];
                 $qty = $entry['qty'];
 
-                $price = $battery->getSellingPrice();
+                // check if price tier has item price for battery
+                $pt_price = $this->getPriceTierItemPrice($pt, $battery);
+
+                if ($pt_price == null)
+                    $price = $battery->getSellingPrice();
+                else
+                    $price = $pt_price;
 
                 $vat = $this->getTaxAmount($price, $tax_rate);
 
@@ -85,6 +108,25 @@ class Tax implements InvoiceRuleInterface
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id, $batt)
+    {
+        // price tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type battery
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'battery']);
+        if ($item_type == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $batt->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getTaxAmount($price, $tax_rate)
     {
         $vat_ex_price = $this->getTaxExclusivePrice($price, $tax_rate);
@@ -101,10 +143,16 @@ class Tax implements InvoiceRuleInterface
 
     protected function getTaxRate()
     {
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 0.12;
+        $code = 'tax';
+
+        // find the service fee using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+      
+        return $fee->getFee();
     }
 }
 

src/InvoiceRule/TireRepair.php

@@ -2,10 +2,27 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
+use App\Entity\ServiceOffering;
+use App\Entity\CustomerVehicle;
+use App\Entity\ItemType;
+
+use App\Service\PriceTierManager;
+
 class TireRepair implements InvoiceRuleInterface
-{  
+{
+    protected $em;
+    protected $pt_manager;
+
+    public function __construct(EntityManagerInterface $em, PriceTierManager $pt_manager)
+    {
+        $this->em = $em;
+        $this->pt_manager = $pt_manager;
+    }
+
     public function getID()
     {   
         return 'tire';
@@ -14,17 +31,22 @@ class TireRepair implements InvoiceRuleInterface
     public function compute($criteria, &$total)
     {
         $stype = $criteria->getServiceType();
+        $has_sealant = $criteria->hasSealant();
+        $pt_id = $criteria->getPriceTier();
 
         $items = [];
 
         if ($stype == $this->getID())
         {
-            // check if customer vehicle has a motolite battery
             $cv = $criteria->getCustomerVehicle();
-            if ($cv->hasMotoliteBattery())
-                $fee = 0;
+
+            // check if price tier has item price
+            $pt_price = $this->getPriceTierItemPrice($pt_id, $cv);
+
+            if ($pt_price == null)
+                $price = $this->getServiceTypeFee($cv);
             else
-                $fee = $this->getServiceTypeFee();
+                $price = $pt_price;
 
             // add the service fee to items
             $qty = 1;
@@ -32,22 +54,53 @@ class TireRepair implements InvoiceRuleInterface
                 'service_type' => $this->getID(),
                 'qty' => $qty,
                 'title' => $this->getServiceTitle(),
-                'price' => $fee,
+                'price' => $price,
             ];
 
-            $qty_price = bcmul($fee, $qty, 2);
-            $total['total_price'] = bcadd($total['total_price'], $qty_price, 2);
+            $qty_fee = bcmul($qty, $price, 2);
+            $total_price = $qty_fee;
+
+            if ($has_sealant)
+            {
+                $sealant_fee_data = $this->getSealantFeeData();
+
+                $sealant_fee = $sealant_fee_data['fee'];
+                $sealant_title = $sealant_fee_data['title'];
+
+                $items[] = [
+                    'service_type' => $this->getID(),
+                    'qty' => $qty,
+                    'title' => $sealant_title,
+                    'price' => $sealant_fee,
+                ];
+
+                $qty_price = bcmul($sealant_fee, $qty, 2);
+                $total_price = bcadd($total_price, $qty_price, 2);
+            }
+
+            $total['total_price'] = bcadd($total['total_price'], $total_price, 2);
         }
 
         return $items;
     }
 
-    protected function getServiceTypeFee()
-    {   
-        // TODO: we need to to put this somewhere like in .env
-        // so that if any chanages are to be made, we just edit the file
-        // instead of the code
-        return 300;
+    protected function getServiceTypeFee(CustomerVehicle $cv)
+    {
+        $code = 'tire_repair_fee';
+
+        // check if customer vehicle has a motolite battery
+        // if yes, set the code to the motolite user service fee
+        if ($cv->hasMotoliteBattery())
+            $code = 'motolite_user_service_fee';
+
+        // find the service fee using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee == null)
+            return 0;
+
+        return $fee->getFee();
     }
 
     public function validatePromo($criteria, $promo_id)
@@ -60,10 +113,67 @@ class TireRepair implements InvoiceRuleInterface
         return null;
     }
 
+    protected function getPriceTierItemPrice($pt_id, CustomerVehicle $cv)
+    {
+        // price_tier is default
+        if ($pt_id == 0)
+            return null;
+
+        // find the item type for service offering
+        $item_type = $this->em->getRepository(ItemType::class)->findOneBy(['code' => 'service_offering']);
+        if ($item_type == null)
+            return null;
+
+        // find the service offering
+        $code = 'tire_repair_fee';
+
+        // check if customer vehicle has a motolite battery
+        // if yes, set the code to the motolite user service fee
+        if ($cv->hasMotoliteBattery())
+            $code = 'motolite_user_service_fee';
+
+        $service = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        // check if service is null. If null, return null
+        if ($service == null)
+            return null;
+
+        $item_type_id = $item_type->getID();
+        $item_id = $service->getID();
+
+        $price = $this->pt_manager->getItemPrice($pt_id, $item_type_id, $item_id);
+
+        return $price;
+    }
+
     protected function getServiceTitle()
     {
         $title = 'Service - Flat Tire';
 
         return $title;
     }
+
+    public function getSealantFeeData()
+    {
+        $data = [
+            'fee' => 0.00,
+            'title' => '',
+        ];
+
+        $code = 'tire_sealant_fee';
+
+        // find the service fee using the code
+        // if we can't find the fee, return 0
+        $fee = $this->em->getRepository(ServiceOffering::class)->findOneBy(['code' => $code]);
+
+        if ($fee != null)
+        {
+            $data = [
+                'fee' => $fee->getFee(),
+                'title' => $fee->getName(),
+            ];
+        }
+
+        return $data;
+    }
 } 

src/InvoiceRule/TradeIn.php

@@ -2,12 +2,24 @@
 
 namespace App\InvoiceRule;
 
+use Doctrine\ORM\EntityManagerInterface;
+
 use App\InvoiceRuleInterface;
 
 use App\Ramcar\TradeInType;
+use App\Ramcar\ServiceType;
+
+use App\Entity\BatterySize;
 
 class TradeIn implements InvoiceRuleInterface
 {
+    protected $em;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->em = $em;
+    }
+
     public function getID()
     {
         return 'trade-in';
@@ -21,7 +33,6 @@ class TradeIn implements InvoiceRuleInterface
         $entries = $criteria->getEntries();
         foreach($entries as $entry)
         {
-            $batt = $entry['battery'];
             $qty = $entry['qty'];
             $trade_in_type = null;
 
@@ -30,7 +41,9 @@ class TradeIn implements InvoiceRuleInterface
 
             if ($trade_in_type != null)
             {
-                $ti_rate = $this->getTradeInRate($batt, $trade_in_type);
+                $batt_size = $entry['battery_size'];
+
+                $ti_rate = $this->getTradeInRate($batt_size, $trade_in_type);
 
                 $qty_ti = bcmul($ti_rate, $qty, 2);
 
@@ -40,8 +53,10 @@ class TradeIn implements InvoiceRuleInterface
                 $price = bcmul($ti_rate, -1, 2);
 
                 $items[] = [
+                    'battery_size' => $batt_size,
+                    'trade_in_type' => $trade_in_type,
                     'qty' => $qty,
-                    'title' => $this->getTitle($batt, $trade_in_type),
+                    'title' => $this->getTitle($batt_size, $trade_in_type),
                     'price' => $price,
                 ];
             }
@@ -57,13 +72,47 @@ class TradeIn implements InvoiceRuleInterface
 
     public function validateInvoiceItems($criteria, $invoice_items)
     {
+        // check service type. Only battery sales and battery warranty should have invoice items. 
+        $stype = $criteria->getServiceType();
+        if ($stype != ServiceType::BATTERY_REPLACEMENT_NEW)
+            return null;
+
+        // return error if there's a problem, false otherwise
+        if (!empty($invoice_items))
+        {
+            // check if this is a valid battery
+            foreach ($invoice_items as $item)
+            {
+                if (isset($item['battery_size']))
+                {
+                    $battery_size = $this->em->getRepository(BatterySize::class)->find($item['battery_size']);
+
+                    if (empty($battery_size))
+                    {
+                        $error = 'Invalid battery size specified.';
+                        return $error;
+                    }
+
+                    // quantity
+                    $qty = $item['quantity'];
+                    if ($qty < 1)
+                        continue;
+
+                    // check if trade in is set and if trade in type if valid
+                    if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in']))
+                    {
+                        $trade_in = $item['trade_in'];
+                        $criteria->addTradeInEntry($battery_size, $trade_in, $qty);
+                    }
+                }
+            }
+        }
+
         return null;
     }
 
-    protected function getTradeInRate($battery, $trade_in_type)
+    protected function getTradeInRate($size, $trade_in_type)
     {
-        $size = $battery->getSize();
-
         switch ($trade_in_type)
         {
             case TradeInType::MOTOLITE:
@@ -77,9 +126,9 @@ class TradeIn implements InvoiceRuleInterface
         return 0;
     }
 
-    protected function getTitle($battery, $trade_in_type)
+    protected function getTitle($battery_size, $trade_in_type)
     {
-        $title = 'Trade-in ' . TradeInType::getName($trade_in_type) . ' ' . $battery->getSize()->getName() . ' battery';
+        $title = 'Trade-in ' . TradeInType::getName($trade_in_type) . ' ' . $battery_size->getName() . ' battery';
 
         return $title;
     }

src/Ramcar/DeliveryStatus.php

@@ -23,8 +23,8 @@ class DeliveryStatus extends NameValue
     const COLLECTION = [
         'rider_assign' => 'Assigned Rider',
         'requeue' => 'Requeue',
-        'accept' => 'Rider Accept',
-        'arrive' => 'Rider Arrive',
+        'rider_accept' => 'Rider Accept',
+        'rider_arrive' => 'Rider Arrive',
         'rider_edit' => 'Rider Edit',
         'rider_depart_hub' => 'Rider Depart Hub',
         'rider_arrive_hub_pre_jo' => 'Rider Arrive Hub Pre JO',

src/Ramcar/HubCriteria.php

@@ -12,6 +12,7 @@ class HubCriteria
     protected $limit_results;        // number of results to return
     protected $limit_distance;       // distance limit for search in km
     protected $flag_inventory_check; // flag if we need to check for inventory
+    protected $flag_riders_check;    // flag if we need to check for riders available
     protected $jo_type;              // jo service needed
     protected $date_time;            // date and time to check if hub is open or not
     protected $items;                // array of items: items[sku] = quantity to check for 
@@ -20,6 +21,10 @@ class HubCriteria
     protected $flag_round_robin;     // flag if we use round robin or not
     protected $jo_id;                // JO id. This is null if called from mobile API
     protected $customer_id;          // customer id
+    protected $customer_class;       // customer class
+    protected $order_date;           // date JO was created
+    protected $service_type;          // service type of JO
+    protected $jo_origin;              // origin of JO
 
     public function __construct()
     {
@@ -29,12 +34,17 @@ class HubCriteria
         $this->jo_type = '';
         $this->date_time = new DateTime();
         $this->flag_inventory_check = false;
+        $this->flag_riders_check = false;
         $this->items = [];
         $this->payment_method = '';
-        $flag_emergency = false;
-        $flag_round_robin = false;
-        $jo_id = null;
-        $customer_id = null;
+        $this->flag_emergency = false;
+        $this->flag_round_robin = false;
+        $this->jo_id = null;
+        $this->customer_id = null;
+        $this->customer_class = null;
+        $this->order_date = new DateTime();
+        $this->service_type = null;
+        $this->jo_origin = null;
     }
 
     public function setPoint(Point $point)
@@ -81,6 +91,17 @@ class HubCriteria
         return $this->flag_inventory_check;
     }
 
+    public function setRidersCheck($flag_riders_check = true)
+    {
+        $this->flag_riders_check = $flag_riders_check;
+        return $this;
+    }
+
+    public function hasRidersCheck()
+    {
+        return $this->flag_riders_check;
+    }
+
     public function setJoType($jo_type)
     {
         // TODO: validate the jo type
@@ -171,5 +192,48 @@ class HubCriteria
         return $this->customer_id;
     }
 
+    public function setCustomerClass($customer_class)
+    {
+        $this->customer_class = $customer_class;
+        return $this;
+    }
+
+    public function getCustomerClass()
+    {
+        return $this->customer_class;
+    }
+
+    public function setOrderDate($order_date)
+    {
+        $this->order_date = $order_date;
+        return $this;
+    }
+
+    public function getOrderDate()
+    {
+        return $this->order_date;
+    }
+
+    public function setServiceType($service_type)
+    {
+        $this->service_type = $service_type;
+        return $this;
+    }
+
+    public function getServiceType()
+    {
+        return $this->service_type;
+    }
+
+    public function setJoOrigin($jo_origin)
+    {
+        $this->jo_origin = $jo_origin;
+        return $this;
+    }
+
+    public function getJoOrigin()
+    {
+        return $this->jo_origin;
+    }
 }
 

src/Ramcar/InsuranceApplicationStatus.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Ramcar;
+
+class InsuranceApplicationStatus extends NameValue
+{
+    const CREATED   = 'created';
+    const PAID      = 'paid';
+    const COMPLETED = 'completed';
+    const CANCELLED = 'cancelled';
+
+    const COLLECTION = [
+        'created' => 'Created',
+        'paid' => 'Paid',
+        'completed' => 'Completed',
+        'cancelled' => 'Cancelled',
+    ];
+}

src/Ramcar/InsuranceBodyType.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Ramcar;
+
+class InsuranceBodyType extends NameValue
+{
+    const SEDAN = 'sedan';
+    const SUV = 'suv';
+    const TRUCK = 'truck';
+    const MOTORCYCLE = 'motorcycle';
+
+    const COLLECTION = [
+        'SEDAN' => 'Sedan',
+        'SUV' => 'SUV',
+        'TRUCK' => 'Truck',
+        'MOTORCYCLE' => 'Motorcycle',
+    ];
+}

src/Ramcar/InsuranceClientType.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Ramcar;
+
+class InsuranceClientType extends NameValue
+{
+    const INDIVIDUAL    = 'i';
+    const CORPORATE     = 'c';
+
+    const COLLECTION = [
+        'i' => 'Individual',
+        'c' => 'Corporate',
+    ];
+}

src/Ramcar/InsuranceMVType.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Ramcar;
+
+class InsuranceMVType extends NameValue
+{
+    const CAR               = '1';
+    const SHUTTLE_BUS       = '2';
+    const MOTORCYCLE        = '3';
+    const MC_WITH_SIDECAR   = '4';
+    const NON_CONVENTIONAL  = '5';
+    const SUV               = '8';
+    const TRUCK             = '9';
+    const TRAILER           = '10';
+    const UV_PRIVATE        = '11';
+    const UV_COMMERCIAL     = '12';
+    const TRICYCLE          = '13';
+
+    const COLLECTION = [
+        '1' => "Car",
+        '2' => "Shuttle Bus",
+        '3' => "Motorcycle",
+        '4' => "Motorcycle with Sidecar",
+        '5' => "Non-Conventional MV",
+        '8' => "Sports Utility Vehicle",
+        '9' => "Truck",
+        '10' => "Trailer",
+        '11' => "UV Private",
+        '12' => "UV Commercial",
+        '13' => "Tricycle",
+    ];
+}

src/Ramcar/InsuranceVehicleLine.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Ramcar;
+
+class InsuranceVehicleLine extends NameValue
+{
+    const PCOC = 'pcoc';
+    const MCOC = 'mcoc';
+    const CCOC = 'ccoc';
+    const LCOC = 'lcoc';
+
+    const COLLECTION = [
+        'pcoc' => 'Private Car',
+        'mcoc' => 'Motorcycle / Motorcycle with Sidecar / Tricycle (Private)',
+        'ccoc' => 'Commercial Vehicle',
+        'lcoc' => 'Motorcycle / Motorcycle with Sidecar / Tricycle (Public)',
+    ];
+}

src/Ramcar/InvoiceCriteria.php

@@ -16,6 +16,9 @@ class InvoiceCriteria
     protected $discount;
     protected $service_charges;
     protected $flag_taxable;
+    protected $source;       // use Ramcar's TransactionOrigin 
+    protected $price_tier;
+    protected $flag_sealant;
 
     // entries are battery and trade-in combos
     protected $entries;
@@ -30,6 +33,9 @@ class InvoiceCriteria
         $this->discount = 0;
         $this->service_charges = [];
         $this->flag_taxable = false;
+        $this->source = '';
+        $this->price_tier = 0;    // set to default
+        $this->flag_sealant = false;
     }
 
     public function setServiceType($stype)
@@ -106,6 +112,17 @@ class InvoiceCriteria
         $this->entries[] = $entry;
     }
 
+    public function addTradeInEntry($battery_size, $trade_in, $qty)
+    {
+        $entry = [
+            'battery_size' => $battery_size,
+            'trade_in' => $trade_in,
+            'qty' => $qty
+        ];
+
+        $this->entries[] = $entry;
+    }
+
     public function getEntries()
     {
         return $this->entries;
@@ -166,4 +183,36 @@ class InvoiceCriteria
         return $this->flag_taxable;
     }
 
+    public function setSource($source)
+    {
+        $this->source = $source;
+        return $this;
+    }
+
+    public function getSource()
+    {
+        return $this->source;
+    }
+
+    public function setPriceTier($price_tier)
+    {
+        $this->price_tier = $price_tier;
+        return $this;
+    }
+
+    public function getPriceTier()
+    {
+        return $this->price_tier;
+    }
+
+    public function setHasSealant($flag = true)
+    {
+        $this->flag_sealant = $flag;
+        return $this;
+    }
+
+    public function hasSealant()
+    {
+        return $this->flag_sealant;
+    }
 }

src/Ramcar/JORejectionReason.php

@@ -4,17 +4,24 @@ namespace App\Ramcar;
 
 class JORejectionReason extends NameValue
 {
-	const ADMINISTRATIVE 		= 'administrative';
-    const NO_STOCK_SALES    	= 'no_stock_sales';
-    const NO_STOCK_SERVICE		= 'no_stock_service';
-    const LINE_NO_ANSWER    	= 'line_no_answer';
-    const LINE_BUSY				= 'line_busy';
-    const NO_RIDER_AVAILABLE    = 'no_rider_available';
-    const NO_RIDER_IN_TRANSIT	= 'no_rider_in_transit';
-    const REFUSAL				= 'refusal';
-    const STORE_CLOSED          = 'store_closed';
-    const NO_CREDIT_CARD        = 'no_credit_card';
-    const DISCOUNT              = 'discount';
+	const ADMINISTRATIVE 		    = 'administrative';
+    const NO_STOCK_SALES    	    = 'no_stock_sales';
+    const NO_STOCK_SERVICE		    = 'no_stock_service';
+    const LINE_NO_ANSWER    	    = 'line_no_answer';
+    const LINE_BUSY				    = 'line_busy';
+    const NO_RIDER_AVAILABLE        = 'no_rider_available';
+    const NO_RIDER_IN_TRANSIT	    = 'no_rider_in_transit';
+    const REFUSAL				    = 'refusal';
+    const STORE_CLOSED              = 'store_closed';
+    const NO_CREDIT_CARD            = 'no_credit_card';
+    const DISCOUNT                  = 'discount';
+    const STORE_CLOSED_SCHEDULED 	= 'store_closed_scheduled';
+    const STORE_CLOSED_HALF_DAY 	= 'store_closed_half_day';
+    const STORE_CLOSED_NO_ADVISE 	= 'store_closed_no_advise';
+    const PRIORITY_HUB_WTY_CLAIM 	= 'priority_hub_wty_claim';
+    const PRIORITY_HUB_JUMPSTART 	= 'priority_hub_jumpstart';
+    const PRIORITY_HUB_RESQ_REQUEST = 'priority_hub_resq_req';
+    const CUSTOMER_REQUEST 		    = 'customer_request';
 
     const COLLECTION = [
 		'administrative' => 'ADMINISTRATIVE',
@@ -28,5 +35,16 @@ class JORejectionReason extends NameValue
         'store_closed' => 'STORE CLOSED',
         'no_credit_card' => 'NO CREDIT CARD PAYMENT / NO TERMINAL',
         'discount' => 'DISCOUNT',
+        'store_closed_scheduled' => 'STORE CLOSED (ON SCHEDULE)',
+        'store_closed_half_day' => 'STORE CLOSED (HALF DAY)',
+        'store_closed_no_advise' => 'STORE CLOSED (NO ADVISE)',
+        'priority_hub_wty_claim' => 'PRIORITY HUB OUTLET FOR WARRANTY CLAIM',
+        'priority_hub_jumpstart' => 'PRIORITY HUB OUTLET FOR JUMPSTART',
+        'priority_hub_resq_req' => 'PRIORITY HUB OUTLET FOR RESQ-Q REQUEST',
+        'customer_request' => 'CUSTOMER REQUEST',
+    ];
+
+    const BLACKLIST = [
+        self::ADMINISTRATIVE => true,
     ];
 }

src/Ramcar/NameValue.php

@@ -4,9 +4,21 @@ namespace App\Ramcar;
 
 class NameValue
 {
+    const BLACKLIST = [];
+    
     static public function getCollection()
     {
-        return static::COLLECTION;
+        $result = [];
+        $blacklist = static::getBlacklist();
+
+        // filter from blacklist
+        foreach(static::COLLECTION as $key => $row) {
+            if (!isset($blacklist[$key])) {
+                $result[$key] = $row;
+            }
+        }
+
+        return $result;
     }
 
     static public function validate($value)
@@ -24,4 +36,9 @@ class NameValue
 
         return 'Unknown';
     }
+
+    static public function getBlacklist()
+    {
+        return static::BLACKLIST ?? [];
+    }
 }

src/Ramcar/TransactionOrigin.php

@@ -12,25 +12,31 @@ class TransactionOrigin extends NameValue
     const WALK_IN           = 'walk_in';
     const LAZADA            = 'lazada';
     const THIRD_PARTY       = 'third_party';
+    const SHOPIFY           = 'shopify';
     const YOKOHAMA_OP_FACEBOOK = 'yokohama_op_facebook';
     const YOKOHAMA_TWITTER     = 'yokohama_twitter';
     const YOKOHAMA_INSTAGRAM   = 'yokohama_instagram';
     const YOKOHAMA_CAROUSELL   = 'yokohama_carousell';
+    const HOTLINE_CEBU      = 'hotline_cebu';
+    const FACEBOOK_CEBU     = 'facebook_cebu';
 
     // TODO: for now, resq also gets the walk-in option
     // resq also gets new YOKOHAMA options
     const COLLECTION = [
-        'call' => 'Hotline',
+        'call' => 'Hotline Manila',
+        'hotline_cebu' => 'Hotline Cebu',
         'online' => 'Online',
-        'facebook' => 'Facebook',
+        'facebook' => 'Facebook Manila',
+        'facebook_cebu' => 'Facebook Cebu',
         'vip' => 'VIP',
         'mobile_app' => 'Mobile App',
         'walk_in' => 'Walk-in',
         'lazada' => 'Lazada',
         'third_party' => 'Third Party',
+        'shopify' => 'Shopify',
         'yokohama_op_facebook' => 'Yokohama OP Facebook',
         'yokohama_twitter' => 'Yokohama Twitter',
         'yokohama_instagram' => 'Yokohama Instagram',
-        'yokohama_carousell' => 'Yokohama Carousell',
+        'yokohama_carousell' => 'Yokohama Carousell'
     ];
 }

src/Ramcar/TransactionStatus.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Ramcar;
+
+class TransactionStatus extends NameValue
+{
+    const PENDING       = 'pending';
+    const PAID          = 'paid';
+    const CANCELLED     = 'cancelled';
+    const REFUNDED      = 'refunded';
+
+    const COLLECTION = [
+        'pending' => 'Pending',
+        'paid' => 'Paid',
+        'cancelled' => 'Cancelled',
+        'refunded' => 'Refunded',
+    ];
+}

src/Service/FCMSender.php

@@ -2,6 +2,7 @@
 
 namespace App\Service;
 
+use App\Entity\Customer;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Fcm\FcmClient;
 use Fcm\Push\Notification;
@@ -53,42 +54,62 @@ class FCMSender
 
     public function sendJoEvent(JobOrder $job_order, $title, $body, $data = [])
     {
-        // get all v2 sessions
+        // get customer object
+        $cust = $job_order->getCustomer();
+        
+        // attach jo info
+        $data['jo_id'] = $job_order->getID();
+        $data['jo_status'] = $job_order->getStatus();
+
+        // send the event
+        return $this->sendEvent($cust, $title, $body, $data);
+    }
+
+    public function sendEvent(Customer $cust, $title, $body, $data = [])
+    {
+        // get all v2 devices
+        $devices = $this->getDevices($cust);
+
+        if (empty($devices)) {
+            return false;
+        }
+
+        // send fcm notification
+        $result = $this->send(array_keys($devices), $this->translator->trans($title), $this->translator->trans($body), $data);
+
+        return $result;
+    }
+
+    protected function getDevices(Customer $cust)
+    {
         $sessions = [];
-        $cust_user = $job_order->getCustomer()->getCustomerUser();
+        $device_ids = [];
+
+        $cust_user = $cust->getCustomerUser();
         if (!empty($cust_user)) {
             $sessions = $cust_user->getMobileSessions();
         }
 
         if (empty($sessions)) {
             error_log("no sessions to send fcm notification to");
-            return;
+            return false;
         }
 
-        $device_ids = [];
-
         // send to every customer session
         foreach ($sessions as $sess) {
             $device_id = $sess->getDevicePushID();
 
             if (!empty($device_id) && !isset($device_ids[$device_id])) {
-                // send fcm notification
+                // send to this device
                 $device_ids[$device_id] = true;
             }
         }
 
         if (empty($device_ids)) {
             error_log("no devices to send fcm notification to");
-            return;
+            return false;
         }
 
-        // attach jo info
-        $data['jo_id'] = $job_order->getID();
-        $data['jo_status'] = $job_order->getStatus();
-
-        // send fcm notification
-        $result = $this->send(array_keys($device_ids), $this->translator->trans($title), $this->translator->trans($body), $data);
-
-        return $result;
+        return $device_ids;
     }
 }

src/Service/HubDistributor.php

@@ -81,6 +81,7 @@ class HubDistributor
                     'distance' => $hub_data['distance'],
                     'duration' => $hub_data['duration'],
                     'jo_count' => $hub_jo_count,
+                    'inventory' => $hub_data['inventory'] ?? 0,
                 ];
             }
             else
@@ -91,6 +92,7 @@ class HubDistributor
                     'distance' => $hub_data['distance'],
                     'duration' => $hub_data['duration'],
                     'jo_count' => 0,
+                    'inventory' => $hub_data['inventory'] ?? 0,
                 ];
             }
         }

src/Service/HubFilter/BaseHubFilter.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Service\HubFilter;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+use App\Service\HubFilterLogger;
+use App\Entity\Hub;
+use App\Entity\JobOrder;
+use App\Entity\JORejection;
+use App\Ramcar\ServiceType;
+use App\Ramcar\JORejectionReason;
+use App\Service\RisingTideGateway;
+
+use DateTime;
+
+class BaseHubFilter
+{
+    protected $id;
+    protected $jo_id;
+    protected $customer_id;
+    protected $hub_filter_logger;
+    protected $em;
+    protected $rt;
+    protected $trans;
+
+    public function __construct(HubFilterLogger $hub_filter_logger, EntityManagerInterface $em, RisingTideGateway $rt, TranslatorInterface $trans)
+    {
+        $this->hub_filter_logger = $hub_filter_logger;
+        $this->em = $em;
+        $this->rt = $rt;
+        $this->trans = $trans;
+
+        error_log("-------------------");
+        error_log("HUB FILTER RUNNING: " . $this->getID());
+        error_log("-------------------");
+    }
+
+    public function getID(): string
+    {
+        return $this->id;
+    }
+
+    public function setJOID(int $jo_id)
+    {
+        $this->jo_id = $jo_id;
+        return $this;
+    }
+
+    public function getJOID(): int
+    {
+        return $this->jo_id;
+    }
+
+    public function setCustomerID(int $customer_id)
+    {
+        $this->customer_id = $customer_id;
+        return $this;
+    }
+
+    public function getCustomerID(): int
+    {
+        return $this->customer_id;
+    }
+
+    public function log(Hub $hub): void
+    {
+        $this->hub_filter_logger->logFilteredHub($hub, $this->getID(), $this->getJOID(), $this->getCustomerID());
+
+        // log to file
+        $filename = '/../../../var/log/hub_rejection.log';
+        $date = date("Y-m-d H:i:s");
+
+        // build log entry
+        $entry = implode("", [
+            "[JO: " . $this->getJOID() . "]",
+            "[" . $date . "]",
+            "[" . $this->getID() . "]",
+            " " . $hub->getName() . " (ID: " . $hub->getID() . ")",
+            "\r\n",
+        ]);
+
+        @file_put_contents(__DIR__ . $filename, $entry, FILE_APPEND);
+    }
+
+    protected function createRejectionEntry($hub, $reason, $remarks = ""): JORejection 
+    {
+        $jo = $this->em->getRepository(JobOrder::class)->find($this->getJOID());
+
+        $robj = new JORejection();
+        $robj->setDateCreate(new DateTime())
+            ->setHub($hub)
+            ->setJobOrder($jo)
+            ->setReason($reason)
+            ->setRemarks(implode(" ", ["Automatically filtered by hub selector.", $remarks]));
+
+        $this->em->persist($robj);
+        $this->em->flush();
+
+        return $robj;
+    }
+
+    protected function sendSMSMessage($hub, $order_date, $service_type, $rejection, $reason = "", $remarks = ""): void
+    {
+        $jo_id = $this->getJOID();
+        
+        // check if we already have a rejection record for this hub and JO. this also means an SMS was already sent
+        $rejection_count = $this->em->createQueryBuilder()
+            ->select('count(r)')
+            ->from(JORejection::class, 'r')
+            ->where('r.job_order = :jo_id')
+            ->andWhere('r.hub = :hub_id')
+            ->andWhere('r.id != :rejection_id')
+            ->setParameter('jo_id', $jo_id)
+            ->setParameter('hub_id', $hub->getID())
+            ->setParameter('rejection_id', $rejection->getID())
+            ->getQuery()
+            ->getSingleScalarResult();
+
+        // if we already have a rejection record for this hub and JO, do not send another SMS
+        if ($rejection_count >= 1) {
+            error_log("ALREADY SENT REJECTION SMS TO HUB " . $hub->getID() . " FOR JO " . $jo_id);
+            return;
+        }
+
+        $message = 'Job Order #: ' . $jo_id . "\n" .
+            'Order Date and Time: ' . $order_date->format('d M Y g:i A') . "\n" .
+            'Date and Time Rejected: ' . $rejection->getDateCreate()->format('d M Y g:i A') . "\n" .
+            'Enrollee Name: ' . implode(" - ", [$hub->getName(), $hub->getBranch()]) . "\n" .
+            'Reason of Rejection: ' . $reason . "\n" .
+            'Remarks: ' . $remarks . "\n" .
+            'Type of Service: ' . ServiceType::getName($service_type);
+
+        error_log("SENDING SMS MESSAGE:\r\n" . $message);
+
+        // send SMS message to hub
+        $this->rt->sendSMS(
+            $hub->getNotifNumber(),
+            $this->trans->trans('message.battery_brand_allcaps'),
+            $message
+        );
+    }
+}

src/Service/HubFilter/Filters/DateAndTimeHubFilter.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Service\HubFilter\Filters;
+
+use App\Service\HubFilter\BaseHubFilter;
+use App\Service\HubFilter\HubFilterInterface;
+
+class DateAndTimeHubFilter extends BaseHubFilter implements HubFilterInterface
+{
+    protected $id = 'date_and_time';
+
+    public function getRequestedParams() : array
+    {
+        return [
+            'date_time',
+        ];
+    }
+
+    public function filter(array $hubs, array $params = []) : array
+    {
+        if ($params['date_time'] == null)
+            return $hubs;
+
+        $results = [];
+
+        foreach ($hubs as $hub_data)
+        {
+            // go through each hub's opening times to check if hub is open 
+            // for the specified time
+            // get hub opening and closing times
+            // TODO: maybe in the future, might also have to check if hub
+            // is open/available on date/day
+            $hub = $hub_data['hub'];
+
+            $time_open = $hub->getTimeOpen()->format("H:i:s");
+            $time_close = $hub->getTimeClose()->format("H:i:s");
+
+            $filter_time = $params['date_time']->format("H:i:s");
+
+            if (($filter_time >= $time_open) &&
+                ($filter_time <= $time_close))
+            {
+                $results[] = [
+                    'hub' => $hub,
+                    'db_distance' => $hub_data['db_distance'],
+                    'distance' => $hub_data['distance'],
+                    'duration' => $hub_data['duration'],
+                    'jo_count' => 0,
+                    'inventory' => $hub_data['inventory'],
+                ];
+            }
+            else
+                $this->log($hub);
+        }
+        
+        return $results;
+    }
+}

src/Service/HubFilter/Filters/InventoryHubFilter.php

@@ -0,0 +1,164 @@
+<?php
+
+namespace App\Service\HubFilter\Filters;
+
+use App\Service\HubFilter\BaseHubFilter;
+use App\Service\HubFilter\HubFilterInterface;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+use App\Ramcar\JORejectionReason;
+use App\Ramcar\ServiceType;
+use App\Ramcar\CustomerClassification;
+use App\Service\InventoryManager;
+use App\Service\HubFilterLogger;
+use App\Service\RisingTideGateway;
+use App\Entity\Battery;
+use App\Ramcar\TransactionOrigin;
+
+class InventoryHubFilter extends BaseHubFilter implements HubFilterInterface
+{
+    protected $id = 'no_inventory';
+    protected $im;
+
+    public function __construct(HubFilterLogger $hub_filter_logger, EntityManagerInterface $em, RisingTideGateway $rt, TranslatorInterface $trans, InventoryManager $im)
+    {
+        parent::__construct($hub_filter_logger, $em, $rt, $trans);
+        $this->im = $im;
+    }
+
+    public function getRequestedParams() : array
+    {
+        return [
+            'flag_inventory_check',
+            'customer_class',
+            'jo_type',
+            'jo_origin',
+            'order_date',
+            'service_type',
+            'items',
+        ];
+    }
+
+    public function filter(array $hubs, array $params = []) : array
+    {
+        // check if this is enabled
+        if (!$params['flag_inventory_check']) {
+            error_log("INVENTORY CHECK " . $this->getJOID() . ": DISABLED");
+            return $hubs;
+        }
+
+        // check customer class
+        if ((!empty($params['customer_class']) && $params['customer_class'] == CustomerClassification::VIP) ||
+            $params['jo_origin'] === TransactionOrigin::VIP) {
+            error_log("INVENTORY CHECK " . $this->getJOID() . ": VIP CLASS");
+            return $hubs;
+        }
+        
+        // check item list is not empty
+        if (empty($params['items'])) {
+            error_log("INVENTORY CHECK " . $this->getJOID() . ": NO ITEMS");
+            return $hubs;
+        }
+
+        // check this is a battery item related JO
+        if ($params['jo_type'] != ServiceType::BATTERY_REPLACEMENT_NEW &&
+            $params['jo_type'] != ServiceType::BATTERY_REPLACEMENT_WARRANTY
+        ) {
+            error_log("INVENTORY CHECK " . $this->getJOID() . ": INVALID SERVICE TYPE: " . $params['jo_type']);
+            return $hubs;
+        }
+
+        // get a list of all hubs with branch codes
+        $branch_codes = [];
+        foreach ($hubs as $hub_data) {
+            $branch_code = $hub_data['hub']->getBranchCode();
+            if (!empty($branch_code)) {
+                $branch_codes[] = $branch_code;
+            }
+        };
+
+        $hubs_to_filter = [];
+        $results = [];
+        $qtys = [];
+        
+        // call inventory manager for all hubs for selected SKUs
+        $skus = array_keys($params['items']);
+
+        error_log("CHECKING INVENTORY FOR " . count($skus) . " ITEM(S) ON HUBS " . count($branch_codes) . "...");
+
+        $branches = $this->im->getBranchesInventory($branch_codes, $skus);
+
+        error_log("REQUEST COMPLETE, RESULT COUNT: " . count($branches));
+        
+        // check each result to see if sufficient quantity exists to meet request
+        foreach ($branches as $branch) {
+            if (isset($branch['BranchCode'])) {
+                // filter out branch if it does not have sufficient inventory
+                if (!isset($params['items'][$branch['SapCode']]) || $branch['Quantity'] < $params['items'][$branch['SapCode']] &&
+                    !isset($hubs_to_filter[$branch['BranchCode']])
+                ) {
+                    error_log("FILTERING BRANCH WITH NO INVENTORY: " . $branch['BranchCode']);
+                    $hubs_to_filter[$branch['BranchCode']] = true;
+                } else {
+                    // save inventory count so we don't have to recheck later
+                    $qtys[$branch['BranchCode']] = $branch['Quantity'];
+                }
+            }
+        }
+
+        // get battery models for each requested SKU
+        $batteries = [];
+        foreach ($skus as $sku) {
+            $bobj = $this->em->getRepository(Battery::class)->findOneBy(['sap_code' => $sku]);
+            $batteries[] = implode(" ", [$bobj->getModel()->getName(), $bobj->getSize()->getName()]);
+        }
+        $battery_string = implode(", ", $batteries);
+
+        // remove filtered hubs from list
+        foreach ($hubs as $hub_data) {
+            $hub = $hub_data['hub'];
+            $branch_code = $hub_data['hub']->getBranchCode();
+
+            // check if we are filtering this hub
+            if (isset($hubs_to_filter[$branch_code]) || empty($branch_code) || !isset($qtys[$branch_code])) {
+                // if we have a JO, create rejection record and notify
+                $jo_id = $this->getJOID();
+
+                if (!empty($jo_id)) {
+                    // create rejection report entry
+                    $robj = $this->createRejectionEntry(
+                        $hub,
+                        JORejectionReason::NO_STOCK_SALES,
+                        "SKU(s): " . $battery_string,
+                    );
+
+                    // build SMS message
+                    $this->sendSMSMessage(
+                        $hub,
+                        $params['order_date'],
+                        $params['service_type'],
+                        $robj,
+                        JORejectionReason::getName(JORejectionReason::NO_STOCK_SALES),
+                        "Requested SKU(s) - " . $battery_string
+                    );
+                }
+
+                // log this filter
+                $this->log($hub);
+
+                error_log("FILTERED HUB " . $hub->getID() . " (no_inventory)");
+            } else {
+                // include inventory in hub data
+                $hub_data['inventory'] = $qtys[$branch_code];
+
+                // we only include branches with branch codes and quantities
+                $results[] = $hub_data;
+            }
+        }
+
+        // return filtered hubs
+        return $results;
+    }
+}

src/Service/HubFilter/Filters/JoTypeHubFilter.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Service\HubFilter\Filters;
+
+use App\Service\HubFilter\BaseHubFilter;
+use App\Service\HubFilter\HubFilterInterface;
+
+class JoTypeHubFilter extends BaseHubFilter implements HubFilterInterface
+{
+    protected $id = 'job_order_type';
+
+    public function getRequestedParams() : array
+    {
+        return [
+            'flag_emergency',
+            'jo_type',
+        ];
+    }
+
+    public function filter(array $hubs, array $params = []) : array
+    {
+        if ($params['flag_emergency'])
+            return $hubs;
+        
+        if (empty($params['jo_type']))
+            return $hubs;
+
+        $results = [];
+        foreach ($hubs as $hub_data)
+        {
+            $hub = $hub_data['hub'];
+
+            // TODO: for now, have this return true
+            $has_jo_type = true;
+            // check if hub offers the jo_type
+            // TODO: add service to hub
+            if ($has_jo_type)
+                $results[] = [
+                    'hub' => $hub,
+                    'db_distance' => $hub_data['db_distance'],
+                    'distance' => $hub_data['distance'],
+                    'duration' => $hub_data['duration'],
+                    'jo_count' => 0,
+                    'inventory' => $hub_data['inventory'],
+                ];
+            else
+                $this->log($hub);
+        }
+
+        return $results;
+    }
+}

src/Service/HubFilter/Filters/MaxResultsHubFilter.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Service\HubFilter\Filters;
+
+use App\Service\HubFilter\BaseHubFilter;
+use App\Service\HubFilter\HubFilterInterface;
+
+class MaxResultsHubFilter extends BaseHubFilter implements HubFilterInterface
+{
+    protected $id = 'max_results';
+
+    public function getRequestedParams() : array
+    {
+        return [
+            'limit_results',
+        ];
+    }
+
+    public function filter(array $hubs, array $params = []) : array
+    {
+        if (empty($params['limit_results']))
+            return $hubs;
+
+        $results = [];
+        for ($i = 0; $i < count($hubs); $i++)
+        {
+            if ($i < $params['limit_results'])
+                $results[] = $hubs[$i];
+            else
+                $this->log($hubs[$i]['hub']);
+        }
+
+        return $results;    
+    }
+}

src/Service/HubFilter/Filters/PaymentMethodHubFilter.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Service\HubFilter\Filters;
+
+use App\Service\HubFilter\BaseHubFilter;
+use App\Service\HubFilter\HubFilterInterface;
+
+class PaymentMethodHubFilter extends BaseHubFilter implements HubFilterInterface
+{
+    protected $id = 'no_payment_method';
+
+    public function getRequestedParams() : array
+    {
+        return [
+            'flag_emergency',
+            'payment_method',
+        ];
+    }
+
+    public function filter(array $hubs, array $params = []) : array
+    {
+        if ($params['flag_emergency'])
+            return $hubs;
+
+        if (empty($params['payment_method']))
+            return $hubs;
+
+        $results = [];
+        foreach ($hubs as $hub_data)
+        {
+            $hub = $hub_data['hub'];
+
+            // name of payment method is what is saved
+            $payment_methods = $hub->getPaymentMethods();
+            if ($payment_methods != null)
+            {
+                $flag_found_pmethod = false;
+                foreach ($payment_methods as $pmethod)
+                {
+                    if ($pmethod == $params['payment_method'])
+                    {
+                        $results[] = [
+                            'hub' => $hub,
+                            'db_distance' => $hub_data['db_distance'],
+                            'distance' => $hub_data['distance'],
+                            'duration' => $hub_data['duration'],
+                            'jo_count' => 0,
+                            'inventory' => $hub_data['inventory'],
+                        ];
+                    }
+                    $flag_found_pmethod = true;
+                }
+
+                if (!$flag_found_pmethod)
+                    $this->log($hub);
+            }
+            else
+                $this->log($hub);
+        }
+
+        return $results;
+    }
+}

src/Service/HubFilter/Filters/RiderAvailabilityHubFilter.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Service\HubFilter\Filters;
+
+use App\Service\HubFilter\BaseHubFilter;
+use App\Service\HubFilter\HubFilterInterface;
+
+use App\Ramcar\JORejectionReason;
+use App\Ramcar\CustomerClassification;
+
+class RiderAvailabilityHubFilter extends BaseHubFilter implements HubFilterInterface
+{
+    protected $id = 'no_available_rider';
+
+    public function getRequestedParams() : array
+    {
+        return [
+            'flag_riders_check',
+            'customer_class',
+            'order_date',
+            'service_type',
+        ];
+    }
+
+    public function filter(array $hubs, array $params = []) : array
+    {
+        // check if this is enabled
+        if (!$params['flag_riders_check']) {
+            return $hubs;
+        }
+
+        // check customer class
+        if (!empty($params['customer_class']) && $params['customer_class'] == CustomerClassification::VIP) {
+            error_log("RIDER CHECK " . $this->getJOID() . ": VIP CLASS");
+            return $hubs;
+        }
+
+        $results = [];
+
+        foreach ($hubs as $hub_data) {
+            $hub = $hub_data['hub'];
+            
+            $available_riders = count($hub->getAvailableRiders());
+            // check we have available riders
+            error_log("TOTAL RIDERS: " . $available_riders);
+            if ($available_riders === 0) {
+                // if we have a JO, create rejection record and notify
+                $jo_id = $this->getJOID();
+                
+                if (!empty($jo_id)) {
+                    // create rejection report entry
+                    $robj = $this->createRejectionEntry($hub, JORejectionReason::NO_RIDER_AVAILABLE);      
+
+                    // build SMS message
+                    $this->sendSMSMessage(
+                        $hub,
+                        $params['order_date'],
+                        $params['service_type'],
+                        $robj,
+                        JORejectionReason::getName(JORejectionReason::NO_RIDER_AVAILABLE),
+                    );
+                }
+                
+                // log this filter
+                $this->log($hub);
+
+                error_log("FILTERED HUB " . $hub->getID() . " (no_available_rider)");
+            } else {
+                $results[] = $hub_data;
+            }
+        }
+
+        return $results;
+    }
+}

src/Service/HubFilter/Filters/RoundRobinHubFilter.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Service\HubFilter\Filters;
+
+use App\Service\HubFilter\BaseHubFilter;
+use App\Service\HubFilter\HubFilterInterface;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+use App\Service\HubDistributor;
+use App\Service\HubFilterLogger;
+use App\Service\RisingTideGateway;
+
+class RoundRobinHubFilter extends BaseHubFilter implements HubFilterInterface
+{
+    protected $id = 'round_robin';
+    protected $hub_distributor;
+
+    public function __construct(HubFilterLogger $hub_filter_logger, EntityManagerInterface $em, RisingTideGateway $rt, TranslatorInterface $trans, HubDistributor $hub_distributor)
+    {
+        parent::__construct($hub_filter_logger, $em, $rt, $trans);
+        $this->hub_distributor = $hub_distributor;
+    }
+
+    public function getRequestedParams() : array
+    {
+        return [
+            'flag_round_robin',
+        ];
+    }
+
+    public function filter(array $hubs, array $params = []) : array
+    {
+        if (!$params['flag_round_robin'])
+            return $hubs;
+
+        $results = [];
+        
+        // call hub distributor service
+        $arranged_hubs = $this->hub_distributor->arrangeHubs($hubs);
+        $results = $arranged_hubs;
+
+        return $results;
+    }
+}