Merge branch 'main' of github.com:fleetbase/fleetbase into cloud-qa

api/composer.json

@@ -12,6 +12,9 @@
         "fleetbase/core-api": "^1.5.22",
         "fleetbase/fleetops-api": "^0.5.16",
         "fleetbase/registry-bridge": "^0.0.18",
+        "fleetbase/billing-api": "^0.1.6",
+        "fleetbase/internals-api": "^0.0.9",
+        "fleetbase/flespi-integration": "^0.1.13",
         "fleetbase/storefront-api": "^0.3.20",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^10.0",
@@ -37,9 +40,17 @@
         "phpunit/phpunit": "^10.0"
     },
     "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/fleetbase/billing"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/fleetbase/internals"
+        },
         {
             "type": "composer",
-            "url": "https://registry.fleetbase.io"
+            "url": "https://registry.qa.fleetbase.io"
         }
     ],
     "autoload": {

api/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e6a68a4f178121cd3b9049a34a790ae3",
+    "content-hash": "25b372f5a15fc4da15ab12e7e82f2775",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -2295,6 +2295,116 @@
             },
             "time": "2024-11-24T11:22:49+00:00"
         },
+        {
+            "name": "fleetbase/billing-api",
+            "version": "0.1.6",
+            "source": {
+                "type": "git",
+                "url": "git@github.com:fleetbase/billing.git",
+                "reference": "7e40d13c6ce0c32501f9689a88236df40f6557a4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fleetbase/billing/zipball/7e40d13c6ce0c32501f9689a88236df40f6557a4",
+                "reference": "7e40d13c6ce0c32501f9689a88236df40f6557a4",
+                "shasum": ""
+            },
+            "require": {
+                "fleetbase/core-api": "*",
+                "laravel/cashier": "^15.2.1",
+                "php": "^8.0",
+                "php-http/guzzle7-adapter": "^1.0",
+                "psr/http-factory-implementation": "*",
+                "stripe/stripe-php": "^13.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.34.1",
+                "nunomaduro/collision": "^7.0",
+                "pestphp/pest": "^2.33.2",
+                "phpstan/phpstan": "^1.10.38",
+                "symfony/var-dumper": "^5.4.29"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Fleetbase\\Billing\\Providers\\BillingServiceProvider"
+                    ]
+                },
+                "fleetbase": {
+                    "sandbox-migrations": false
+                },
+                "fleetbase/billing-api": {
+                    "excludes": [
+                        "addon",
+                        "app",
+                        "assets",
+                        "config",
+                        "tests",
+                        "vendor"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fleetbase\\Billing\\": "server/src/",
+                    "Fleetbase\\Billing\\Seeders\\": "server/seeders/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "Fleetbase\\Billing\\Tests\\": "server/tests/"
+                }
+            },
+            "scripts": {
+                "lint": [
+                    "php-cs-fixer fix -v"
+                ],
+                "test:lint": [
+                    "php-cs-fixer fix -v --dry-run"
+                ],
+                "test:types": [
+                    "phpstan analyse --ansi --memory-limit=0"
+                ],
+                "test:unit": [
+                    "pest --colors=always"
+                ],
+                "test": [
+                    "@test:lint",
+                    "@test:types",
+                    "@test:unit"
+                ]
+            },
+            "license": [
+                "AGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Fleetbase Pte Ltd.",
+                    "email": "hello@fleetbase.io"
+                },
+                {
+                    "name": "Ronald A. Richardson",
+                    "email": "ron@fleetbase.io"
+                }
+            ],
+            "description": "Multi-Tenant Billing and Subscriptions Extension for Fleetbase",
+            "keywords": [
+                "billing",
+                "billing system",
+                "fleetbase",
+                "fleetbase-extension",
+                "revenue engine",
+                "revenue generator",
+                "stripe",
+                "stripe api"
+            ],
+            "support": {
+                "source": "https://github.com/fleetbase/billing/tree/v0.1.6",
+                "issues": "https://github.com/fleetbase/billing/issues"
+            },
+            "time": "2025-01-11T07:47:10+00:00"
+        },
         {
             "name": "fleetbase/core-api",
             "version": "1.5.22",
@@ -2481,6 +2591,199 @@
             },
             "time": "2025-01-11T08:33:42+00:00"
         },
