Compare commits

..

7 Commits

Author SHA1 Message Date
Ronald A. Richardson
2eabfc4698 version 0.5.4 2024-08-06 13:51:29 +08:00
Ron
77c2c01e58 Merge pull request #286 from fleetbase/dev-v0.5.5
v0.5.5
2024-08-06 12:48:41 +07:00
Ronald A. Richardson
7c5b5b5858 again, fix depn order 2024-08-06 13:33:29 +08:00
Ronald A. Richardson
aad072cf4c reverted dependency order in package.json 2024-08-06 13:32:39 +08:00
Ronald A. Richardson
c1c6dcafd8 ordered packages 2024-08-06 13:30:34 +08:00
Ronald A. Richardson
61992ee924 fix lockfile 2024-08-06 13:28:39 +08:00
Ronald A. Richardson
b18d6197bc upgraded registry bridge and updated erd 2024-08-06 13:25:32 +08:00
9 changed files with 11216 additions and 10942 deletions

View File

@@ -11,7 +11,7 @@
"php": "^8.0",
"fleetbase/core-api": "^1.5.1",
"fleetbase/fleetops-api": "^0.5.5",
"fleetbase/registry-bridge": "^0.0.11",
"fleetbase/registry-bridge": "^0.0.12",
"fleetbase/storefront-api": "^0.3.13",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^10.0",

