Merge pull request #130 from fleetbase/dev-v0.2.1

preparing release with updated fleet ops ui/data and devices for tele…
This commit is contained in:
Ron
2023-09-30 14:35:36 +08:00
committed by GitHub
12 changed files with 87 additions and 71 deletions

2
.gitignore vendored
View File

@@ -12,6 +12,8 @@ api/storage/*.key
api/storage/uploads
api/storage/public
api/vendor
api/composer.dev.json
api/composer-install-dev.sh
act.sh
composer-auth.json
packages/billing-api

View File

@@ -7,9 +7,11 @@
"require": {
"php": "^7.3|^8.0",
"fleetbase/core-api": "^1.2.8",
"fleetbase/fleetops-api": "^1.1.6",
"fleetbase/fleetops-api": "^1.1.7",
"fleetbase/storefront-api": "^1.1.2",
"fleetbase/pallet-api": "^0.0.1",
"fleetbase/billing-api": "^0.0.2",
"fleetbase/flespi-integration": "^0.0.1",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.75",
@@ -46,6 +48,14 @@
{
"type": "path",
"url": "../packages/pallet-api"
},
{
"type": "path",
"url": "../packages/billing-api"
},
{
"type": "path",
"url": "../packages/flespi-integration"
}
],
"autoload": {

View File

@@ -10,7 +10,7 @@
"require": {
"php": "^7.3|^8.0",
"fleetbase/core-api": "^1.2.8",
"fleetbase/fleetops-api": "^1.1.6",
"fleetbase/fleetops-api": "^1.1.7",
"fleetbase/storefront-api": "^1.1.2",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",

126
api/composer.lock generated
View File

@@ -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": "0128ccad61732b0bc04988501abf0fff",
"content-hash": "d7433e415934facf525e3a95920714d5",
"packages": [
{
"name": "aloha/twilio",
@@ -192,16 +192,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.281.8",
"version": "3.282.0",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "eb349b9f31502a05c70362f57913b9fed6b65b1f"
"reference": "79a3ed5bb573f592823f8b1cffe0dbac3132e6b4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb349b9f31502a05c70362f57913b9fed6b65b1f",
"reference": "eb349b9f31502a05c70362f57913b9fed6b65b1f",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/79a3ed5bb573f592823f8b1cffe0dbac3132e6b4",
"reference": "79a3ed5bb573f592823f8b1cffe0dbac3132e6b4",
"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.281.8"
"source": "https://github.com/aws/aws-sdk-php/tree/3.282.0"
},
"time": "2023-09-15T18:34:59+00:00"
"time": "2023-09-28T18:09:20+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -2091,16 +2091,16 @@
},
{
"name": "fleetbase/fleetops-api",
"version": "1.1.6",
"version": "1.1.7",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/fleetops-api.git",
"reference": "69fc3c0369db46e863801ad50dec98fdd2439613"
"reference": "ba3f7387e70278f535d888f316ae4dfe8029fe94"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/fleetops-api/zipball/69fc3c0369db46e863801ad50dec98fdd2439613",
"reference": "69fc3c0369db46e863801ad50dec98fdd2439613",
"url": "https://api.github.com/repos/fleetbase/fleetops-api/zipball/ba3f7387e70278f535d888f316ae4dfe8029fe94",
"reference": "ba3f7387e70278f535d888f316ae4dfe8029fe94",
"shasum": ""
},
"require": {
@@ -2162,9 +2162,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/fleetops-api/issues",
"source": "https://github.com/fleetbase/fleetops-api/tree/v1.1.6"
"source": "https://github.com/fleetbase/fleetops-api/tree/v1.1.7"
},
"time": "2023-09-16T04:56:40+00:00"
"time": "2023-09-28T11:24:57+00:00"
},
{
"name": "fleetbase/storefront-api",
@@ -2726,16 +2726,16 @@
},
{
"name": "giggsey/libphonenumber-for-php",
"version": "8.13.20",
"version": "8.13.22",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
"reference": "c8da9366ab46cbc83f9fd0e7b0ac12f8ddbb721a"
"reference": "fc69cbcaff14c1af1f935b79033bdc5c0fa4a846"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/c8da9366ab46cbc83f9fd0e7b0ac12f8ddbb721a",
"reference": "c8da9366ab46cbc83f9fd0e7b0ac12f8ddbb721a",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/fc69cbcaff14c1af1f935b79033bdc5c0fa4a846",
"reference": "fc69cbcaff14c1af1f935b79033bdc5c0fa4a846",
"shasum": ""
},
"require": {
@@ -2794,7 +2794,7 @@
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php"
},
"time": "2023-09-07T06:33:03+00:00"
"time": "2023-09-29T14:53:55+00:00"
},
{
"name": "giggsey/locale",
@@ -6060,16 +6060,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.70.0",
"version": "2.71.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d"
"reference": "98276233188583f2ff845a0f992a235472d9466a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3298b38ea8612e5f77d38d1a99438e42f70341d",
"reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/98276233188583f2ff845a0f992a235472d9466a",
"reference": "98276233188583f2ff845a0f992a235472d9466a",
"shasum": ""
},
"require": {
@@ -6162,7 +6162,7 @@
"type": "tidelift"
}
],
"time": "2023-09-07T16:43:50+00:00"
"time": "2023-09-25T11:31:05+00:00"
},
{
"name": "nette/caching",
@@ -8261,16 +8261,16 @@
},
{
"name": "psr/http-client",
"version": "1.0.2",
"version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
"reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
"reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
"reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
"shasum": ""
},
"require": {
@@ -8307,9 +8307,9 @@
"psr-18"
],
"support": {
"source": "https://github.com/php-fig/http-client/tree/1.0.2"
"source": "https://github.com/php-fig/http-client"
},
"time": "2023-04-10T20:12:12+00:00"
"time": "2023-09-23T14:17:50+00:00"
},
{
"name": "psr/http-factory",
@@ -8522,16 +8522,16 @@
},
{
"name": "psy/psysh",
"version": "v0.11.20",
"version": "v0.11.21",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "0fa27040553d1d280a67a4393194df5228afea5b"
"reference": "bcb22101107f3bf770523b65630c9d547f60c540"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/0fa27040553d1d280a67a4393194df5228afea5b",
"reference": "0fa27040553d1d280a67a4393194df5228afea5b",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/bcb22101107f3bf770523b65630c9d547f60c540",
"reference": "bcb22101107f3bf770523b65630c9d547f60c540",
"shasum": ""
},
"require": {
@@ -8561,6 +8561,10 @@
"extra": {
"branch-alias": {
"dev-main": "0.11.x-dev"
},
"bamarni-bin": {
"bin-links": false,
"forward-command": false
}
},
"autoload": {
@@ -8592,9 +8596,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.11.20"
"source": "https://github.com/bobthecow/psysh/tree/v0.11.21"
},
"time": "2023-07-31T14:32:22+00:00"
"time": "2023-09-17T21:15:54+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -14099,16 +14103,16 @@
},
{
"name": "doctrine/dbal",
"version": "3.6.6",
"version": "3.7.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "63646ffd71d1676d2f747f871be31b7e921c7864"
"reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/63646ffd71d1676d2f747f871be31b7e921c7864",
"reference": "63646ffd71d1676d2f747f871be31b7e921c7864",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/00d03067f07482f025d41ab55e4ba0db5eca2cdf",
"reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf",
"shasum": ""
},
"require": {
@@ -14124,9 +14128,9 @@
"doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1",
"phpstan/phpstan": "1.10.29",
"phpstan/phpstan": "1.10.35",
"phpstan/phpstan-strict-rules": "^1.5",
"phpunit/phpunit": "9.6.9",
"phpunit/phpunit": "9.6.13",
"psalm/plugin-phpunit": "0.18.4",
"slevomat/coding-standard": "8.13.1",
"squizlabs/php_codesniffer": "3.7.2",
@@ -14192,7 +14196,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.6.6"
"source": "https://github.com/doctrine/dbal/tree/3.7.0"
},
"funding": [
{
@@ -14208,20 +14212,20 @@
"type": "tidelift"
}
],
"time": "2023-08-17T05:38:17+00:00"
"time": "2023-09-26T20:56:55+00:00"
},
{
"name": "doctrine/deprecations",
"version": "v1.1.1",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
"reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
"reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
"reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
"reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
"shasum": ""
},
"require": {
@@ -14253,9 +14257,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
"source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
"source": "https://github.com/doctrine/deprecations/tree/1.1.2"
},
"time": "2023-06-03T09:27:29+00:00"
"time": "2023-09-27T20:04:15+00:00"
},
{
"name": "doctrine/event-manager",
@@ -15284,16 +15288,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "9.2.28",
"version": "9.2.29",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef"
"reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef",
"reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
"reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
"shasum": ""
},
"require": {
@@ -15350,7 +15354,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.28"
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
},
"funding": [
{
@@ -15358,7 +15362,7 @@
"type": "github"
}
],
"time": "2023-09-12T14:36:20+00:00"
"time": "2023-09-19T04:57:46+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -15603,16 +15607,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.6.12",
"version": "9.6.13",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a122c2ebd469b751d774aa0f613dc0d67697653f"
"reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a122c2ebd469b751d774aa0f613dc0d67697653f",
"reference": "a122c2ebd469b751d774aa0f613dc0d67697653f",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be",
"reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be",
"shasum": ""
},
"require": {
@@ -15686,7 +15690,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.12"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13"
},
"funding": [
{
@@ -15702,7 +15706,7 @@
"type": "tidelift"
}
],
"time": "2023-09-12T14:39:31+00:00"
"time": "2023-09-19T05:39:22+00:00"
},
{
"name": "sebastian/cli-parser",

Submodule console updated: b99cefdc6d...44d21874d9