Compare commits

..

3 Commits

Author SHA1 Message Date
Ron
099ea57c39 Merge pull request #231 from fleetbase/dev-v0.4.12
v0.4.12
2024-03-13 15:26:36 +08:00
Ronald A. Richardson
5492bc7299 - Revamped service rates to integrate with the new order configuration system.
- Enhanced activities to now support proof of delivery requirements.
- Patched and improved the stringent validation for creating new orders.
- Added a new column `order_config_uuid` to the `service_rates` table for better data management.
- Various other minor improvements and optimizations for enhanced performance and stability.
- Critical patch and improvement to location service
2024-03-13 15:15:42 +08:00
Ron
00b037a385 Merge pull request #229 from fleetbase/dev-v0.4.11
v0.4.11
2024-03-12 18:18:42 +08:00
6 changed files with 68 additions and 67 deletions

View File

@@ -10,7 +10,7 @@
"require": {
"php": "^8.0",
"fleetbase/core-api": "^1.4.12",
"fleetbase/fleetops-api": "^0.4.18",
"fleetbase/fleetops-api": "^0.4.19",
"fleetbase/storefront-api": "^0.3.5",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^10.0",

99
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": "f3a1061cf8d83095fed61c086818d32f",
"content-hash": "7eb3740c95bbedc1da6a339f7652bf1a",
"packages": [
{
"name": "aloha/twilio",
@@ -136,16 +136,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.300.15",
"version": "3.300.16",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "0cd194438b84588615121a93d0bc46bf55ca678b"
"reference": "d6afaeaa0c0e2c3be5f5223f72c0b5e2b2667b67"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0cd194438b84588615121a93d0bc46bf55ca678b",
"reference": "0cd194438b84588615121a93d0bc46bf55ca678b",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d6afaeaa0c0e2c3be5f5223f72c0b5e2b2667b67",
"reference": "d6afaeaa0c0e2c3be5f5223f72c0b5e2b2667b67",
"shasum": ""
},
"require": {
@@ -225,9 +225,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.300.15"
"source": "https://github.com/aws/aws-sdk-php/tree/3.300.16"
},
"time": "2024-03-11T18:33:13+00:00"
"time": "2024-03-12T18:04:55+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -2382,16 +2382,16 @@
},
{
"name": "fleetbase/fleetops-api",
"version": "0.4.18",
"version": "0.4.19",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/fleetops.git",
"reference": "b0d5547e60e30e4cc3bb19772f1a7e224c779da7"
"reference": "7a90049f5f7125c324a249c2d6d99976b4c5b1dc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/b0d5547e60e30e4cc3bb19772f1a7e224c779da7",
"reference": "b0d5547e60e30e4cc3bb19772f1a7e224c779da7",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/7a90049f5f7125c324a249c2d6d99976b4c5b1dc",
"reference": "7a90049f5f7125c324a249c2d6d99976b4c5b1dc",
"shasum": ""
},
"require": {
@@ -2465,9 +2465,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/fleetops/issues",
"source": "https://github.com/fleetbase/fleetops/tree/v0.4.18"
"source": "https://github.com/fleetbase/fleetops/tree/v0.4.19"
},
"time": "2024-03-12T09:52:49+00:00"
"time": "2024-03-13T07:05:34+00:00"
},
{
"name": "fleetbase/laravel-mysql-spatial",
@@ -4930,22 +4930,22 @@
},
{
"name": "laravel-notification-channels/fcm",
"version": "4.1.0",
"version": "4.2.0",
"source": {
"type": "git",
"url": "https://github.com/laravel-notification-channels/fcm.git",
"reference": "5291e6aa485650e4097e787cf20cf02fdd5cf711"
"reference": "88de99990b8c49fa9a398101302880bd5ad0770f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel-notification-channels/fcm/zipball/5291e6aa485650e4097e787cf20cf02fdd5cf711",
"reference": "5291e6aa485650e4097e787cf20cf02fdd5cf711",
"url": "https://api.github.com/repos/laravel-notification-channels/fcm/zipball/88de99990b8c49fa9a398101302880bd5ad0770f",
"reference": "88de99990b8c49fa9a398101302880bd5ad0770f",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^7.0",
"illuminate/notifications": "^10.0",
"illuminate/support": "^10.0",
"illuminate/notifications": "^10.0|^11.0",
"illuminate/support": "^10.0|^11.0",
"kreait/laravel-firebase": "^5.0",
"php": ">= 8.2"
},
@@ -4975,9 +4975,9 @@
"homepage": "https://github.com/laravel-notification-channels/fcm",
"support": {
"issues": "https://github.com/laravel-notification-channels/fcm/issues",
"source": "https://github.com/laravel-notification-channels/fcm/tree/4.1.0"
"source": "https://github.com/laravel-notification-channels/fcm/tree/4.2.0"
},
"time": "2023-12-24T22:12:05+00:00"
"time": "2024-02-27T23:08:57+00:00"
},
{
"name": "laravel-notification-channels/twilio",
@@ -5054,16 +5054,16 @@
},
{
"name": "laravel/framework",
"version": "v10.47.0",
"version": "v10.48.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "fce29b8de62733cdecbe12e3bae801f83fff2ea4"
"reference": "32a8bb151d748b579c3794dea53b56bd40dfbbd3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/fce29b8de62733cdecbe12e3bae801f83fff2ea4",
"reference": "fce29b8de62733cdecbe12e3bae801f83fff2ea4",
"url": "https://api.github.com/repos/laravel/framework/zipball/32a8bb151d748b579c3794dea53b56bd40dfbbd3",
"reference": "32a8bb151d748b579c3794dea53b56bd40dfbbd3",
"shasum": ""
},
"require": {
@@ -5111,6 +5111,7 @@
"conflict": {
"carbonphp/carbon-doctrine-types": ">=3.0",
"doctrine/dbal": ">=4.0",
"mockery/mockery": "1.6.8",
"phpunit/phpunit": ">=11.0.0",
"tightenco/collect": "<5.5.33"
},
@@ -5256,20 +5257,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-03-05T15:18:36+00:00"
"time": "2024-03-12T16:35:43+00:00"
},
{
"name": "laravel/octane",
"version": "v2.3.4",
"version": "v2.3.5",
"source": {
"type": "git",
"url": "https://github.com/laravel/octane.git",
"reference": "524a5821303a325cacea9593da056acdc31bf905"
"reference": "723574348341397cd0e5b59bd12e49de946c710e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/octane/zipball/524a5821303a325cacea9593da056acdc31bf905",
"reference": "524a5821303a325cacea9593da056acdc31bf905",
"url": "https://api.github.com/repos/laravel/octane/zipball/723574348341397cd0e5b59bd12e49de946c710e",
"reference": "723574348341397cd0e5b59bd12e49de946c710e",
"shasum": ""
},
"require": {
@@ -5344,7 +5345,7 @@
"issues": "https://github.com/laravel/octane/issues",
"source": "https://github.com/laravel/octane"
},
"time": "2024-02-23T22:19:52+00:00"
"time": "2024-03-08T16:14:35+00:00"
},
{
"name": "laravel/prompts",
@@ -15030,16 +15031,16 @@
},
{
"name": "laravel/sail",
"version": "v1.28.2",
"version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
"reference": "057777403b8ab79222dcc04983beaab10b6de6a0"
"reference": "e40cc7ffb5186c45698dbd47e9477e0e429396d0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/057777403b8ab79222dcc04983beaab10b6de6a0",
"reference": "057777403b8ab79222dcc04983beaab10b6de6a0",
"url": "https://api.github.com/repos/laravel/sail/zipball/e40cc7ffb5186c45698dbd47e9477e0e429396d0",
"reference": "e40cc7ffb5186c45698dbd47e9477e0e429396d0",
"shasum": ""
},
"require": {
@@ -15088,11 +15089,11 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
"time": "2024-03-04T14:58:29+00:00"
"time": "2024-03-08T16:32:33+00:00"
},
{
"name": "mockery/mockery",
"version": "1.6.7",
"version": "1.6.9",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
@@ -15511,16 +15512,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "10.1.13",
"version": "10.1.14",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "d51c3aec14896d5e80b354fad58e998d1980f8f8"
"reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d51c3aec14896d5e80b354fad58e998d1980f8f8",
"reference": "d51c3aec14896d5e80b354fad58e998d1980f8f8",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
"reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
"shasum": ""
},
"require": {
@@ -15577,7 +15578,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/10.1.13"
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
},
"funding": [
{
@@ -15585,7 +15586,7 @@
"type": "github"
}
],
"time": "2024-03-09T16:54:15+00:00"
"time": "2024-03-12T15:33:41+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -15832,16 +15833,16 @@
},
{
"name": "phpunit/phpunit",
"version": "10.5.12",
"version": "10.5.13",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "41a9886b85ac7bf3929853baf96b95361cd69d2b"
"reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/41a9886b85ac7bf3929853baf96b95361cd69d2b",
"reference": "41a9886b85ac7bf3929853baf96b95361cd69d2b",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7",
"reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7",
"shasum": ""
},
"require": {
@@ -15913,7 +15914,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.12"
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13"
},
"funding": [
{
@@ -15929,7 +15930,7 @@
"type": "tidelift"
}
],
"time": "2024-03-09T12:04:07+00:00"
"time": "2024-03-12T15:37:41+00:00"
},
{
"name": "sebastian/cli-parser",

View File

@@ -1,6 +1,6 @@
{
"name": "@fleetbase/console",
"version": "0.4.11",
"version": "0.4.12",
"private": true,
"description": "Fleetbase Console",
"repository": "https://github.com/fleetbase/fleetbase",
@@ -31,8 +31,8 @@
"dependencies": {
"@fleetbase/ember-core": "^0.2.6",
"@fleetbase/ember-ui": "^0.2.11",
"@fleetbase/fleetops-engine": "^0.4.18",
"@fleetbase/fleetops-data": "^0.1.13",
"@fleetbase/fleetops-engine": "^0.4.19",
"@fleetbase/fleetops-data": "^0.1.14",
"@fleetbase/storefront-engine": "^0.3.5",
"@fleetbase/dev-engine": "^0.2.1",
"@fleetbase/iam-engine": "^0.0.9",
@@ -144,7 +144,7 @@
"overrides": {
"@fleetbase/ember-core": "^0.2.6",
"@fleetbase/ember-ui": "^0.2.11",
"@fleetbase/fleetops-data": "^0.1.13"
"@fleetbase/fleetops-data": "^0.1.14"
}
},
"prettier": {

22
console/pnpm-lock.yaml generated
View File

@@ -3,7 +3,7 @@ lockfileVersion: '6.0'
overrides:
'@fleetbase/ember-core': ^0.2.6
'@fleetbase/ember-ui': ^0.2.11
'@fleetbase/fleetops-data': ^0.1.13
'@fleetbase/fleetops-data': ^0.1.14
dependencies:
'@ember/legacy-built-in-components':
@@ -19,11 +19,11 @@ dependencies:
specifier: ^0.2.11
version: 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
'@fleetbase/fleetops-data':
specifier: ^0.1.13
version: 0.1.13
specifier: ^0.1.14
version: 0.1.14
'@fleetbase/fleetops-engine':
specifier: ^0.4.18
version: 0.4.18(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
specifier: ^0.4.19
version: 0.4.19(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
'@fleetbase/iam-engine':
specifier: ^0.0.9
version: 0.0.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
@@ -2817,8 +2817,8 @@ packages:
- webpack-command
dev: false
/@fleetbase/fleetops-data@0.1.13:
resolution: {integrity: sha512-+JgP0p15TxMOxfJCSPJt/2nTA8ZugukGuaFYQTLzD0TFFKXjZE9bmYKPf+Z5w9L4oJ4b1oLsvRv6BL5dFt11lw==}
/@fleetbase/fleetops-data@0.1.14:
resolution: {integrity: sha512-CNgr/De//I2+USYBhFvaRD4c1KBbNJUUmPy5oT07fkFbCGplYeVfPhYlCxj2JpeGbtBBqfGEujrViRVRfR2JKg==}
engines: {node: '>= 18'}
dependencies:
'@babel/core': 7.23.2
@@ -2829,8 +2829,8 @@ packages:
- supports-color
dev: false
/@fleetbase/fleetops-engine@0.4.18(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0):
resolution: {integrity: sha512-/hT5JCb5u+HFn0zUdifDPXavncb25v+2Um+dN73tF7wok4y87HYYCUpEp251g96FX3jCB7SScwEkv0tOs9ggzg==}
/@fleetbase/fleetops-engine@0.4.19(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0):
resolution: {integrity: sha512-WWKFjwE7qOYQy28ITqvkbsnNvSRCSVsxO3ZNnVrLmVGprEKGYOiFHMeDwaic3ZH19oNPECoU4xdE4d/6EoxM8A==}
engines: {node: '>= 18'}
peerDependencies:
ember-engines: ^0.9.0
@@ -2838,7 +2838,7 @@ packages:
'@babel/core': 7.23.2
'@fleetbase/ember-core': 0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
'@fleetbase/ember-ui': 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
'@fleetbase/fleetops-data': 0.1.13
'@fleetbase/fleetops-data': 0.1.14
'@fleetbase/leaflet-routing-machine': 3.2.16
'@fortawesome/ember-fontawesome': 0.4.1(rollup@4.12.0)
'@fortawesome/fontawesome-svg-core': 6.4.0
@@ -2956,7 +2956,7 @@ packages:
'@babel/core': 7.23.2
'@fleetbase/ember-core': 0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
'@fleetbase/ember-ui': 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0)
'@fleetbase/fleetops-data': 0.1.13
'@fleetbase/fleetops-data': 0.1.14
'@fortawesome/ember-fontawesome': 0.4.1(rollup@4.12.0)
'@fortawesome/fontawesome-svg-core': 6.4.0
'@fortawesome/free-solid-svg-icons': 6.4.0