64
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": "8925dd732b05917a6ab695e8a611f85f",
"content-hash": "ba3655549805a502b10cf271a6bdb6be",
"packages": [
{
"name": "aloha/twilio",
@@ -136,16 +136,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.316.10",
"version": "3.317.2",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "eeb8df6ff6caa428e8bcd631ad2a96430900a249"
"reference": "890ca1841a49317db884d1b87f7c08613213f852"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eeb8df6ff6caa428e8bcd631ad2a96430900a249",
"reference": "eeb8df6ff6caa428e8bcd631ad2a96430900a249",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/890ca1841a49317db884d1b87f7c08613213f852",
"reference": "890ca1841a49317db884d1b87f7c08613213f852",
"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.316.10"
"source": "https://github.com/aws/aws-sdk-php/tree/3.317.2"
},
"time": "2024-07-30T18:10:20+00:00"
"time": "2024-08-05T18:08:05+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -2615,16 +2615,16 @@
},
{
"name": "fleetbase/registry-bridge",
"version": "0.0.11",
"version": "0.0.12",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/registry-bridge.git",
"reference": "118af7657aacb68cf36ff2730f05b8e13524ef32"
"reference": "856b7204a4c3927754f7bdfa39c2b586156b673d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/registry-bridge/zipball/118af7657aacb68cf36ff2730f05b8e13524ef32",
"reference": "118af7657aacb68cf36ff2730f05b8e13524ef32",
"url": "https://api.github.com/repos/fleetbase/registry-bridge/zipball/856b7204a4c3927754f7bdfa39c2b586156b673d",
"reference": "856b7204a4c3927754f7bdfa39c2b586156b673d",
"shasum": ""
},
"require": {
@@ -2691,9 +2691,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/registry-bridge/issues",
"source": "https://github.com/fleetbase/registry-bridge/tree/v0.0.11"
"source": "https://github.com/fleetbase/registry-bridge/tree/v0.0.12"
},
"time": "2024-07-31T09:17:25+00:00"
"time": "2024-08-06T05:15:52+00:00"
},
{
"name": "fleetbase/storefront-api",
@@ -3887,16 +3887,16 @@
},
{
"name": "google/protobuf",
"version": "v4.27.2",
"version": "v4.27.3",
"source": {
"type": "git",
"url": "https://github.com/protocolbuffers/protobuf-php.git",
"reference": "1b9bfead0ea8108e6ab411258fc38417b62d4bf6"
"reference": "ff079fe467bf86ac8f3359e2eb77a1613ebd204d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/1b9bfead0ea8108e6ab411258fc38417b62d4bf6",
"reference": "1b9bfead0ea8108e6ab411258fc38417b62d4bf6",
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/ff079fe467bf86ac8f3359e2eb77a1613ebd204d",
"reference": "ff079fe467bf86ac8f3359e2eb77a1613ebd204d",
"shasum": ""
},
"require": {
@@ -3925,9 +3925,9 @@
"proto"
],
"support": {
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.27.2"
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.27.3"
},
"time": "2024-06-25T19:14:44+00:00"
"time": "2024-07-31T13:27:16+00:00"
},
{
"name": "graham-campbell/result-type",
@@ -10972,16 +10972,16 @@
},
{
"name": "spatie/laravel-responsecache",
"version": "7.5.2",
"version": "7.6.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-responsecache.git",
"reference": "e69b3f3abc302a255e5b32c68303d41f09d38bd3"
"reference": "ccaf6fd941e86ea08197b787864bec4a01f658e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-responsecache/zipball/e69b3f3abc302a255e5b32c68303d41f09d38bd3",
"reference": "e69b3f3abc302a255e5b32c68303d41f09d38bd3",
"url": "https://api.github.com/repos/spatie/laravel-responsecache/zipball/ccaf6fd941e86ea08197b787864bec4a01f658e0",
"reference": "ccaf6fd941e86ea08197b787864bec4a01f658e0",
"shasum": ""
},
"require": {
@@ -11039,7 +11039,7 @@
"spatie"
],
"support": {
"source": "https://github.com/spatie/laravel-responsecache/tree/7.5.2"
"source": "https://github.com/spatie/laravel-responsecache/tree/7.6.0"
},
"funding": [
{
@@ -11051,7 +11051,7 @@
"type": "github"
}
],
"time": "2024-04-03T09:44:10+00:00"
"time": "2024-08-05T09:57:46+00:00"
},
{
"name": "spatie/laravel-schedule-monitor",
@@ -17522,16 +17522,16 @@
},
{
"name": "spatie/flare-client-php",
"version": "1.7.0",
"version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/flare-client-php.git",
"reference": "097040ff51e660e0f6fc863684ac4b02c93fa234"
"reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/flare-client-php/zipball/097040ff51e660e0f6fc863684ac4b02c93fa234",
"reference": "097040ff51e660e0f6fc863684ac4b02c93fa234",
"url": "https://api.github.com/repos/spatie/flare-client-php/zipball/180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122",
"reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122",
"shasum": ""
},
"require": {
@@ -17549,7 +17549,7 @@
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
"spatie/phpunit-snapshot-assertions": "^4.0|^5.0"
"spatie/pest-plugin-snapshots": "^1.0|^2.0"
},
"type": "library",
"extra": {
@@ -17579,7 +17579,7 @@
],
"support": {
"issues": "https://github.com/spatie/flare-client-php/issues",
"source": "https://github.com/spatie/flare-client-php/tree/1.7.0"
"source": "https://github.com/spatie/flare-client-php/tree/1.8.0"
},
"funding": [
{
@@ -17587,7 +17587,7 @@
"type": "github"
}
],
"time": "2024-06-12T14:39:14+00:00"
"time": "2024-08-01T08:27:26+00:00"
},
{
"name": "spatie/ignition",

View File

@@ -1,6 +1,6 @@
{
"name": "@fleetbase/console",
"version": "0.5.3",
"version": "0.5.4",
"private": true,
"description": "Modular logistics and supply chain operating system (LSOS)",
"repository": "https://github.com/fleetbase/fleetbase",
@@ -30,12 +30,12 @@
},
"dependencies": {
"@fleetbase/ember-core": "^0.2.14",
"@fleetbase/ember-ui": "^0.2.20",
"@fleetbase/ember-ui": "^0.2.21",
"@fleetbase/fleetops-engine": "^0.5.5",
"@fleetbase/storefront-engine": "^0.3.13",
"@fleetbase/dev-engine": "^0.2.5",
"@fleetbase/iam-engine": "^0.0.14",
"@fleetbase/registry-bridge-engine": "^0.0.11",
"@fleetbase/registry-bridge-engine": "^0.0.12",
"@fleetbase/fleetops-data": "^0.1.17",
"@fleetbase/leaflet-routing-machine": "^3.2.16",
"@ember/legacy-built-in-components": "^0.4.1",
@@ -144,7 +144,7 @@
"pnpm": {
"overrides": {
"@fleetbase/ember-core": "^0.2.14",
"@fleetbase/ember-ui": "^0.2.20",
"@fleetbase/ember-ui": "^0.2.21",
"@fleetbase/fleetops-data": "^0.1.17"
}
},

1140
console/pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -825,88 +825,6 @@ erDiagram
TIMESTAMP deleted_at
}
fleetbase_billing_customers {
BIGINTUNSIGNED id PK
CHAR uuid
CHAR company_uuid FK
VARCHAR payment_gateway_id
VARCHAR pm_type
VARCHAR pm_last_four
TIMESTAMP trial_ends_at
JSON options
TIMESTAMP deleted_at
TIMESTAMP created_at
TIMESTAMP updated_at
}
fleetbase_billing_payment_gateways {
BIGINTUNSIGNED id PK
CHAR uuid
VARCHAR name
VARCHAR code
VARCHAR description
VARCHAR api_key
VARCHAR api_secret
VARCHAR callback_url
VARCHAR return_url
VARCHAR webhook_secret
CHAR logo_uuid FK
CHAR backdrop_uuid FK
JSON options
TIMESTAMP deleted_at
TIMESTAMP created_at
TIMESTAMP updated_at
}
fleetbase_billing_plans {
BIGINTUNSIGNED id PK
CHAR uuid
CHAR payment_gateway_uuid FK
VARCHAR name
TEXT description
VARCHAR payment_gateway_id
INT price
BIT recurring
VARCHAR billing_period
VARCHAR interval
INT trial_period_days
JSON options
TIMESTAMP deleted_at
TIMESTAMP created_at
TIMESTAMP updated_at
}
fleetbase_billing_subscription_items {
BIGINTUNSIGNED id PK
CHAR uuid
CHAR subscription_uuid FK
VARCHAR payment_gateway_id
VARCHAR payment_gateway_product
VARCHAR payment_gateway_price
INT quantity
TIMESTAMP deleted_at
TIMESTAMP created_at
TIMESTAMP updated_at
}
fleetbase_billing_subscriptions {
BIGINTUNSIGNED id PK
CHAR uuid
CHAR company_uuid FK
CHAR payment_gateway_uuid FK
CHAR plan_uuid FK
VARCHAR type
VARCHAR payment_gateway_id
VARCHAR payment_gateway_status
VARCHAR payment_gateway_price
INT quantity
TIMESTAMP trial_ends_at
TIMESTAMP ends_at
TIMESTAMP deleted_at
TIMESTAMP created_at
TIMESTAMP updated_at
}
fleetbase_categories {
INTUNSIGNED id PK
VARCHAR _key
@@ -1599,6 +1517,7 @@ erDiagram
CHAR purchase_rate_uuid FK
CHAR tracking_number_uuid FK
CHAR driver_assigned_uuid FK
CHAR vehicle_assigned_uuid FK
JSON meta
JSON options
BIT dispatched
@@ -1764,6 +1683,121 @@ erDiagram
TIMESTAMP updated_at
}
fleetbase_registry_extension_bundles {
INTUNSIGNED id PK
CHAR uuid
CHAR public_id
CHAR bundle_id
CHAR company_uuid FK
CHAR created_by_uuid FK
CHAR extension_uuid FK
CHAR bundle_uuid FK
VARCHAR bundle_number
VARCHAR version
VARCHAR status
JSON meta
TIMESTAMP created_at
TIMESTAMP updated_at
TIMESTAMP deleted_at
}
fleetbase_registry_extension_installs {
INTUNSIGNED id PK
CHAR uuid
CHAR company_uuid FK
CHAR extension_uuid FK
JSON meta
TIMESTAMP created_at
TIMESTAMP updated_at
TIMESTAMP deleted_at
}
fleetbase_registry_extension_purchases {
INTUNSIGNED id PK
CHAR uuid
CHAR company_uuid FK
CHAR extension_uuid FK
VARCHAR stripe_checkout_session_id
VARCHAR stripe_payment_intent_id
BIT is_subcription
INT locked_price
VARCHAR subscription_billing_period
VARCHAR subscription_model
JSON meta
TIMESTAMP created_at
TIMESTAMP updated_at
TIMESTAMP deleted_at
}
fleetbase_registry_extensions {
INTUNSIGNED id PK
CHAR uuid
CHAR company_uuid FK
CHAR created_by_uuid FK
CHAR registry_user_uuid FK
CHAR current_bundle_uuid FK
CHAR next_bundle_uuid FK
CHAR icon_uuid FK
CHAR category_uuid FK
VARCHAR public_id
VARCHAR stripe_product_id
VARCHAR name
VARCHAR subtitle
BIT self_managed
BIT payment_required
INT price
INT sale_price
BIT on_sale
BIT subscription_required
VARCHAR subscription_billing_period
VARCHAR subscription_model
INT subscription_amount
JSON subscription_tiers
VARCHAR currency
VARCHAR slug
VARCHAR version
VARCHAR fa_icon
MEDIUMTEXT description
MEDIUMTEXT promotional_text
VARCHAR website_url
VARCHAR repo_url
VARCHAR support_url
VARCHAR privacy_policy_url
VARCHAR tos_url
VARCHAR copyright
VARCHAR primary_language
JSON tags
JSON languages
JSON meta
BIT core_extension
VARCHAR status
TIMESTAMP published_at
TIMESTAMP accepted_at
TIMESTAMP rejected_at
TIMESTAMP created_at
TIMESTAMP updated_at
TIMESTAMP deleted_at
}
fleetbase_registry_users {
INTUNSIGNED id PK
CHAR uuid
CHAR company_uuid FK
CHAR user_uuid FK
VARCHAR public_id
VARCHAR token
VARCHAR registry_token
VARCHAR scope
TIMESTAMP expires_at
TIMESTAMP last_used_at
VARCHAR name
JSON meta
BIT revoked
TIMESTAMP created_at
TIMESTAMP updated_at
TIMESTAMP deleted_at
}
fleetbase_role_has_permissions {
CHAR permission_id PK
CHAR role_id PK
@@ -2195,6 +2229,8 @@ erDiagram
CHAR place_uuid FK
CHAR payload_uuid FK
CHAR tracking_number_uuid FK
CHAR customer_uuid
VARCHAR customer_type
VARCHAR _import_id
VARCHAR type
INT order
@@ -2701,13 +2737,10 @@ erDiagram
fleetbase_api_credentials ||--o{ fleetbase_webhook_endpoints : "foreign key"
fleetbase_api_credentials ||--o{ fleetbase_webhook_request_logs : "foreign key"
fleetbase_api_events ||--o{ fleetbase_webhook_request_logs : "foreign key"
fleetbase_billing_payment_gateways ||--o{ fleetbase_billing_plans : "foreign key"
fleetbase_billing_payment_gateways ||--o{ fleetbase_billing_subscriptions : "foreign key"
fleetbase_billing_plans ||--o{ fleetbase_billing_subscriptions : "foreign key"
fleetbase_billing_subscriptions ||--o{ fleetbase_billing_subscription_items : "foreign key"
fleetbase_categories ||--o{ fleetbase_entities : "foreign key"
fleetbase_categories ||--o{ fleetbase_extensions : "foreign key"
fleetbase_categories ||--o{ fleetbase_order_configs : "foreign key"
fleetbase_categories ||--o{ fleetbase_registry_extensions : "foreign key"
fleetbase_categories ||--o{ fleetbase_storefront_network_stores : "foreign key"
fleetbase_categories ||--o{ fleetbase_storefront_product_addon_categories : "foreign key"
fleetbase_categories ||--o{ fleetbase_storefront_product_addons : "foreign key"
@@ -2725,8 +2758,6 @@ erDiagram
fleetbase_comments ||--o{ fleetbase_comments : "foreign key"
fleetbase_companies ||--o{ fleetbase_api_credentials : "foreign key"
fleetbase_companies ||--o{ fleetbase_api_request_logs : "foreign key"
fleetbase_companies ||--o{ fleetbase_billing_customers : "foreign key"
fleetbase_companies ||--o{ fleetbase_billing_subscriptions : "foreign key"
fleetbase_companies ||--o{ fleetbase_chat_attachments : "foreign key"
fleetbase_companies ||--o{ fleetbase_chat_channels : "foreign key"
fleetbase_companies ||--o{ fleetbase_chat_logs : "foreign key"
@@ -2756,6 +2787,11 @@ erDiagram
fleetbase_companies ||--o{ fleetbase_positions : "foreign key"
fleetbase_companies ||--o{ fleetbase_proofs : "foreign key"
fleetbase_companies ||--o{ fleetbase_purchase_rates : "foreign key"
fleetbase_companies ||--o{ fleetbase_registry_extension_bundles : "foreign key"
fleetbase_companies ||--o{ fleetbase_registry_extension_installs : "foreign key"
fleetbase_companies ||--o{ fleetbase_registry_extension_purchases : "foreign key"
fleetbase_companies ||--o{ fleetbase_registry_extensions : "foreign key"
fleetbase_companies ||--o{ fleetbase_registry_users : "foreign key"
fleetbase_companies ||--o{ fleetbase_roles : "foreign key"
fleetbase_companies ||--o{ fleetbase_routes : "foreign key"
fleetbase_companies ||--o{ fleetbase_service_areas : "foreign key"
@@ -2790,7 +2826,6 @@ erDiagram
fleetbase_drivers ||--o{ fleetbase_issues : "foreign key"
fleetbase_drivers ||--o{ fleetbase_orders : "foreign key"
fleetbase_extensions ||--o{ fleetbase_extension_installs : "foreign key"
fleetbase_files ||--o{ fleetbase_billing_payment_gateways : "foreign key"
fleetbase_files ||--o{ fleetbase_categories : "foreign key"
fleetbase_files ||--o{ fleetbase_chat_attachments : "foreign key"
fleetbase_files ||--o{ fleetbase_companies : "foreign key"
@@ -2798,6 +2833,8 @@ erDiagram
fleetbase_files ||--o{ fleetbase_extensions : "foreign key"
fleetbase_files ||--o{ fleetbase_order_configs : "foreign key"
fleetbase_files ||--o{ fleetbase_proofs : "foreign key"
fleetbase_files ||--o{ fleetbase_registry_extension_bundles : "foreign key"
fleetbase_files ||--o{ fleetbase_registry_extensions : "foreign key"
fleetbase_files ||--o{ fleetbase_users : "foreign key"
fleetbase_files ||--o{ fleetbase_vehicles : "foreign key"
fleetbase_files ||--o{ fleetbase_vendors : "foreign key"
@@ -2834,6 +2871,11 @@ erDiagram
fleetbase_places ||--o{ fleetbase_storefront_store_locations : "foreign key"
fleetbase_policies ||--o{ fleetbase_model_has_policies : "foreign key"
fleetbase_purchase_rates ||--o{ fleetbase_orders : "foreign key"
fleetbase_registry_extension_bundles ||--o{ fleetbase_registry_extensions : "foreign key"
fleetbase_registry_extensions ||--o{ fleetbase_registry_extension_bundles : "foreign key"
fleetbase_registry_extensions ||--o{ fleetbase_registry_extension_installs : "foreign key"
fleetbase_registry_extensions ||--o{ fleetbase_registry_extension_purchases : "foreign key"
fleetbase_registry_users ||--o{ fleetbase_registry_extensions : "foreign key"
fleetbase_roles ||--o{ fleetbase_model_has_roles : "foreign key"
fleetbase_roles ||--o{ fleetbase_role_has_permissions : "foreign key"
fleetbase_routes ||--o{ fleetbase_orders : "foreign key"
@@ -2871,6 +2913,9 @@ erDiagram
fleetbase_users ||--o{ fleetbase_issues : "foreign key"
fleetbase_users ||--o{ fleetbase_order_configs : "foreign key"
fleetbase_users ||--o{ fleetbase_orders : "foreign key"
fleetbase_users ||--o{ fleetbase_registry_extension_bundles : "foreign key"
fleetbase_users ||--o{ fleetbase_registry_extensions : "foreign key"
fleetbase_users ||--o{ fleetbase_registry_users : "foreign key"
fleetbase_users ||--o{ fleetbase_user_devices : "foreign key"
fleetbase_users ||--o{ fleetbase_webhook_endpoints : "foreign key"
fleetbase_users ||--o{ fleetbase_storefront_carts : "foreign key"
@@ -2888,6 +2933,7 @@ erDiagram
fleetbase_vehicles ||--o{ fleetbase_fleet_vehicles : "foreign key"
fleetbase_vehicles ||--o{ fleetbase_fuel_reports : "foreign key"
fleetbase_vehicles ||--o{ fleetbase_issues : "foreign key"
fleetbase_vehicles ||--o{ fleetbase_orders : "foreign key"
fleetbase_vehicles ||--o{ fleetbase_vehicle_devices : "foreign key"
fleetbase_vendors ||--o{ fleetbase_drivers : "foreign key"
fleetbase_vendors ||--o{ fleetbase_entities : "foreign key"

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 2.3 MiB

20714
erd.svg

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB