.env.dist

@@ -15,78 +15,4 @@ APP_SECRET=b344cd6cd151ae1d61403ed55806c5ce
 # Configure your db driver and server_version in config/packages/doctrine.yaml
 DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
 ###< doctrine/doctrine-bundle ###
-GMAPS_API_KEY=insert_gmapsapikey_here
-
-# rising tide sms gateway
-RT_USER=rt_user
-RT_PASS=rt_pass
-RT_USAGE_TYPE=rt_usage_type
-RT_SHORTCODE=1234
-
-
-# mosquitto client
-MQTT_IP_ADDRESS=localhost
-MQTT_PORT=8883
-MQTT_CERT=/location/of/cert/file.crt
-MQTT_WS_HOST=insert_ip_here
-MQTT_WS_PORT=8083
-
-# redis client
-REDIS_CLIENT_SCHEME=tcp
-REDIS_CLIENT_HOST=127.0.0.1
-REDIS_CLIENT_PORT=6379
-REDIS_CLIENT_PASSWORD=foobared
-
-# privacy policy ids
-POLICY_PROMO=insert_promopolicyid_here
-POLICY_THIRD_PARTY=insert_thirdpartypolicyid_here
-POLICY_MOBILE=insert_mobilepolicyid_here
-
-# OTP
-OTP_MODE=set_to_test_or_random
-
-# geofence
-GEOFENCE_ENABLE=set_to_true_or_false
-
-# unknown manufacturer and vehicle ids
-CVU_MFG_ID=insert_mfgid_for_unknown_vehicles
-CVU_BRAND_ID=insert_brandid_for_unknown_vehicles
-
-# country code prefix
-COUNTRY_CODE=+insert_country_code_here
-
-# redis hash
-LATEST_ACTIVE_JO=latest_active_jo
-
-# dashboard
-DASHBOARD_ENABLE=set_to_true_or_false
-
-# auth token for Inventory API
-INVENTORY_API_URL=insert_api_url_here
-INVENTORY_API_OCP=insert_ocp_text_here
-INVENTORY_API_AUTH_TOKEN_PREFIX=Bearer
-INVENTORY_API_AUTH_TOKEN=insert_auth_token_here
-
-# API logging
-API_LOGGING=set_to_true_or_false
-
-# customer distance limit in km for mobile
-CUST_DISTANCE_LIMIT=5
-
-# customer distance limit in km for admin panel
-CUST_DISTANCE_LIMIT_ADMIN_PANEL=5
-
-MAPTILER_API_KEY=map_tiler_api_key
-
-# API version
-API_VERSION=insert_api_version_here
-
-#SSL_ENABLE for websockets
-SSL_ENABLE=set_to_true_or_false
-
-# for hub filtering round robin
-HUB_JO_KEY=hub_jo_count
-
-# hub geofence
-HUB_GEOFENCE_ENABLE=set_to_true_or_false
-HUB_FILTER_ENABLE=set_to_true_or_false
+GMAPS_API_KEY=insertgmapsapikeyhere

.gitignore

@@ -4,14 +4,6 @@
 /public/bundles/
 /var/
 /vendor/
-/sql/
-/pem/
-/migration/
-/kml/
 ###< symfony/framework-bundle ###
 
 *.swp
