Merge pull request #154 from fleetbase/dev-v0.2.8

v0.2.8
2026-01-08 07:16:49 +00:00 · 2023-11-06 20:12:39 +08:00
parent 6880664d9e 9c4daf7a68
commit f3a2b444af
9 changed files with 303 additions and 290 deletions
--- a/api/composer.json
+++ b/api/composer.json
@@ -10,8 +10,8 @@
    "require": {
        "php": "^7.3|^8.0",
        "fleetbase/core-api": "^1.3.2",
-        "fleetbase/fleetops-api": "^0.3.1",
-        "fleetbase/storefront-api": "^0.2.2",
+        "fleetbase/fleetops-api": "^0.3.2",
+        "fleetbase/storefront-api": "^0.2.3",
        "fruitcake/laravel-cors": "^2.0",
        "guzzlehttp/guzzle": "^7.0.1",
        "laravel/framework": "^8.75",
--- a/api/composer.lock
+++ b/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": "b0027cddeec04c6a3cf96cd1d5d761d0",
+    "content-hash": "e27ee9b28a4e352f3998cea4e4eea8f2",
    "packages": [
        {
            "name": "aloha/twilio",
@@ -192,16 +192,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.283.14",
+            "version": "3.284.0",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "331894cd4751a06a4e5b3e4e2918a9233c9568dc"
+                "reference": "1b7e926acc990509e3d13fa708cdede686b40d90"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/331894cd4751a06a4e5b3e4e2918a9233c9568dc",
-                "reference": "331894cd4751a06a4e5b3e4e2918a9233c9568dc",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1b7e926acc990509e3d13fa708cdede686b40d90",
+                "reference": "1b7e926acc990509e3d13fa708cdede686b40d90",
                "shasum": ""
            },
            "require": {
@@ -281,9 +281,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.14"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.284.0"
            },
-            "time": "2023-10-27T18:06:59+00:00"
+            "time": "2023-11-03T18:13:48+00:00"
        },
        {
            "name": "aws/aws-sdk-php-laravel",
@@ -2092,16 +2092,16 @@
        },
        {
            "name": "fleetbase/fleetops-api",
-            "version": "0.3.1",
+            "version": "0.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/fleetops.git",
-                "reference": "47ef5f40ea9c9070c1926fd315bd0b10390754af"
+                "reference": "ebd072d2c79572b967679d66fb4fd943e48b50a9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/47ef5f40ea9c9070c1926fd315bd0b10390754af",
-                "reference": "47ef5f40ea9c9070c1926fd315bd0b10390754af",
+                "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/ebd072d2c79572b967679d66fb4fd943e48b50a9",
+                "reference": "ebd072d2c79572b967679d66fb4fd943e48b50a9",
                "shasum": ""
            },
            "require": {
@@ -2174,27 +2174,27 @@
            ],
            "support": {
                "issues": "https://github.com/fleetbase/fleetops/issues",
-                "source": "https://github.com/fleetbase/fleetops/tree/v0.3.1"
+                "source": "https://github.com/fleetbase/fleetops/tree/v0.3.2"
            },
-            "time": "2023-10-30T11:00:21+00:00"
+            "time": "2023-11-06T11:28:03+00:00"
        },
        {
            "name": "fleetbase/storefront-api",
-            "version": "0.2.2",
+            "version": "0.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/storefront.git",
-                "reference": "affa19ebee088001aae3c77fbf013e5027f4cc09"
+                "reference": "51e0144fe9ed6c0c719c806f385db4856d658f39"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/storefront/zipball/affa19ebee088001aae3c77fbf013e5027f4cc09",
-                "reference": "affa19ebee088001aae3c77fbf013e5027f4cc09",
+                "url": "https://api.github.com/repos/fleetbase/storefront/zipball/51e0144fe9ed6c0c719c806f385db4856d658f39",
+                "reference": "51e0144fe9ed6c0c719c806f385db4856d658f39",
                "shasum": ""
            },
            "require": {
-                "fleetbase/core-api": "^1.3.1",
-                "fleetbase/fleetops-api": "^0.3.0",
+                "fleetbase/core-api": "^1.3.2",
+                "fleetbase/fleetops-api": "^0.3.2",
                "geocoder-php/google-maps-places-provider": "^1.4",
                "laravel-notification-channels/apn": "^3.8",
                "laravel-notification-channels/fcm": "^2.7",
@@ -2255,9 +2255,9 @@
            ],
            "support": {
                "issues": "https://github.com/fleetbase/storefront/issues",
-                "source": "https://github.com/fleetbase/storefront/tree/v0.2.2"
+                "source": "https://github.com/fleetbase/storefront/tree/v0.2.3"
            },
-            "time": "2023-10-27T01:59:15+00:00"
+            "time": "2023-11-06T11:43:30+00:00"
        },
        {
            "name": "fruitcake/laravel-cors",
@@ -2739,16 +2739,16 @@
        },
        {
            "name": "giggsey/libphonenumber-for-php",
-            "version": "8.13.23",
+            "version": "8.13.24",
            "source": {
                "type": "git",
                "url": "https://github.com/giggsey/libphonenumber-for-php.git",
-                "reference": "b2dff83693cb46eb4478b193e9d94e2ff6258480"
+                "reference": "746ca6a565b9d4167c94c80824f43fa6fb463fd1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/b2dff83693cb46eb4478b193e9d94e2ff6258480",
-                "reference": "b2dff83693cb46eb4478b193e9d94e2ff6258480",
+                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/746ca6a565b9d4167c94c80824f43fa6fb463fd1",
+                "reference": "746ca6a565b9d4167c94c80824f43fa6fb463fd1",
                "shasum": ""
            },
            "require": {
@@ -2807,20 +2807,20 @@
                "issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
                "source": "https://github.com/giggsey/libphonenumber-for-php"
            },
-            "time": "2023-10-11T07:12:56+00:00"
+            "time": "2023-10-31T08:12:54+00:00"
        },
        {
            "name": "giggsey/locale",
-            "version": "2.4",
+            "version": "2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/giggsey/Locale.git",
-                "reference": "a6b33dfc9e8949b7e28133c4628b29cd9f1850bb"
+                "reference": "e6d4540109a01dd2bc7334cdc842d6a6a67cf239"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/giggsey/Locale/zipball/a6b33dfc9e8949b7e28133c4628b29cd9f1850bb",
-                "reference": "a6b33dfc9e8949b7e28133c4628b29cd9f1850bb",
+                "url": "https://api.github.com/repos/giggsey/Locale/zipball/e6d4540109a01dd2bc7334cdc842d6a6a67cf239",
+                "reference": "e6d4540109a01dd2bc7334cdc842d6a6a67cf239",
                "shasum": ""
            },
            "require": {
@@ -2859,9 +2859,9 @@
            "description": "Locale functions required by libphonenumber-for-php",
            "support": {
                "issues": "https://github.com/giggsey/Locale/issues",
-                "source": "https://github.com/giggsey/Locale/tree/2.4"
+                "source": "https://github.com/giggsey/Locale/tree/2.5"
            },
-            "time": "2023-04-13T07:40:58+00:00"
+            "time": "2023-11-01T17:19:48+00:00"
        },
        {
            "name": "google/auth",
@@ -2923,16 +2923,16 @@
        },
        {
            "name": "google/cloud-core",
-            "version": "v1.52.7",
+            "version": "v1.52.8",
            "source": {
                "type": "git",
                "url": "https://github.com/googleapis/google-cloud-php-core.git",
-                "reference": "f79480d1e2b31a695ae98b42ca10b67b41da9fb1"
+                "reference": "2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/f79480d1e2b31a695ae98b42ca10b67b41da9fb1",
-                "reference": "f79480d1e2b31a695ae98b42ca10b67b41da9fb1",
+                "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c",
+                "reference": "2ebcaa410f7e92dca5677dd9cc4ec1f9f315e83c",
                "shasum": ""
            },
            "require": {
@@ -2982,22 +2982,22 @@
            ],
            "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.",
            "support": {
-                "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.7"
+                "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.8"
            },
-            "time": "2023-10-16T22:54:31+00:00"
+            "time": "2023-11-02T19:15:44+00:00"
        },
        {
            "name": "google/cloud-storage",
-            "version": "v1.33.4",
+            "version": "v1.34.0",
            "source": {
                "type": "git",
                "url": "https://github.com/googleapis/google-cloud-php-storage.git",
-                "reference": "02f53c6cbbc18c4ee8f5d12cbd7887ceec575724"
+                "reference": "4589dd3c8f4171db4ce3eb335fc7d894661ca0e9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/02f53c6cbbc18c4ee8f5d12cbd7887ceec575724",
-                "reference": "02f53c6cbbc18c4ee8f5d12cbd7887ceec575724",
+                "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/4589dd3c8f4171db4ce3eb335fc7d894661ca0e9",
+                "reference": "4589dd3c8f4171db4ce3eb335fc7d894661ca0e9",
                "shasum": ""
            },
            "require": {
@@ -3038,9 +3038,9 @@
            ],
            "description": "Cloud Storage Client for PHP",
            "support": {
-                "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.4"
+                "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.34.0"
            },
-            "time": "2023-10-16T22:54:31+00:00"
+            "time": "2023-11-02T19:15:44+00:00"
        },
        {
            "name": "graham-campbell/manager",
@@ -5350,28 +5350,28 @@
        },
        {
            "name": "maatwebsite/excel",
-            "version": "3.1.49",
+            "version": "3.1.50",
            "source": {
                "type": "git",
                "url": "https://github.com/SpartnerNL/Laravel-Excel.git",
-                "reference": "769209f49ebe3419017114f98bd61e2a7d9af259"
+                "reference": "d79e66391aa306983bb7e234503f5605c3e33348"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/769209f49ebe3419017114f98bd61e2a7d9af259",
-                "reference": "769209f49ebe3419017114f98bd61e2a7d9af259",
+                "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/d79e66391aa306983bb7e234503f5605c3e33348",
+                "reference": "d79e66391aa306983bb7e234503f5605c3e33348",
                "shasum": ""
            },
            "require": {
                "composer/semver": "^3.3",
                "ext-json": "*",
-                "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0",
-                "php": "^7.0|^8.0",
+                "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0",
+                "php": "^7.0||^8.0",
                "phpoffice/phpspreadsheet": "^1.18",
-                "psr/simple-cache": "^1.0|^2.0|^3.0"
+                "psr/simple-cache": "^1.0||^2.0||^3.0"
            },
            "require-dev": {
-                "orchestra/testbench": "^6.0|^7.0|^8.0",
+                "orchestra/testbench": "^6.0||^7.0||^8.0",
                "predis/predis": "^1.1"
            },
            "type": "library",
@@ -5414,7 +5414,7 @@
            ],
            "support": {
                "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues",
-                "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.49"
+                "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.50"
            },
            "funding": [
                {
@@ -5426,7 +5426,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-10-26T09:01:33+00:00"
+            "time": "2023-11-06T11:29:48+00:00"
        },
        {
            "name": "maennchen/zipstream-php",
@@ -6823,16 +6823,16 @@
        },
        {
            "name": "php-http/curl-client",
-            "version": "2.3.0",
+            "version": "2.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-http/curl-client.git",
-                "reference": "f7352c0796549949900d28fe991e19c90572386a"
+                "reference": "085570be588f7cbdc4601e78886eea5b7051ad71"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-http/curl-client/zipball/f7352c0796549949900d28fe991e19c90572386a",
-                "reference": "f7352c0796549949900d28fe991e19c90572386a",
+                "url": "https://api.github.com/repos/php-http/curl-client/zipball/085570be588f7cbdc4601e78886eea5b7051ad71",
+                "reference": "085570be588f7cbdc4601e78886eea5b7051ad71",
                "shasum": ""
            },
            "require": {
@@ -6843,7 +6843,7 @@
                "php-http/message": "^1.2",
                "psr/http-client": "^1.0",
                "psr/http-factory-implementation": "^1.0",
-                "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+                "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
            },
            "provide": {
                "php-http/async-client-implementation": "1.0",
@@ -6854,6 +6854,7 @@
                "guzzlehttp/psr7": "^1.0",
                "laminas/laminas-diactoros": "^2.0",
                "php-http/client-integration-tests": "^3.0",
+                "php-http/message-factory": "^1.1",
                "phpunit/phpunit": "^7.5 || ^9.4"
            },
            "type": "library",
@@ -6881,9 +6882,9 @@
            ],
            "support": {
                "issues": "https://github.com/php-http/curl-client/issues",
-                "source": "https://github.com/php-http/curl-client/tree/2.3.0"
+                "source": "https://github.com/php-http/curl-client/tree/2.3.1"
            },
-            "time": "2023-04-28T14:56:41+00:00"
+            "time": "2023-11-03T15:32:00+00:00"
        },
        {
            "name": "php-http/discovery",
@@ -7602,16 +7603,16 @@
        },
        {
            "name": "phrity/websocket",
-            "version": "1.7.0",
+            "version": "1.7.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sirn-se/websocket-php.git",
-                "reference": "d6dd8337e1ac13c08e0be25e168ad907300da955"
+                "reference": "7349a37c5a853ff0ae12c03fa59e8879e9dda486"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sirn-se/websocket-php/zipball/d6dd8337e1ac13c08e0be25e168ad907300da955",
-                "reference": "d6dd8337e1ac13c08e0be25e168ad907300da955",
+                "url": "https://api.github.com/repos/sirn-se/websocket-php/zipball/7349a37c5a853ff0ae12c03fa59e8879e9dda486",
+                "reference": "7349a37c5a853ff0ae12c03fa59e8879e9dda486",
                "shasum": ""
            },
            "require": {
@@ -7625,7 +7626,7 @@
            "require-dev": {
                "php-coveralls/php-coveralls": "^2.0",
                "phpunit/phpunit": "^9.0 | ^10.0",
-                "phrity/net-mock": "^1.2",
+                "phrity/net-mock": "^1.3",
                "squizlabs/php_codesniffer": "^3.5"
            },
            "type": "library",
@@ -7657,9 +7658,9 @@
            ],
            "support": {
                "issues": "https://github.com/sirn-se/websocket-php/issues",
-                "source": "https://github.com/sirn-se/websocket-php/tree/1.7.0"
+                "source": "https://github.com/sirn-se/websocket-php/tree/1.7.2"
            },
-            "time": "2023-07-14T05:44:18+00:00"
+            "time": "2023-11-04T12:09:42+00:00"
        },
        {
            "name": "pragmarx/coollection",
@@ -14697,16 +14698,16 @@
        },
        {
            "name": "filp/whoops",
-            "version": "2.15.3",
+            "version": "2.15.4",
            "source": {
                "type": "git",
                "url": "https://github.com/filp/whoops.git",
-                "reference": "c83e88a30524f9360b11f585f71e6b17313b7187"
+                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187",
-                "reference": "c83e88a30524f9360b11f585f71e6b17313b7187",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
+                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
                "shasum": ""
            },
            "require": {
@@ -14756,7 +14757,7 @@
            ],
            "support": {
                "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.3"
+                "source": "https://github.com/filp/whoops/tree/2.15.4"
            },
            "funding": [
                {
@@ -14764,7 +14765,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-07-13T12:00:00+00:00"
+            "time": "2023-11-03T12:00:00+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
--- a/console/app/models/company.js
+++ b/console/app/models/company.js
@@ -10,7 +10,7 @@ export default class Company extends Model {
    @attr('string') owner_uuid;
    @attr('string') logo_uuid;
    @attr('string') backdrop_uuid;
-    @attr('string') address_uuid;
+    @attr('string') place_uuid;

    /** @relationships */
    @belongsTo('file') logo;
--- a/console/config/environment.js
+++ b/console/config/environment.js
@@ -43,7 +43,8 @@ module.exports = function (environment) {
            driverImage: getenv('DEFAULT_DRIVER_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
            userImage: getenv('DEFAULT_USER_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
            contactImage: getenv('DEFAULT_CONTACT_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
-            vehicleImage: getenv('DEFAULT_VEHICLE_IMAGE', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/vehicle-icons/light_commercial_van.svg'),
+            vendorImage: getenv('DEFAULT_VENDOR_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
+            vehicleImage: getenv('DEFAULT_VEHICLE_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/vehicle-placeholder.png'),
            vehicleAvatar: getenv('DEFAUL_VEHICLE_AVATAR', 'https://flb-assets.s3-ap-southeast-1.amazonaws.com/static/vehicle-icons/mini_bus.svg'),
        },

--- a/console/package.json
+++ b/console/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@fleetbase/console",
-    "version": "0.2.7",
+    "version": "0.2.8",
    "private": true,
    "description": "Fleetbase Console",
    "repository": "",
@@ -26,12 +26,12 @@
    "dependencies": {
        "@ember/legacy-built-in-components": "^0.4.1",
        "@fleetbase/ember-core": "^0.1.6",
-        "@fleetbase/ember-ui": "^0.2.2",
+        "@fleetbase/ember-ui": "^0.2.3",
        "@fleetbase/dev-engine": "^0.1.9",
        "@fleetbase/iam-engine": "^0.0.7",
-        "@fleetbase/fleetops-engine": "^0.3.1",
-        "@fleetbase/fleetops-data": "^0.1.1",
-        "@fleetbase/storefront-engine": "^0.2.2",
+        "@fleetbase/fleetops-engine": "^0.3.2",
+        "@fleetbase/fleetops-data": "^0.1.2",
+        "@fleetbase/storefront-engine": "^0.2.3",
        "@fleetbase/leaflet-routing-machine": "^3.2.16",
        "@fortawesome/ember-fontawesome": "^0.4.1",
        "ember-intl": "^6.0.0-beta.6",
@@ -67,7 +67,7 @@
        "dragula": "^3.7.3",
        "ember-auto-import": "^2.4.2",
        "ember-cli": "~4.6.0",
-        "ember-cli-app-version": "^5.0.0",
+        "ember-cli-app-version": "^6.0.1",
        "ember-cli-babel": "^7.26.11",
        "ember-cli-dependency-checker": "^3.3.1",
        "ember-cli-dotenv": "^3.1.0",
@@ -125,9 +125,9 @@
    },
    "pnpm": {
        "overrides": {
-            "@fleetbase/fleetops-data": "^0.1.1",
-            "@fleetbase/ember-core": "^0.1.5",
-            "@fleetbase/ember-ui": "^0.2.2"
+            "@fleetbase/fleetops-data": "^0.1.2",
+            "@fleetbase/ember-core": "^0.1.6",
+            "@fleetbase/ember-ui": "^0.2.3"
        }
    },
    "prettier": {
--- a/console/pnpm-lock.yaml
+++ b/console/pnpm-lock.yaml
--- a/packages/ember-ui
+++ b/packages/ember-ui
--- a/packages/fleetops
+++ b/packages/fleetops
--- a/packages/fleetops-data
+++ b/packages/fleetops-data