+        {
+            "name": "fleetbase/flespi-integration",
+            "version": "0.1.13",
+            "dist": {
+                "type": "tar",
+                "url": "https://s3.ap-southeast-1.amazonaws.com/fleetbase-registry-qa/flb/%40fleetbase/flespi-engine/flespi-engine-0.1.13.tgz?AWSAccessKeyId=ASIA26E6KG6WKOW2JYLS&Expires=1736589888&Signature=bSFtyLJFrYf3jcuYpC8n7EWWKfE%3D&x-amz-security-token=IQoJb3JpZ2luX2VjENL%2F%2F%2F%2F%2F%2F%2F%2F%2F%2FwEaDmFwLXNvdXRoZWFzdC0xIkcwRQIge%2BxH1iSXN0253OnJOMWnuqz1UYiNSJgTaLsj6SjyorMCIQDsyxfdx9nEA70xE9ekaF00uaOtds5cBApKNR6E0g65zSqPBAi7%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F8BEAAaDDc1MTk1MTI5NjQyOCIM0eZUCpJ%2BqtkLlAV8KuMDDdfxI8JxDXnMvA9%2F2HxnNtJat3Dr0I451SSacsxW9kqF9huvYC5h3G0UKMToEEQONDopbYiSQswdlRlMEuC5bLMwO5ulwBqcm8ydtlcbeJKjzW%2B37j1%2B6VO0z406MubVECM4ogNYos9yKzRopnrcfLrHxf1cueyidp%2FSxsE00n6vO%2BO3ph7%2FnFEf5yegvK5XtCoqcBqIKzCErZ7OlACp%2F9U9hL02osfTSeFtmdgrZiahlXreEHtkvsl9dk5K%2BBZrCIhd6VOqAm6EQadmZ68R7LeHVCEH9OTMuPxs9UMLBW9c%2FCr2QvKYjNFfCjtYbZJY6R96kE1G2oXI%2FlrGgFZuEHaLL2KB%2FUWM0h81uD1dQRcNMPJbqoVI5be57%2B8wLi%2BFWB04j66pKRT5%2FOZrc8sabBBD8EglB5UK7rsTvHJrigMDzFl4RCmCAzw5m7oELSrGHuHfLxUScB4vbzLI0zy%2F2YimtzibcbPVuI75pfPJTh4EqvE0jCkBN6UDXrpVYVStc9u8GX2ERpqJIxqO%2BhlMOD2IA8AQN9YT7qPYcJWkknKDgzJzyXpRH46deujBOhrIf%2B20oP1BHEgaAkBPUwYhaF9c6HjJ%2BLoixwjcJ2D%2FlQ8bRWFHgiBEIqxfMYSctOIJ33MHMMD2iLwGOqUBCeUQo600nZMtDmdyL6AJQyAZalFLkYOj%2B0si1HQ9sb7VC89JIXEZ5K5u8GPB82BnhWqT4GdO5kHCA35KtaVm1xJgYs0sm3IMlBpR1VhCZovAl7%2FzJdC2XNwe2IMGFsFEyjFcaX9kOOERpzsZBFHzU1%2BO6sAF4h67tSu7ilEVmQBB8dqVh9q1GHRDlU2QJJG9BEeHueHw0ORBbJkzwartrf%2BQkXQt"
+            },
+            "require": {
+                "fleetbase/core-api": "^1.5.9",
+                "fleetbase/fleetops-api": "^0.5.8",
+                "php": "^8.0",
+                "php-http/guzzle7-adapter": "^1.0",
+                "psr/http-factory-implementation": "*",
+                "vlucas/phpdotenv": "^5.5"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.34.1",
+                "nunomaduro/collision": "^5.11.0|^6.4.0",
+                "pestphp/pest": "^1.22.6",
+                "phpstan/phpstan": "^1.10.38",
+                "symfony/var-dumper": "^5.4.29"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Fleetbase\\Flespi\\Providers\\FlespiIntegrationServiceProvider",
+                        "Fleetbase\\Flespi\\Providers\\NotificationServiceProvider"
+                    ]
+                },
+                "fleetbase": {
+                    "sandbox-migrations": false
+                },
+                "fleetbase/flespi-integration": {
+                    "excludes": [
+                        "addon",
+                        "app",
+                        "assets",
+                        "config",
+                        "tests",
+                        "vendor"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fleetbase\\Flespi\\": "server/src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "Fleetbase\\Flespi\\Tests\\": "server/tests/"
+                }
+            },
+            "scripts": {
+                "lint": [
+                    "php-cs-fixer fix -v"
+                ],
+                "test:lint": [
+                    "php-cs-fixer fix -v --dry-run"
+                ],
+                "test:types": [
+                    "phpstan analyse --ansi --memory-limit=0"
+                ],
+                "test:unit": [
+                    "pest --colors=always"
+                ],
+                "test": [
+                    "@test:lint",
+                    "@test:types",
+                    "@test:unit"
+                ]
+            },
+            "license": [
+                "AGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Fleetbase Pte Ltd.",
+                    "email": "hello@fleetbase.io"
+                }
+            ],
+            "description": "Flespi Universal Telematics Gateway, Parser & API Extension for Fleetbase",
+            "keywords": [
+                "fleetbase-extension",
+                "flespi"
+            ]
+        },
+        {
+            "name": "fleetbase/internals-api",
+            "version": "0.0.9",
+            "source": {
+                "type": "git",
+                "url": "git@github.com:fleetbase/internals.git",
+                "reference": "fc0170619ddbb6aed3d101867cda5245966d1a52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fleetbase/internals/zipball/fc0170619ddbb6aed3d101867cda5245966d1a52",
+                "reference": "fc0170619ddbb6aed3d101867cda5245966d1a52",
+                "shasum": ""
+            },
+            "require": {
+                "fleetbase/billing-api": "*",
+                "fleetbase/core-api": "*",
+                "fleetbase/registry-bridge": "*",
+                "php": "^8.0",
+                "php-http/guzzle7-adapter": "^1.0",
+                "psr/http-factory-implementation": "*"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.34.1",
+                "nunomaduro/collision": "^7.0",
+                "pestphp/pest": "^2.33.2",
+                "phpstan/phpstan": "^1.10.38",
+                "symfony/var-dumper": "^5.4.29"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Fleetbase\\Internals\\Providers\\InternalServiceProvider"
+                    ]
+                },
+                "fleetbase": {
+                    "sandbox-migrations": false
+                },
+                "fleetbase/internals-api": {
+                    "excludes": [
+                        "addon",
+                        "app",
+                        "assets",
+                        "config",
+                        "tests",
+                        "vendor"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fleetbase\\Internals\\": "server/src/",
+                    "Fleetbase\\Internals\\Seeds\\": "server/seeds/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "Fleetbase\\Internals\\Tests\\": "server/tests/"
+                }
+            },
+            "scripts": {
+                "lint": [
+                    "php-cs-fixer fix -v"
+                ],
+                "test:lint": [
+                    "php-cs-fixer fix -v --dry-run"
+                ],
+                "test:types": [
+                    "phpstan analyse --ansi --memory-limit=0"
+                ],
+                "test:unit": [
+                    "pest --colors=always"
+                ],
+                "test": [
+                    "@test:lint",
+                    "@test:types",
+                    "@test:unit"
+                ]
+            },
+            "license": [
+                "AGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Fleetbase Pte Ltd.",
+                    "email": "hello@fleetbase.io"
+                },
+                {
+                    "name": "Ronald A. Richardson",
+                    "email": "ron@fleetbase.io"
+                }
+            ],
+            "description": "Private internal functionality for Fleetbase SaaS",
+            "keywords": [
+                "fleetbase",
+                "fleetbase-extension",
+                "fleetbase-internals"
+            ],
+            "support": {
+                "source": "https://github.com/fleetbase/internals/tree/v0.0.9",
+                "issues": "https://github.com/fleetbase/internals/issues"
+            },
+            "time": "2025-01-11T07:53:34+00:00"
+        },
         {
             "name": "fleetbase/laravel-mysql-spatial",
             "version": "1.0.2",
@@ -17912,5 +18215,5 @@
         "php": "^8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.2.0"
 }

console/app/router.js

@@ -55,9 +55,12 @@ Router.map(function () {
                 this.route('index', { path: '/' }, function () {
                     this.route('users', { path: '/:public_id/users' });
                 });
+<<<<<<< HEAD
+=======
             });
             this.route('schedule-monitor', function () {
                 this.route('logs', { path: '/:id/logs' });
+>>>>>>> 23d5ecfdb856aac664f6124188de619f036d825b
             });
         });
     });

console/environments/.env.production

@@ -1,8 +1,8 @@
-API_HOST=
+API_HOST=https://api.fleetbase.io
 API_NAMESPACE=int/v1
 API_SECURE=true
 SOCKETCLUSTER_PATH=/socketcluster/
-SOCKETCLUSTER_HOST=
+SOCKETCLUSTER_HOST=socket.fleetbase.io
 SOCKETCLUSTER_SECURE=true
-SOCKETCLUSTER_PORT=38000
-OSRM_HOST=https://router.project-osrm.org
+SOCKETCLUSTER_PORT=8000
+OSRM_HOST=https://router.project-osrm.org

console/environments/.env.qa

@@ -0,0 +1,9 @@
+API_HOST=https://api.qa.fleetbase.io
+API_NAMESPACE=int/v1
+API_SECURE=true
+SOCKETCLUSTER_PATH=/socketcluster/
+SOCKETCLUSTER_HOST=socket.qa.fleetbase.io
+SOCKETCLUSTER_SECURE=true
+SOCKETCLUSTER_PORT=8000
+OSRM_HOST=https://bundle.routing.fleetbase.io
+OSRM_SERVERS=https://canada.routing.fleetbase.io,https://us.routing.fleetbase.io

console/package.json

@@ -38,6 +38,9 @@
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fleetbase/registry-bridge-engine": "^0.0.18",
         "@fleetbase/storefront-engine": "^0.3.20",
+        "@fleetbase/billing-engine": "^0.1.6",
+        "@fleetbase/internals-engine": "^0.0.9",
+        "@fleetbase/flespi-engine": "^0.1.13",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "ember-changeset": "^4.1.2",
         "ember-changeset-validations": "^4.1.1",