-/public/warranty_uploads/*
-.vscode
-*__pycache__
-/public/assets/images/insurance-premiums.png

README.md

@@ -1,2 +0,0 @@
-MQTT format for location updates:
-`<latitude>:<longitude>`

composer.json

@@ -1,59 +1,22 @@
 {
     "type": "project",
     "license": "proprietary",
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/jankstudio/doctrine2-spatial.git"
-        },
-        {
-            "type": "vcs",
-            "url": "git@gitlab.com:jankstudio1/catalyst-2/api-bundle.git"
-        },
-        {
-            "type": "vcs",
-            "url": "git@gitlab.com:jankstudio1/catalyst-2/auth-bundle.git"
-        },
-        {
-            "type": "vcs",
-            "url": "git@gitlab.com:jankstudio1/catalyst-2/menu-bundle.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/arcticzero/php-fcm.git"
-        }
-    ],
     "require": {
         "php": "^7.1.3",
         "ext-iconv": "*",
-        "composer/package-versions-deprecated": "1.11.99.4",
-        "data-dog/audit-bundle": "^0.1.10",
-        "doctrine/common": "^2",
-        "doctrine/doctrine-bundle": "^2",
-        "doctrine/doctrine-migrations-bundle": "^2",
-        "doctrine/orm": "^2",
-        "edwinhoksberg/php-fcm": "dev-notif-priority-hotfix",
+        "creof/doctrine2-spatial": "^1.2",
         "guzzlehttp/guzzle": "^6.3",
-        "hashids/hashids": "^4.1",
-        "jankstudio/catalyst-api-bundle": "dev-master",
-        "jankstudio/catalyst-auth-bundle": "dev-master",
-        "jankstudio/catalyst-menu-bundle": "dev-master",
-        "jankstudio/doctrine-spatial": "dev-master",
-        "microsoft/azure-storage-blob": "^1.5",
-        "predis/predis": "^1.1",
         "sensio/framework-extra-bundle": "^5.1",
-        "setasign/fpdf": "^1.8",
-        "symfony/asset": "^4.0",
         "symfony/console": "^4.0",
         "symfony/debug": "^4.0",
         "symfony/filesystem": "^4.0",
         "symfony/flex": "^1.0",
         "symfony/framework-bundle": "^4.0",
+        "symfony/lts": "^4@dev",
         "symfony/maker-bundle": "^1.0",
-        "symfony/monolog-bundle": "^3.7",
-        "symfony/process": "^4.0",
+        "symfony/orm-pack": "^1.0",
+        "symfony/profiler-pack": "^1.0",
         "symfony/security-bundle": "^4.0",
-        "symfony/translation": "^4.0",
         "symfony/twig-bundle": "^4.0",
         "symfony/validator": "^4.0",
         "symfony/yaml": "^4.0"
@@ -61,24 +24,18 @@
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.0",
         "symfony/dotenv": "^4.0",
-        "symfony/stopwatch": "^4.0",
-        "symfony/thanks": "^1.0",
-        "symfony/web-profiler-bundle": "^4.0"
+        "symfony/thanks": "^1.0"
     },
     "config": {
         "preferred-install": {
             "*": "dist"
         },
-        "sort-packages": true,
-        "allow-plugins": {
-            "composer/package-versions-deprecated": true,
-            "symfony/flex": true,
-            "symfony/thanks": true
-        }
+        "sort-packages": true
     },
     "autoload": {
         "psr-4": {
-            "App\\": "src/"
+            "App\\": "src/",
+            "Catalyst\\": "catalyst-libs/"
         }
     },
     "autoload-dev": {

config/acl.yaml

@@ -34,32 +34,6 @@ access_keys:
           label: Update
         - id: role.delete
           label: Delete
-    - id: apiuser
-      label: API User Access
-      acls:
-        - id: apiuser.menu
-          label: Menu
-        - id: apiuser.list
-          label: List
-        - id: apiuser.add
-          label: Add
-        - id: apiuser.update
-          label: Update
-        - id: apiuser.delete
-          label: Delete
-    - id: apirole
-      label: API Role Access
-      acls:
-        - id: apirole.menu
-          label: Menu
-        - id: apirole.list
-          label: List
-        - id: apirole.add
-          label: Add
-        - id: apirole.update
-          label: Update
-        - id: apirole.delete
-          label: Delete
     - id: logistics
       label: Logistics Access
       acls:
@@ -156,8 +130,6 @@ access_keys:
           label: Update
         - id: customer.delete
           label: Delete
-        - id: customer.dpa
-          label: Display DPA
 
 
     - id: location
@@ -191,17 +163,6 @@ access_keys:
           label: Update
         - id: hub.delete
           label: Delete
-    - id: geofence
-      label: Geofence
-      acls:
-        - id: geofence.menu
-          label: Menu
-        - id: geofence.list
-          label: List
-        - id: geofence.add
-          label: Add
-        - id: geofence.delete
-          label: Delete
 
     - id: rider
       label: Rider Access
@@ -217,20 +178,6 @@ access_keys:
         - id: rider.delete
           label: Delete
 
-    - id: servicecharge
-      label: Service Charge
-      acls:
-        - id: service_charge.menu
-          label: Menu
-        - id: service_charge.list
-          label: List
-        - id: service_charge.add
-          label: Add
-        - id: service_charge.update
-          label: Update
-        - id: service_charge.delete
-          label: Delete
-
     - id: joborder
       label: Job Order
       acls:
@@ -239,54 +186,15 @@ access_keys:
         - id: jo_in.list
           label: Incoming
         - id: jo_proc.list
-          label: Dispatch 
-        - id: jo_proc.unlock
-          label: Dispatch Unlock
+          label: Processing
         - id: jo_assign.list
-          label: Rider Assignment
-        - id: jo_assign.unlock
-          label: Rider Assignment Unlock
-        - id: jo_fulfill.list
-          label: Fulfillment
-        - id: jo_open.list
-          label: Open
-        - id: jo_all.list
-          label: View All
-        - id: jo_pdf.list
-          label: PDF
-        - id: jo_open.edit
-          label: Edit
-        - id: joborder.cancel
-          label: Cancel
-        - id: jo_onestep.form
-          label: One-step Process
-        - id: jo_onestep.edit
-          label: One-step Process Edit
-        - id: jo_walkin.form
-          label: Walk-in
-        - id: jo_walkin.edit
-          label: Walk-in Edit
-        - id: jo_autoassign.test
-          label: Autoassign Test
-        - id: jo_hub.list
-          label: Hub View
-        - id: jo_cancel.fulfill
-          label: Fulfill Cancelled JO
-        - id: jo_resq_proc.list
-          label: RESQ Dispatch
+          label: Assigning
 
     - id: support
       label: Customer Support Access
       acls:
         - id: support.menu
           label: Menu
-        - id: general.search
-          label: Search
-        - id: warranty.search
-          label: Customer Battery Search
-        - id: warranty.upload
-          label: Warranty Upload
-
     - id: ticket
       label: Ticket Access
       acls:
@@ -314,289 +222,3 @@ access_keys:
           label: Update
         - id: promo.delete
           label: Delete
-
-    - id: report
-      label: Reports
-      acls:
-        - id: report.menu
-          label: Menu
-        - id: report.reject
-          label: Rejection Report
-        - id: report.battery.conflict
-          label: Battery Conflict Report
-        - id: report.popapp.comparison
-          label: Popapp Comparison Report
-        - id: report.meh.customer
-          label: RESQ MEH Customer Report
-        - id: report.warranty.class
-          label: Warranty Class Report
-        - id: report.vehicle.battery.compatibility
-          label: Vehicle Battery Compatibility Report
-        - id: report.warranty.details
-          label: Warranty Details Report
-        - id: report.jo.details
-          label: Job Order Details Report
-        - id: report.jo_events
-          label: Job Order Events Report
-        - id: report.sms_messages
-          label: SMS Messages Report
-        - id: report.jo.auto_assign
-          label: Auto Assigned Job Order Report
-        - id: report.jo.advance_order
-          label: Advance Order Job Order Report
-        - id: report.customer.source
-          label: Customer Source Report
-        - id: report.hub.filter
-          label: Hub Filter Report
-        - id: report.warranty.raffle
-          label: Warranty Raffle Report
-        - id: report.jo.raffle
-          label: JO Raffle Report
-
-    - id: service
-      label: Other Services
-      acls:
-        - id: service.menu
-          label: Menu
-        - id: service.list
-          label: List
-        - id: service.add
-          label: Add
-        - id: service.update
-          label: Update
-        - id: service.delete
-          label: Delete
-
-    - id: partner
-      label: Partners
-      acls:
-        - id: partner.menu
-          label: Menu
-        - id: partner.list
-          label: List
-        - id: partner.add
-          label: Add
-        - id: partner.update
-          label: Update
-        - id: partner.delete
-          label: Delete
-
-    - id: review
-      label: Reviews
-      acls:
-        - id: review.menu
-          label: Menu
-        - id: review.list
-          label: List
-        - id: review.view
-          label: View
-        - id: review.delete
-          label: Delete
-
-    - id: privacypolicy
-      label: Privacy Policy
-      acls:
-        - id: privacy_policy.menu
-          label: Menu
-        - id: privacy_policy.list
-          label: List
-        - id: privacy_policy.add
-          label: Add
-        - id: privacy_policy.update
-          label: Update
-        - id: privacy_policy.delete
-          label: Delete
-
-    - id: warranty
-      label: Warranty
-      acls:
-        - id: warranty.menu
-          label: Menu
-        - id: warranty.list
-          label: List
-        - id: warranty.add
-          label: Add
-        - id: warranty.update
-          label: Update
-
-    - id: staticcontent
-      label: Static Content
-      acls:
-        - id: static_content.menu
-          label: Menu
-        - id: static_content.list
-          label: List
-        - id: static_content.add
-          label: Add
-        - id: static_content.update
-          label: Update
-        - id: static_content.delete
-          label: Delete
-
-    - id: analytics
-      label: Analytics
-      acls:
-        - id: analytics.menu
-          label: Menu
-        - id: analytics.forecast
-          label: Forecasting
-
-    - id: sap_battery
-      label: SAP Battery Access
-      acls:
-        - id: sap_battery.menu
-          label: Menu
-        - id: sap_battery.list
-          label: List
-        - id: sap_battery.add
-          label: Add
-        - id: sap_battery.update
-          label: Update
-        - id: sap_battery.delete
-          label: Delete
-
-    - id: sap_brand
-      label: SAP Battery Brand Access
-      acls:
-        - id: sap_brand.menu
-          label: Menu
-        - id: sap_brand.list
-          label: List
-        - id: sap_brand.add
-          label: Add
-        - id: sap_brand.update
-          label: Update
-        - id: sap_brand.delete
-          label: Delete
-
-    - id: sap_bsize
-      label: SAP Battery Size Access
-      acls:
-        - id: sap_bsize.menu
-          label: Menu
-        - id: sap_bsize.list
-          label: List
-        - id: sap_bsize.add
-          label: Add
-        - id: sap_bsize.update
-          label: Update
-        - id: sap_bsize.delete
-          label: Delete
-
-    - id: sap_csize
-      label: SAP Battery Container Size Access
-      acls:
-        - id: sap_csize.menu
-          label: Menu
-        - id: sap_csize.list
-          label: List
-        - id: sap_csize.add
-          label: Add
-        - id: sap_csize.update
-          label: Update
-        - id: sap_csize.delete
-          label: Delete
-
-    - id: customer_tag
-      label: Customer Tags Access
-      acls:
-        - id: customer_tag.menu
-          label: Menu
-        - id: customer_tag.list
-          label: List
-        - id: customer_tag.add
-          label: Add
-        - id: customer_tag.update
-          label: Update
-        - id: customer_tag.delete
-          label: Delete
-
-    - id: dealer
-      label: Dealer Access
-      acls:
-        - id: dealer.menu
-          label: Menu
-        - id: dealer.list
-          label: List
-        - id: dealer.add
-          label: Add
-        - id: dealer.update
-          label: Update
-        - id: dealer.delete
-          label: Delete
-
-    - id: database
-      label: Database Access
-      acls:
-        - id: database.menu
-          label: Menu
-
-    - id: ticket_type
-      label: Ticket Type Access
-      acls:
-        - id: ticket_type.menu
-          label: Menu
-        - id: ticket_type.list
-          label: List
-        - id: ticket_type.add
-          label: Add
-        - id: ticket_type.update
-          label: Update
-        - id: ticket_type.delete
-          label: Delete
-
-    - id: subticket_type
-      label: Sub Ticket Type Access
-      acls:
-        - id: subticket_type.menu
-          label: Menu
-        - id: subticket_type.list
-          label: List
-        - id: subticket_type.add
-          label: Add
-        - id: subticket_type.update
-          label: Update
-        - id: subticket_type.delete
-          label: Delete
-
-    - id: emergency_type
-      label: Emergency Type Access
-      acls: 
-        - id: emergency_type.menu
-          label: Menu
-        - id: emergency_type.list
-          label: List
-        - id: emergency_type.add
-          label: Add
-        - id: emergency_type.update
-          label: Update
-        - id: emergency_type.delete
-          label: Delete
-
-    - id: ownership_type
-      label: Ownership Type Access
-      acls:
-        - id: ownership_type.menu
-          label: Menu
-        - id: ownership_type.list
-          label: List
-        - id: ownership_type.add
-          label: Add
-        - id: ownership_type.update
-          label: Update
-        - id: ownership_type.delete
-          label: Delete
-
-    - id: customer_location
-      label: Customer Location Access
-      acls:
-        - id: cust_location.menu
-          label: Menu
-        - id: cust_location.list
-          label: List
-        - id: cust_location.add
-          label: Add
-        - id: cust_location.update
-          label: Update
-        - id: cust_location.delete
-          label: Delete

config/api_acl.yaml

@@ -1,124 +0,0 @@
-access_keys:
-    - id: warranty
-      label: Warranty Access
-      acls:
-        - id: warranty.list
-          label: List
-        - id: warranty.find.serial
-          label: Find by Serial
-        - id: warranty.find.platenumber
-          label: Find by Plate Number
-        - id: warranty.register.battery
-          label: Register Battery
-        - id: warranty.claim
-          label: Claim
-        - id: warranty.update
-          label: Update
-        - id: warranty.cancel
-          label: Cancel
-        - id: warranty.delete
-          label: Delete
-        - id: warranty.set.privacypolicy
-          label: Set Privacy Policy
-        - id: warranty.list.serial
-          label: List by Serial
-    - id: batterybrand
-      label: Battery Brand Access
-      acls:
-        - id: batterybrand.list
-          label: List
-    - id: batterysize
-      label: Battery Size Access
-      acls:
-        - id: batterysize.list
-          label: List
-    - id: battery
-      label: Battery Access
-      acls:
-        - id: battery.list
-          label: List
-    - id: vmanufacturer
-      label: Vehicle Manufacturer Access
-      acls:
-        - id: vmanufacturer.list
-          label: List
-    - id: vehicle
-      label: Vehicle Access
-      acls:
-        - id: vehicle.list
-          label: List
-    - id: privacypolicy
-      label: Privacy Policy
-      acls: 
-        - id: privacypolicy.find
-          label: Find Privacy Policy
-    - id: customer
-      label: Customer
-      acls:
-        - id: customer.register
-          label: Register Customer
-        - id: customer.verify
-          label: Verify Customer
-    - id: municipality
-      label: Municipality
-      acls:
-        - id: municipality.list
-          label: List
-    - id: dealer
-      label: Dealer
-      acls:
-        - id: dealer.list
-          label: List
-    - id: warrantyserial
-      label: Warranty Serial
-      acls:
-        - id: warrantyserial.upload
-          label: Upload
-
-    - id: tapi_vmanufacturer
-      label: Third Party Vehicle Manufacturer Access
-      acls:
-        - id: tapi_vmanufacturer.list
-          label: List Third Party Vehicle Manufacturers
-    - id: tapi_vehicle
-      label: Third Party Vehicle Make Access
-      acls:
-         - id: tapi_vehicle.list
-           label: List Third Party Vehicles
-    - id: tapi_promo
-      label: Third Party Promo Access
-      acls:
-        - id: tapi_promo.list
-          label: List Third Party Promos
-    - id: tapi_battery
-      label: Third Party Battery Access
-      acls:
-        - id: tapi_battery_compatible.list
-          label: List Third Party Compatible Batteries
-    - id: tapi_jo
-      label: Third Party Job Order Access
-      acls:
-        - id: tapi_jo.request
-          label: Third Party Request Job Order
-        - id: tapi_jo.get.estimate
-          label: Third Party Get Estimate
-        - id: tapi_jo.get.ongoing
-          label: Third Party Get Ongoing Job Order
-        - id: tapi_jo.cancel
-          label: Third Party Cancel Job Order
-        - id: tapi_jo.get.invoice
-          label: Third Party Get Job Order Invoice
-        - id: tapi_jo.location.support
-          label: Third Party Check Location Support
-        - id: tapi_jo.nearest_hub.get
-          label: Third Party Get Nearest Hub and Slots
-        - id: tapi_jo.schedule_option.status
-          label: Third Party Schedule Option Status
-        - id: tapi_jo.get.info
-          label: Third Party Get Job Order Info
-    - id: tapi_service
-      label: Third Party Service Access
-      acls:
-        - id: tapi_service.list
-          label: List Third Party Services
-

config/bundles.php

@@ -2,6 +2,7 @@
 
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
+    Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
@@ -10,8 +11,4 @@ return [
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
-    Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
-    Catalyst\ApiBundle\CatalystApiBundle::class => ['all' => true],
-    Catalyst\AuthBundle\CatalystAuthBundle::class => ['all' => true],
-    Catalyst\MenuBundle\CatalystMenuBundle::class => ['all' => true],
 ];

config/cmb.menu.yaml

@@ -1,179 +0,0 @@
-main_menu:
-    - id: home
-      acl: dashboard.menu
-      label: Dashboard
-      icon: flaticon-line-graph
-    - id: user
-      acl: user.menu
-      label: User
-      icon: flaticon-users
-    - id: user_list
-      acl: user.list
-      label: Users
-      parent: user
-    - id: role_list
-      acl: role.list
-      label: Roles
-      parent: user
-
-    - id: apiuser
-      acl: apiuser.menu
-      label: API User
-      icon: flaticon-users
-    - id: api_user_list
-      acl: apiuser.list
-      label: API Users 
-      parent: apiuser
-    - id: api_role_list
-      acl: apirole.list
-      label: API Roles
-      parent: apiuser
-
-    - id: logistics
-      acl: logistics.menu
-      label: Logistics
-      icon: fa fa-truck
-    - id: rider_list
-      acl: rider.list
-      label: Riders
-      parent: logistics
-    - id: service_charge_list
-      acl: service_charge.list
-      label: Service Charges
-      parent: logistics
-
-    - id: battery
-      acl: battery.menu
-      label: Battery
-      icon: fa fa-battery-3
-    - id: battery_list
-      acl: battery.list
-      label: Batteries
-      parent: battery
-    - id: bmfg_list
-      acl: bmfg.list
-      label: Manufacturers
-      parent: battery
-    - id: bmodel_list
-      acl: bmodel.list
-      label: Models
-      parent: battery
-    - id: bsize_list
-      acl: bsize.list
-      label: Sizes
-      parent: battery
-    - id: promo_list
-      acl: promo.list
-      label: Promos
-      parent: battery
-
-    - id: vehicle
-      acl: vehicle.menu
-      label: Vehicle
-      icon: fa fa-car
-    - id: vehicle_list
-      acl: vehicle.list
-      label: Vehicles
-      parent: vehicle
-    - id: vmfg_list
-      acl: vmfg.list
-      label: Manufacturers
-      parent: vehicle
-
-    - id: location
-      acl: location.menu
-      label: Location
-      icon: fa fa-home
-    - id: outlet_list
-      acl: outlet.menu
-      label: Outlet
-      parent: location
-    - id: hub_list
-      acl: hub.menu
-      label: Hub
-      parent: location
-    - id: geofence_list
-      acl: geofence.menu
-      label: Geofence
-      parent: location
-
-
-    - id: joborder
-      acl: joborder.menu
-      label: Job Order
-      icon: flaticon-calendar-3
-    - id: jo_onestep_form
-      acl: jo_onestep.form
-      label: One-step Process
-      parent: joborder
-    - id: jo_walkin_form
-      acl: jo_walkin.form
-      label: Walk-in
-      parent: joborder
-    - id: jo_open
-      acl: jo_open.list
-      label: Open
-      parent: joborder
-    - id: jo_all
-      acl: jo_all.list
-      label: View All
-      parent: joborder
-
-    - id: support
-      acl: support.menu
-      label: Customer Support
-      icon: flaticon-support
-    - id: customer_list
-      acl: customer.list
-      label: Customers
-      parent: support 
-    - id: ticket_list
-      acl: ticket.list
-      label: Tickets
-      parent: support
-    - id: general_search
-      acl: general.search
-      label: Search
-      parent: support
-    - id: warranty_search
-      acl: warranty.search
-      label: Customer Battery Search
-      parent: support
-    - id: privacy_policy_list
-      acl: privacy_policy.list
-      label: Privacy Policy
-      parent: support
-    - id: warranty_list
-      acl: warranty.list
-      label: Warranty
-      parent: support
-    - id: warranty_upload
-      acl: warranty.upload
-      label: Warranty Upload
-      parent: support
-    - id: static_content_list
-      acl: static_content.list
-      label: Static Content
-      parent: support
-
-    - id: service
-      acl: service.menu
-      label: Other Services
-      icon: flaticon-squares
-    - id: service_list
-      acl: service.list
-      label: Services
-      parent: service
-
-    - id: partner
-      acl: partner.menu
-      label: Partners
-      icon: flaticon-network
-    - id: partner_list
-      acl: partner.list
-      label: Partners
-      parent: partner
-    - id: review_list
-      acl: review.list
-      label: Reviews
-      parent: partner

config/cmb.services.yaml

@@ -1,177 +0,0 @@
-# Put parameters here that don't need to change on each machine where the app is deployed
-# https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
-parameters:
-    map_default:
-        latitude: 14.6091
-        longitude: 121.0223
-    image_upload_directory: '%kernel.project_dir%/public/uploads'
-    job_order_refresh_interval: 300000
-    api_acl_file: 'api_acl.yaml'
-    api_access_key: 'api_access_keys'
-    app_acl_file: 'acl.yaml'
-    app_access_key: 'access_keys'
-    cvu_brand_id: "%env(CVU_BRAND_ID)%"
-    country_code: "%env(COUNTRY_CODE)%"
-
-services:
-    # default configuration for services in *this* file
-    _defaults:
-        autowire: true      # Automatically injects dependencies in your services.
-        autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
-        public: false       # Allows optimizing the container by removing unused services; this also means
-                            # fetching services directly from the container via $container->get() won't work.
-                            # The best practice is to be explicit about your dependencies anyway.
-
-    # makes classes in src/ available to be used as services
-    # this creates a service per class whose id is the fully-qualified class name
-    App\:
-        resource: '../src/*'
-        exclude: '../src/{Entity,Migrations,Tests,Menu,Access}'
-
-    # controllers are imported separately to make sure services can be injected
-    # as action arguments even if you don't extend any base controller class
-    App\Controller\:
-        resource: '../src/Controller'
-        tags: ['controller.service_arguments']
-
-    # add more service definitions when explicit configuration is needed
-    # please note that last definitions always *replace* previous ones
-    App\Menu\Generator:
-        arguments:
-            $router: "@router.default"
-            $cache_dir: "%kernel.cache_dir%"
-            $config_dir: "%kernel.root_dir%/../config"
-
-    App\Service\FileUploader:
-        arguments:
-            $target_dir: '%image_upload_directory%'
-
-    App\Service\MapTools:
-        arguments:
-            $em: "@doctrine.orm.entity_manager"
-            $gmaps_api_key: "%env(GMAPS_API_KEY)%"
-            $cust_dist_limit: "%env(CUST_DISTANCE_LIMIT)%"
-
-    App\Service\RisingTideGateway:
-        arguments:
-            $em: "@doctrine.orm.entity_manager"
-            $user: "%env(RT_USER)%"
-            $pass: "%env(RT_PASS)%"
-            $usage_type: "%env(RT_USAGE_TYPE)%"
-            $shortcode: "%env(RT_SHORTCODE)%"
-
-    App\Service\MQTTClient:
-        arguments:
-            $redis_client: "@App\\Service\\RedisClientProvider"
-            $key: "mqtt_events"
-
-    App\Service\APNSClient:
-        arguments:
-            $redis_client: "@App\\Service\\RedisClientProvider"
-
-    App\Service\RedisClientProvider:
-        arguments:
-            $scheme: "%env(REDIS_CLIENT_SCHEME)%"
-            $host: "%env(REDIS_CLIENT_HOST)%"
-            $port: "%env(REDIS_CLIENT_PORT)%"
-            $password: "%env(REDIS_CLIENT_PASSWORD)%"
-
-    App\Service\GeofenceTracker:
-        arguments:
-            $geofence_flag: "%env(GEOFENCE_ENABLE)%"
-
-    App\Service\WarrantyHandler:
-        arguments:
-            $em: "@doctrine.orm.entity_manager"
-
-    App\Command\SetCustomerPrivacyPolicyCommand:
-        arguments:
-            $policy_promo: "%env(POLICY_PROMO)%"
-            $policy_third_party: "%env(POLICY_THIRD_PARTY)%"
-            $policy_mobile: "%env(POLICY_MOBILE)%"
-
-    App\Command\CreateCustomerFromWarrantyCommand:
-        arguments:
-            $cvu_mfg_id: "%env(CVU_MFG_ID)%"
-            $cvu_brand_id: "%env(CVU_BRAND_ID)%"
-
-    # rider tracker service
-    App\Service\RiderTracker:
-        arguments:
-            $redis_client: "@App\\Service\\RedisClientProvider"
-
-    # invoice generator
-    App\Service\InvoiceGenerator\CMBInvoiceGenerator: ~
-
-    # invoice generator interface
-    App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\CMBInvoiceGenerator"
-
-    # job order generator
-    App\Service\JobOrderHandler\CMBJobOrderHandler:
-        arguments:
-            $country_code: "%env(COUNTRY_CODE)%"
-
-    #job order generator interface
-    App\Service\JobOrderHandlerInterface: "@App\\Service\\JobOrderHandler\\CMBJobOrderHandler"
-
-    # customer generator
-    App\Service\CustomerHandler\CMBCustomerHandler:
-        arguments:
-            $country_code: "%env(COUNTRY_CODE)%"
-
-    # customer generator interface
-    App\Service\CustomerHandlerInterface: "@App\\Service\\CustomerHandler\\CMBCustomerHandler"
-
-    # rider assignment 
-    App\Service\RiderAssignmentHandler\CMBRiderAssignmentHandler: ~
-
-    # rider assignment interface
-    App\Service\RiderAssignmentHandlerInterface: "@App\\Service\\RiderAssignmentHandler\\CMBRiderAssignmentHandler"
-
-    # rider API service
-    App\Service\RiderAPIHandler\CMBRiderAPIHandler:
-        arguments:
-            $country_code: "%env(COUNTRY_CODE)%"
-
-    # rider API interface
-    App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\CMBRiderAPIHandler"
-
-    # map manager
-    #App\Service\GISManager\Bing: ~
-    App\Service\GISManager\OpenStreet: ~
-    #App\Service\GISManager\Google: ~
-
-    #App\Service\GISManagerInterface: "@App\\Service\\GISManager\\Bing"
-    App\Service\GISManagerInterface: "@App\\Service\\GISManager\\OpenStreet"
-    #App\Service\GISManagerInterface: "@App\\Service\\GISManager\\Google"
-    
-    App\EventListener\JobOrderActiveCacheListener:
-        arguments:
-            $jo_cache: "@App\\Service\\JobOrderCache"
-            $mqtt: "@App\\Service\\MQTTClient"
-        tags:
-            - name: 'doctrine.orm.entity_listener'
-              event: 'postUpdate'
-              entity: 'App\Entity\JobOrder'
-            - name: 'doctrine.orm.entity_listener'
-              event: 'postRemove'
-              entity: 'App\Entity\JobOrder'
-            - name: 'doctrine.orm.entity_listener'
-              event: 'postPersist'
-              entity: 'App\Entity\JobOrder'
-
-    App\Service\JobOrderCache:
-        arguments:
-            $redis_prov: "@App\\Service\\RedisClientProvider"
-            $active_jo_key: "%env(LOCATION_JO_ACTIVE_KEY)%"
-
-    App\Service\RiderCache:
-        arguments:
-            $redis_prov: "@App\\Service\\RedisClientProvider"
-            $loc_key: "%env(LOCATION_RIDER_ACTIVE_KEY)%"
-            $status_key: "%env(STATUS_RIDER_KEY)%"
-
-    # API logging
-    App\EventSubscriber\LogSubscriber:
-        arguments:
-            $api_log_flag: "%env(API_LOGGING)%"

config/menu.yaml

@@ -16,19 +16,6 @@ main_menu:
       label: Roles
       parent: user
 
-    - id: apiuser
-      acl: apiuser.menu
-      label: API User
-      icon: flaticon-users
-    - id: api_user_list
-      acl: apiuser.list
-      label: API Users 
-      parent: apiuser
-    - id: api_role_list
-      acl: apirole.list
-      label: API Roles
-      parent: apiuser
-
     - id: logistics
       acl: logistics.menu
       label: Logistics
@@ -63,28 +50,6 @@ main_menu:
       label: Promos
       parent: battery
 
-    - id: sapbattery
-      acl: sap_battery.menu
-      label: SAP Battery
-      icon: fa fa-battery
-    - id: sapbattery_list
-      acl: sap_battery.list
-      label: SAP Batteries
-      parent: sapbattery
-    - id: sapbrand_list
-      acl: sap_brand.list
-      label: SAP Battery Brands
-      parent: