@fleetbase/fleetops-engine 0.6.49 → 0.6.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +185 -67
- package/addon/components/contact/panel-header.hbs +11 -48
- package/addon/components/customer/create-order-form.hbs +2 -2
- package/addon/components/customer/details.hbs +1 -2
- package/addon/components/customer/form.hbs +62 -50
- package/addon/components/customer/form.js +27 -1
- package/addon/components/customer/order-form.hbs +2 -2
- package/addon/components/customer/orders.hbs +50 -2
- package/addon/components/customer/orders.js +67 -5
- package/addon/components/display-place.hbs +2 -2
- package/addon/components/driver/form.hbs +1 -1
- package/addon/components/home/getting-started-guidance.hbs +113 -0
- package/addon/components/home/getting-started-guidance.js +107 -0
- package/addon/components/issue/details/comments.hbs +3 -0
- package/addon/components/issue/details/comments.js +3 -0
- package/addon/components/issue/details/correspondence.hbs +9 -0
- package/addon/components/issue/details/correspondence.js +83 -0
- package/addon/components/issue/details/documents.hbs +69 -0
- package/addon/components/issue/details/documents.js +85 -0
- package/addon/components/issue/details.hbs +220 -59
- package/addon/components/issue/details.js +245 -0
- package/addon/components/issue/form.hbs +19 -1
- package/addon/components/issue/panel-header.hbs +43 -0
- package/addon/components/issue/panel-header.js +22 -0
- package/addon/components/issue/timeline.hbs +40 -0
- package/addon/components/issue/timeline.js +45 -0
- package/addon/components/leaflet-tracking-marker.js +3 -0
- package/addon/components/map/drawer/position-listing.js +3 -0
- package/addon/components/map/google-live-map.js +6 -2
- package/addon/components/map/leaflet-live-map.hbs +48 -14
- package/addon/components/map/leaflet-live-map.js +201 -20
- package/addon/components/map/order-list-overlay.hbs +4 -4
- package/addon/components/modals/convert-customer-to-vendor.hbs +30 -0
- package/addon/components/modals/convert-customer-to-vendor.js +55 -0
- package/addon/components/modals/issue-assign.hbs +20 -0
- package/addon/components/modals/issue-assign.js +49 -0
- package/addon/components/modals/issue-close.hbs +30 -0
- package/addon/components/modals/issue-close.js +73 -0
- package/addon/components/modals/issue-status.hbs +20 -0
- package/addon/components/modals/issue-status.js +43 -0
- package/addon/components/modals/order-change-destination.hbs +46 -0
- package/addon/components/modals/order-change-destination.js +106 -0
- package/addon/components/modals/reset-customer-credentials.js +12 -6
- package/addon/components/modals/stop-activity.hbs +28 -0
- package/addon/components/modals/stop-activity.js +52 -0
- package/addon/components/modals/update-order-activity.hbs +78 -2
- package/addon/components/modals/update-order-activity.js +197 -5
- package/addon/components/orchestrator/resource-panel.hbs +0 -10
- package/addon/components/orchestrator/resource-panel.js +2 -4
- package/addon/components/order/activity-list.hbs +2 -2
- package/addon/components/order/activity-timeline.hbs +31 -29
- package/addon/components/order/details/activity.hbs +3 -3
- package/addon/components/order/details/activity.js +13 -2
- package/addon/components/order/details/documents.js +2 -0
- package/addon/components/order/details/proof.hbs +40 -38
- package/addon/components/order/details/proof.js +31 -4
- package/addon/components/order/details/purchase-rate.hbs +2 -2
- package/addon/components/order/details/route.hbs +11 -3
- package/addon/components/order/details/route.js +91 -14
- package/addon/components/order/details/tracking.hbs +101 -72
- package/addon/components/order/details/tracking.js +149 -2
- package/addon/components/order/details.hbs +5 -5
- package/addon/components/order/details.js +19 -1
- package/addon/components/order/form/details.hbs +3 -3
- package/addon/components/order/form/documents.js +11 -4
- package/addon/components/order/form/route.hbs +108 -104
- package/addon/components/order/form/route.js +37 -1
- package/addon/components/order/form/service-rate.hbs +2 -2
- package/addon/components/order/header.hbs +1 -1
- package/addon/components/order-config-manager/activity-flow.hbs +4 -1
- package/addon/components/order-config-manager/activity-flow.js +178 -12
- package/addon/components/place/address.js +1 -1
- package/addon/components/route-list.hbs +17 -29
- package/addon/components/route-list.js +42 -10
- package/addon/components/service-rate/details.hbs +42 -1
- package/addon/components/service-rate/form.hbs +119 -1
- package/addon/components/service-rate/form.js +59 -0
- package/addon/components/vehicle/form.js +1 -1
- package/addon/components/vehicle/pill.hbs +1 -1
- package/addon/components/vendor/personnel-manager.hbs +166 -0
- package/addon/components/vendor/personnel-manager.js +143 -0
- package/addon/components/widget/live-fleet.hbs +1 -0
- package/addon/components/widget/live-fleet.js +2 -7
- package/addon/components/widget/revenue-trend.hbs +1 -1
- package/addon/components/widget/revenue-trend.js +75 -2
- package/addon/controllers/management/contacts/customers/details.js +31 -13
- package/addon/controllers/management/contacts/customers.js +16 -5
- package/addon/controllers/management/contacts/index/details.js +31 -13
- package/addon/controllers/management/contacts/index.js +7 -0
- package/addon/controllers/management/issues/index/details.js +52 -6
- package/addon/controllers/management/vehicles/index/new.js +1 -1
- package/addon/controllers/management/vendors/index/details.js +4 -0
- package/addon/controllers/operations/orders/index/details.js +15 -7
- package/addon/controllers/operations/orders/index.js +15 -1
- package/addon/extension.js +19 -12
- package/addon/helpers/format-duration.js +1 -38
- package/addon/helpers/place-address-html.js +2 -2
- package/addon/initializers/load-leaflet-assets.js +5 -6
- package/addon/initializers/patch-ember-leaflet-tooltip-layer.js +51 -0
- package/addon/routes/management/issues/index/details.js +1 -1
- package/addon/routes/operations/service-rates/index.js +1 -1
- package/addon/routes.js +1 -0
- package/addon/services/contact-actions.js +231 -1
- package/addon/services/geofence.js +163 -19
- package/addon/services/getting-started.js +44 -0
- package/addon/services/issue-actions.js +71 -0
- package/addon/services/leaflet-contextmenu-manager.js +27 -0
- package/addon/services/leaflet-map-manager.js +2 -0
- package/addon/services/map-adapter/leaflet.js +19 -0
- package/addon/services/service-areas.js +3 -0
- package/addon/services/vehicle-actions.js +1 -1
- package/addon/styles/fleetops-engine.css +1127 -1
- package/addon/templates/management/contacts/customers/details.hbs +1 -1
- package/addon/templates/management/contacts/index/details.hbs +1 -1
- package/addon/templates/management/contacts.hbs +2 -2
- package/addon/templates/management/issues/index/details/index.hbs +3 -1
- package/addon/templates/management/issues/index/details.hbs +3 -2
- package/addon/templates/management/vendors/index/details/personnel.hbs +1 -2
- package/addon/templates/operations/orders/index/details/index.hbs +2 -2
- package/addon/templates/operations/orders/index.hbs +1 -1
- package/addon/templates/operations/service-rates/index/edit.hbs +1 -0
- package/addon/templates/operations/service-rates/index/new.hbs +1 -0
- package/addon/templates/settings/payments/onboard.hbs +8 -8
- package/addon/utils/fleet-ops-options.js +2 -1
- package/addon/utils/leaflet-draw-namespace-guard.js +22 -0
- package/addon/utils/leaflet-plugin-loader.js +219 -0
- package/addon/utils/normalize-order-config-flow.js +41 -0
- package/addon/utils/place-address-html.js +3 -2
- package/addon/utils/route-visualization.js +54 -7
- package/addon/utils/setup-customer-portal.js +4 -64
- package/app/components/home/getting-started-guidance.js +1 -0
- package/app/components/issue/details/comments.js +1 -0
- package/app/components/issue/details/correspondence.js +1 -0
- package/app/components/issue/details/documents.js +1 -0
- package/app/components/issue/panel-header.js +1 -0
- package/app/components/modals/convert-customer-to-vendor.js +1 -0
- package/app/components/modals/issue-assign.js +1 -0
- package/app/components/modals/issue-close.js +1 -0
- package/app/components/modals/issue-status.js +1 -0
- package/app/components/modals/order-change-destination.js +1 -0
- package/app/components/modals/stop-activity.js +1 -0
- package/app/components/vendor/personnel-manager.js +1 -0
- package/app/helpers/format-duration.js +1 -1
- package/app/services/getting-started.js +1 -0
- package/app/utils/leaflet-draw-namespace-guard.js +1 -0
- package/app/utils/leaflet-plugin-loader.js +1 -0
- package/composer.json +1 -1
- package/extension.json +1 -1
- package/package.json +5 -5
- package/server/migrations/2026_05_21_000001_add_geographic_rules_to_service_rate_fees_table.php +37 -0
- package/server/migrations/2026_05_25_000001_add_endpoint_tracking_refs_to_payloads_table.php +50 -0
- package/server/migrations/2026_05_27_000001_default_driver_vehicle_statuses_to_available.php +48 -0
- package/server/migrations/2026_05_31_000001_add_portal_fields_to_vendor_personnels_table.php +30 -0
- package/server/migrations/2026_06_03_000000_ensure_tags_column_on_issues_table.php +31 -0
- package/server/migrations/2026_06_03_000001_add_order_uuid_to_issues_table.php +25 -0
- package/server/migrations/2026_06_04_000001_backfill_order_transaction_subjects.php +39 -0
- package/server/migrations/2026_06_04_000002_backfill_order_transaction_directions.php +24 -0
- package/server/resources/views/labels/default.php +57 -49
- package/server/resources/views/labels/waypoint-label.php +27 -20
- package/server/resources/views/mail/customer-credentials.blade.php +16 -13
- package/server/seeders/Testing/ConnectivitySeeder.php +1 -0
- package/server/seeders/Testing/FleetSeeder.php +22 -22
- package/server/seeders/Testing/OrdersSeeder.php +6 -22
- package/server/seeders/Testing/VroomOrchestrationSeeder.php +21 -21
- package/server/src/Console/Commands/AuditCustomerUserConflicts.php +75 -0
- package/server/src/Exceptions/CustomerUserConflictException.php +13 -0
- package/server/src/Expansions/UserFilterExpansion.php +28 -0
- package/server/src/Http/Controllers/Api/v1/ContactController.php +17 -2
- package/server/src/Http/Controllers/Api/v1/CustomerController.php +876 -0
- package/server/src/Http/Controllers/Api/v1/DriverController.php +1 -1
- package/server/src/Http/Controllers/Api/v1/IssueController.php +2 -0
- package/server/src/Http/Controllers/Api/v1/OrderConfigController.php +54 -0
- package/server/src/Http/Controllers/Api/v1/OrderController.php +109 -80
- package/server/src/Http/Controllers/Api/v1/PlaceController.php +10 -58
- package/server/src/Http/Controllers/Api/v1/ServiceAreaController.php +2 -2
- package/server/src/Http/Controllers/Api/v1/VehicleController.php +20 -3
- package/server/src/Http/Controllers/Internal/v1/ContactController.php +154 -0
- package/server/src/Http/Controllers/Internal/v1/CustomerController.php +116 -6
- package/server/src/Http/Controllers/Internal/v1/GettingStartedController.php +17 -0
- package/server/src/Http/Controllers/Internal/v1/IssueController.php +251 -0
- package/server/src/Http/Controllers/Internal/v1/LiveController.php +101 -66
- package/server/src/Http/Controllers/Internal/v1/OrderController.php +530 -52
- package/server/src/Http/Controllers/Internal/v1/PlaceController.php +10 -68
- package/server/src/Http/Controllers/Internal/v1/ServiceQuoteController.php +1 -1
- package/server/src/Http/Controllers/Internal/v1/SettingController.php +2 -2
- package/server/src/Http/Controllers/Internal/v1/VehicleController.php +54 -1
- package/server/src/Http/Controllers/Internal/v1/VendorController.php +89 -0
- package/server/src/Http/Middleware/AuthenticateCustomerToken.php +34 -0
- package/server/src/Http/Requests/CreateCustomerOrderRequest.php +63 -0
- package/server/src/Http/Requests/CreateCustomerRequest.php +48 -0
- package/server/src/Http/Requests/CreateDriverRequest.php +1 -1
- package/server/src/Http/Requests/CreateIssueRequest.php +4 -0
- package/server/src/Http/Requests/CreateVehicleRequest.php +25 -1
- package/server/src/Http/Requests/Internal/CreateDriverRequest.php +1 -1
- package/server/src/Http/Requests/UpdateIssueRequest.php +4 -0
- package/server/src/Http/Requests/VerifyCreateCustomerRequest.php +29 -0
- package/server/src/Http/Resources/Internal/v1/OrderConfig.php +41 -0
- package/server/src/Http/Resources/v1/Customer.php +79 -0
- package/server/src/Http/Resources/v1/Index/Order.php +12 -9
- package/server/src/Http/Resources/v1/Issue.php +25 -0
- package/server/src/Http/Resources/v1/Order.php +20 -18
- package/server/src/Http/Resources/v1/OrderConfig.php +74 -0
- package/server/src/Http/Resources/v1/Payload.php +23 -20
- package/server/src/Http/Resources/v1/ServiceArea.php +33 -19
- package/server/src/Http/Resources/v1/ServiceRateFee.php +7 -0
- package/server/src/Listeners/HandleOrderDispatched.php +2 -2
- package/server/src/Mail/CustomerCredentialsMail.php +5 -6
- package/server/src/Models/Contact.php +122 -66
- package/server/src/Models/Customer.php +64 -0
- package/server/src/Models/Driver.php +12 -3
- package/server/src/Models/Entity.php +2 -2
- package/server/src/Models/Issue.php +47 -6
- package/server/src/Models/Order.php +62 -10
- package/server/src/Models/Payload.php +17 -1
- package/server/src/Models/ServiceArea.php +1 -1
- package/server/src/Models/ServiceRate.php +273 -1
- package/server/src/Models/ServiceRateFee.php +39 -9
- package/server/src/Models/TrackingNumber.php +8 -2
- package/server/src/Models/Vehicle.php +18 -2
- package/server/src/Models/VendorPersonnel.php +10 -1
- package/server/src/Models/Waypoint.php +2 -2
- package/server/src/Models/Zone.php +1 -1
- package/server/src/Notifications/LateDeparture.php +2 -2
- package/server/src/Notifications/ProlongedStoppage.php +2 -2
- package/server/src/Notifications/RouteDeviation.php +2 -2
- package/server/src/Observers/ContactObserver.php +2 -0
- package/server/src/Observers/PurchaseRateObserver.php +20 -0
- package/server/src/Observers/ServiceRateObserver.php +6 -6
- package/server/src/Observers/ZoneObserver.php +56 -0
- package/server/src/Orchestration/Engines/VroomOrchestrationEngine.php +1 -1
- package/server/src/Providers/FleetOpsServiceProvider.php +2 -0
- package/server/src/Support/Analytics/AbstractAnalytics.php +6 -6
- package/server/src/Support/Analytics/FuelEfficiency.php +2 -2
- package/server/src/Support/Analytics/OrdersByStatus.php +1 -1
- package/server/src/Support/Analytics/RevenueTrend.php +0 -1
- package/server/src/Support/Analytics/TopDrivers.php +10 -2
- package/server/src/Support/CustomerAuth.php +98 -0
- package/server/src/Support/GettingStarted.php +144 -0
- package/server/src/Support/LabelPdf.php +52 -0
- package/server/src/Support/Metrics/AbstractMetric.php +4 -4
- package/server/src/Support/PlaceSearch.php +282 -0
- package/server/src/Support/ResolvesOrderServiceStops.php +522 -0
- package/server/src/Tracking/TrackingContextBuilder.php +41 -38
- package/server/src/Tracking/TrackingIntelligenceService.php +109 -9
- package/server/src/Tracking/TrackingStop.php +13 -11
- package/server/src/routes.php +76 -10
- package/server/tests/AnalyticsRoutesTest.php +8 -0
- package/server/tests/CapacityAllocationEngineTest.php +10 -10
- package/server/tests/CustomerContactIdentitySafetyTest.php +95 -0
- package/server/tests/CustomerEndpointTest.php +199 -0
- package/server/tests/DriverVehicleStatusDefaultTest.php +39 -0
- package/server/tests/GettingStartedStatusTest.php +21 -0
- package/server/tests/LabelPdfRenderingTest.php +23 -0
- package/server/tests/LiveControllerViewportTest.php +60 -0
- package/server/tests/MetricsRegistryTest.php +4 -8
- package/server/tests/OrchestrationPayloadBuilderTest.php +2 -2
- package/server/tests/OrderActivityFlowRegressionTest.php +116 -0
- package/server/tests/OrderConfigEndpointTest.php +86 -0
- package/server/tests/OrderFileAttachmentTest.php +20 -0
- package/server/tests/ServiceAreaZoneApiShapeTest.php +78 -0
- package/server/tests/VehicleDriverAssignmentTest.php +18 -0
- package/translations/ar-ae.yml +9 -0
- package/translations/bg-bg.yaml +9 -0
- package/translations/en-us.yaml +12 -0
- package/translations/es-pa.yaml +9 -0
- package/translations/fr-fr.yaml +9 -0
- package/translations/mn-mn.yaml +9 -0
- package/translations/pt-br.yaml +9 -0
- package/translations/ru-ru.yaml +9 -0
- package/translations/vi-vn.yaml +9 -0
- package/server/migrations/2026_05_13_000001_repair_customer_contact_user_types.php +0 -86
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/issue/details/comments';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/issue/details/correspondence';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/issue/details/documents';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/issue/panel-header';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/modals/convert-customer-to-vendor';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/modals/issue-assign';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/modals/issue-close';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/modals/issue-status';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/modals/order-change-destination';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/modals/stop-activity';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/components/vendor/personnel-manager';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { default, formatDurationValue } from '@fleetbase/
|
|
1
|
+
export { default, formatDurationValue } from '@fleetbase/ember-ui/helpers/format-duration';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/fleetops-engine/services/getting-started';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default, ensureLeafletDrawEditNamespace } from '@fleetbase/fleetops-engine/utils/leaflet-draw-namespace-guard';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default, hasLeafletPluginsReady, resetLeafletPluginLoaderForTesting } from '@fleetbase/fleetops-engine/utils/leaflet-plugin-loader';
|
package/composer.json
CHANGED
package/extension.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fleetbase/fleetops-engine",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.51",
|
|
4
4
|
"description": "Fleet & Transport Management Extension for Fleetbase",
|
|
5
5
|
"fleetbase": {
|
|
6
6
|
"route": "fleet-ops"
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@babel/core": "^7.23.2",
|
|
45
|
-
"@fleetbase/ember-core": "^0.3.
|
|
46
|
-
"@fleetbase/ember-ui": "^0.3.
|
|
47
|
-
"@fleetbase/fleetops-data": "^0.1.
|
|
45
|
+
"@fleetbase/ember-core": "^0.3.21",
|
|
46
|
+
"@fleetbase/ember-ui": "^0.3.33",
|
|
47
|
+
"@fleetbase/fleetops-data": "^0.1.36",
|
|
48
48
|
"@fleetbase/leaflet-routing-machine": "^3.2.17",
|
|
49
49
|
"@fortawesome/ember-fontawesome": "^2.0.0",
|
|
50
50
|
"@fortawesome/fontawesome-svg-core": "6.4.0",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"ember-cli-sri": "^2.1.1",
|
|
92
92
|
"ember-cli-terser": "^4.0.2",
|
|
93
93
|
"ember-composable-helpers": "^5.0.0",
|
|
94
|
-
"ember-concurrency": "^4.0.
|
|
94
|
+
"ember-concurrency": "^4.0.6",
|
|
95
95
|
"ember-data": "^4.12.5",
|
|
96
96
|
"ember-engines": "^0.9.0",
|
|
97
97
|
"ember-load-initializers": "^2.1.2",
|
package/server/migrations/2026_05_21_000001_add_geographic_rules_to_service_rate_fees_table.php
ADDED
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
use Illuminate\Database\Migrations\Migration;
|
|
4
|
+
use Illuminate\Database\Schema\Blueprint;
|
|
5
|
+
use Illuminate\Support\Facades\Schema;
|
|
6
|
+
|
|
7
|
+
return new class extends Migration {
|
|
8
|
+
/**
|
|
9
|
+
* Run the migrations.
|
|
10
|
+
*
|
|
11
|
+
* @return void
|
|
12
|
+
*/
|
|
13
|
+
public function up()
|
|
14
|
+
{
|
|
15
|
+
Schema::table('service_rate_fees', function (Blueprint $table) {
|
|
16
|
+
$table->uuid('service_area_uuid')->nullable()->index()->after('service_rate_uuid');
|
|
17
|
+
$table->uuid('zone_uuid')->nullable()->index()->after('service_area_uuid');
|
|
18
|
+
$table->string('label')->nullable()->after('zone_uuid');
|
|
19
|
+
$table->integer('priority')->default(0)->after('label');
|
|
20
|
+
$table->boolean('is_fallback')->default(false)->after('priority');
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Reverse the migrations.
|
|
26
|
+
*
|
|
27
|
+
* @return void
|
|
28
|
+
*/
|
|
29
|
+
public function down()
|
|
30
|
+
{
|
|
31
|
+
Schema::table('service_rate_fees', function (Blueprint $table) {
|
|
32
|
+
$table->dropIndex(['service_area_uuid']);
|
|
33
|
+
$table->dropIndex(['zone_uuid']);
|
|
34
|
+
$table->dropColumn(['service_area_uuid', 'zone_uuid', 'label', 'priority', 'is_fallback']);
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
};
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
use Illuminate\Database\Migrations\Migration;
|
|
4
|
+
use Illuminate\Database\Schema\Blueprint;
|
|
5
|
+
use Illuminate\Support\Facades\Schema;
|
|
6
|
+
|
|
7
|
+
return new class extends Migration {
|
|
8
|
+
/**
|
|
9
|
+
* Run the migrations.
|
|
10
|
+
*/
|
|
11
|
+
public function up(): void
|
|
12
|
+
{
|
|
13
|
+
Schema::table('payloads', function (Blueprint $table) {
|
|
14
|
+
if (!Schema::hasColumn('payloads', 'pickup_tracking_number_uuid')) {
|
|
15
|
+
$table->uuid('pickup_tracking_number_uuid')->nullable()->index('payloads_pickup_tracking_number_uuid_index')->after('pickup_uuid');
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
if (!Schema::hasColumn('payloads', 'dropoff_tracking_number_uuid')) {
|
|
19
|
+
$table->uuid('dropoff_tracking_number_uuid')->nullable()->index('payloads_dropoff_tracking_number_uuid_index')->after('dropoff_uuid');
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
if (!Schema::hasColumn('payloads', 'return_tracking_number_uuid')) {
|
|
23
|
+
$table->uuid('return_tracking_number_uuid')->nullable()->index('payloads_return_tracking_number_uuid_index')->after('return_uuid');
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Reverse the migrations.
|
|
30
|
+
*/
|
|
31
|
+
public function down(): void
|
|
32
|
+
{
|
|
33
|
+
Schema::table('payloads', function (Blueprint $table) {
|
|
34
|
+
if (Schema::hasColumn('payloads', 'pickup_tracking_number_uuid')) {
|
|
35
|
+
$table->dropIndex('payloads_pickup_tracking_number_uuid_index');
|
|
36
|
+
$table->dropColumn('pickup_tracking_number_uuid');
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
if (Schema::hasColumn('payloads', 'dropoff_tracking_number_uuid')) {
|
|
40
|
+
$table->dropIndex('payloads_dropoff_tracking_number_uuid_index');
|
|
41
|
+
$table->dropColumn('dropoff_tracking_number_uuid');
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
if (Schema::hasColumn('payloads', 'return_tracking_number_uuid')) {
|
|
45
|
+
$table->dropIndex('payloads_return_tracking_number_uuid_index');
|
|
46
|
+
$table->dropColumn('return_tracking_number_uuid');
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
};
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
use Illuminate\Database\Migrations\Migration;
|
|
4
|
+
use Illuminate\Database\Schema\Blueprint;
|
|
5
|
+
use Illuminate\Support\Facades\DB;
|
|
6
|
+
use Illuminate\Support\Facades\Schema;
|
|
7
|
+
|
|
8
|
+
return new class extends Migration {
|
|
9
|
+
/**
|
|
10
|
+
* Run the migrations.
|
|
11
|
+
*
|
|
12
|
+
* @return void
|
|
13
|
+
*/
|
|
14
|
+
public function up()
|
|
15
|
+
{
|
|
16
|
+
DB::table('drivers')->where(function ($query) {
|
|
17
|
+
$query->where('status', 'active')->orWhereNull('status');
|
|
18
|
+
})->update(['status' => 'available']);
|
|
19
|
+
|
|
20
|
+
DB::table('vehicles')->where(function ($query) {
|
|
21
|
+
$query->where('status', 'active')->orWhereNull('status');
|
|
22
|
+
})->update(['status' => 'available']);
|
|
23
|
+
|
|
24
|
+
Schema::table('drivers', function (Blueprint $table) {
|
|
25
|
+
$table->string('status', 191)->nullable()->default('available')->change();
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
Schema::table('vehicles', function (Blueprint $table) {
|
|
29
|
+
$table->string('status')->nullable()->default('available')->change();
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Reverse the migrations.
|
|
35
|
+
*
|
|
36
|
+
* @return void
|
|
37
|
+
*/
|
|
38
|
+
public function down()
|
|
39
|
+
{
|
|
40
|
+
Schema::table('drivers', function (Blueprint $table) {
|
|
41
|
+
$table->string('status', 191)->nullable()->default(null)->change();
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
Schema::table('vehicles', function (Blueprint $table) {
|
|
45
|
+
$table->string('status')->nullable()->default(null)->change();
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
};
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
use Illuminate\Database\Migrations\Migration;
|
|
4
|
+
use Illuminate\Database\Schema\Blueprint;
|
|
5
|
+
use Illuminate\Support\Facades\Schema;
|
|
6
|
+
|
|
7
|
+
return new class extends Migration {
|
|
8
|
+
/**
|
|
9
|
+
* Run the migrations.
|
|
10
|
+
*/
|
|
11
|
+
public function up(): void
|
|
12
|
+
{
|
|
13
|
+
Schema::table('vendor_personnels', function (Blueprint $table) {
|
|
14
|
+
$table->string('role')->default('member')->after('contact_uuid');
|
|
15
|
+
$table->string('status')->default('active')->after('role');
|
|
16
|
+
$table->foreignUuid('invited_by_uuid')->nullable()->after('status')->references('uuid')->on('users')->nullOnDelete();
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Reverse the migrations.
|
|
22
|
+
*/
|
|
23
|
+
public function down(): void
|
|
24
|
+
{
|
|
25
|
+
Schema::table('vendor_personnels', function (Blueprint $table) {
|
|
26
|
+
$table->dropForeign(['invited_by_uuid']);
|
|
27
|
+
$table->dropColumn(['role', 'status', 'invited_by_uuid']);
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
};
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
use Illuminate\Database\Migrations\Migration;
|
|
4
|
+
use Illuminate\Database\Schema\Blueprint;
|
|
5
|
+
use Illuminate\Support\Facades\Schema;
|
|
6
|
+
|
|
7
|
+
return new class extends Migration {
|
|
8
|
+
/**
|
|
9
|
+
* Run the migrations.
|
|
10
|
+
*
|
|
11
|
+
* @return void
|
|
12
|
+
*/
|
|
13
|
+
public function up()
|
|
14
|
+
{
|
|
15
|
+
if (!Schema::hasColumn('issues', 'tags')) {
|
|
16
|
+
Schema::table('issues', function (Blueprint $table) {
|
|
17
|
+
$table->json('tags')->nullable()->after('priority');
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Reverse the migrations.
|
|
24
|
+
*
|
|
25
|
+
* @return void
|
|
26
|
+
*/
|
|
27
|
+
public function down()
|
|
28
|
+
{
|
|
29
|
+
// The tags column is owned by an earlier FleetOps issue refactor migration on current installs.
|
|
30
|
+
}
|
|
31
|
+
};
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
use Illuminate\Database\Migrations\Migration;
|
|
4
|
+
use Illuminate\Database\Schema\Blueprint;
|
|
5
|
+
use Illuminate\Support\Facades\Schema;
|
|
6
|
+
|
|
7
|
+
return new class extends Migration {
|
|
8
|
+
public function up(): void
|
|
9
|
+
{
|
|
10
|
+
Schema::table('issues', function (Blueprint $table) {
|
|
11
|
+
if (!Schema::hasColumn('issues', 'order_uuid')) {
|
|
12
|
+
$table->uuid('order_uuid')->nullable()->index()->after('vehicle_uuid');
|
|
13
|
+
}
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
public function down(): void
|
|
18
|
+
{
|
|
19
|
+
Schema::table('issues', function (Blueprint $table) {
|
|
20
|
+
if (Schema::hasColumn('issues', 'order_uuid')) {
|
|
21
|
+
$table->dropColumn('order_uuid');
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
};
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
use Fleetbase\FleetOps\Models\Order;
|
|
4
|
+
use Fleetbase\FleetOps\Models\PurchaseRate;
|
|
5
|
+
use Illuminate\Database\Migrations\Migration;
|
|
6
|
+
use Illuminate\Support\Facades\DB;
|
|
7
|
+
|
|
8
|
+
return new class extends Migration {
|
|
9
|
+
public function up(): void
|
|
10
|
+
{
|
|
11
|
+
DB::table('orders')
|
|
12
|
+
->whereNotNull('transaction_uuid')
|
|
13
|
+
->orderBy('id')
|
|
14
|
+
->select(['id', 'uuid', 'transaction_uuid', 'purchase_rate_uuid'])
|
|
15
|
+
->chunkById(500, function ($orders) {
|
|
16
|
+
foreach ($orders as $order) {
|
|
17
|
+
$updates = [
|
|
18
|
+
'subject_uuid' => $order->uuid,
|
|
19
|
+
'subject_type' => Order::class,
|
|
20
|
+
'updated_at' => now(),
|
|
21
|
+
];
|
|
22
|
+
|
|
23
|
+
if ($order->purchase_rate_uuid) {
|
|
24
|
+
$updates['context_uuid'] = $order->purchase_rate_uuid;
|
|
25
|
+
$updates['context_type'] = PurchaseRate::class;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
DB::table('transactions')
|
|
29
|
+
->where('uuid', $order->transaction_uuid)
|
|
30
|
+
->update($updates);
|
|
31
|
+
}
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
public function down(): void
|
|
36
|
+
{
|
|
37
|
+
// Intentionally no-op: this migration corrects broken order transaction linkage.
|
|
38
|
+
}
|
|
39
|
+
};
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
use Illuminate\Database\Migrations\Migration;
|
|
4
|
+
use Illuminate\Support\Facades\DB;
|
|
5
|
+
|
|
6
|
+
return new class extends Migration {
|
|
7
|
+
/**
|
|
8
|
+
* Backfill null directions for transactions linked to FleetOps orders.
|
|
9
|
+
*/
|
|
10
|
+
public function up(): void
|
|
11
|
+
{
|
|
12
|
+
DB::table('transactions')
|
|
13
|
+
->join('orders', 'orders.transaction_uuid', '=', 'transactions.uuid')
|
|
14
|
+
->whereNull('transactions.direction')
|
|
15
|
+
->update(['transactions.direction' => 'credit']);
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Direction backfills are not reversible without losing real data.
|
|
20
|
+
*/
|
|
21
|
+
public function down(): void
|
|
22
|
+
{
|
|
23
|
+
}
|
|
24
|
+
};
|
|
@@ -1,17 +1,25 @@
|
|
|
1
1
|
<?php
|
|
2
2
|
|
|
3
3
|
use Fleetbase\Fleetops\Models\Order;
|
|
4
|
-
use Fleetbase\Support\Utils;
|
|
4
|
+
use Fleetbase\Support\Utils;
|
|
5
|
+
|
|
6
|
+
?>
|
|
5
7
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
6
8
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
|
7
9
|
|
|
8
10
|
<head>
|
|
9
11
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
10
12
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
11
|
-
<title
|
|
13
|
+
<title><?php echo e($company->name ?? ($order->internal_id ?? $order->public_id)); ?> Label</title>
|
|
12
14
|
</head>
|
|
13
15
|
|
|
14
16
|
<style>
|
|
17
|
+
body {
|
|
18
|
+
font-family: "DejaVu Sans", "Noto Sans", "Noto Sans Arabic", "Noto Sans CJK SC", "Noto Sans CJK JP", sans-serif;
|
|
19
|
+
font-size: 12px;
|
|
20
|
+
line-height: 1.35;
|
|
21
|
+
}
|
|
22
|
+
|
|
15
23
|
.group:after {
|
|
16
24
|
content: "";
|
|
17
25
|
display: table;
|
|
@@ -45,33 +53,33 @@ use Fleetbase\Support\Utils; ?>
|
|
|
45
53
|
<div style="width: 420px; border: 2px #414141 solid; margin: auto;">
|
|
46
54
|
<div class="group" style="border-bottom: 1px #414141 solid; overflow: hidden;">
|
|
47
55
|
<div style="float: left; width: 130px; height: 120px; border-right: 1px #414141 solid; text-align: center; padding: 10px; box-sizing: border-box;">
|
|
48
|
-
<img src="data:image/png;base64
|
|
56
|
+
<img src="data:image/png;base64,<?php echo Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code; ?>" style="width: 100%; height: 100%; object-fit: cover;">
|
|
49
57
|
</div>
|
|
50
58
|
<div style="margin-top: 10px; padding-left: 10px;">
|
|
51
|
-
<div style="font-size: 18px; font-weight: bold;"
|
|
59
|
+
<div style="font-size: 18px; font-weight: bold;"><?php echo e($company->name); ?></div>
|
|
52
60
|
<div style="font-size: 16px; font-weight: 300; color: #000;">
|
|
53
61
|
<?php
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
+
if ($order && $order instanceof Order) {
|
|
63
|
+
$order->load('purchaseRate.serviceQuote.serviceRate');
|
|
64
|
+
$serviceName = data_get($order, 'purchaseRate.serviceQuote.serviceRate.service_name');
|
|
65
|
+
if ($serviceName) {
|
|
66
|
+
echo e($serviceName);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
?>
|
|
62
70
|
</div>
|
|
63
71
|
</div>
|
|
64
72
|
</div>
|
|
65
73
|
|
|
66
74
|
<?php
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
+
// load payload locations
|
|
76
|
+
if ($order) {
|
|
77
|
+
$order->load('payload.pickup', 'payload.dropoff', 'payload.entities');
|
|
78
|
+
$pickup = $pickup ?? $order->payload->pickup;
|
|
79
|
+
$dropoff = $dropoff ?? $order->payload->dropoff;
|
|
80
|
+
$entities = $entities ?? ($order->payload['entities'] ?? []);
|
|
81
|
+
}
|
|
82
|
+
?>
|
|
75
83
|
<?php if ($pickup) { ?>
|
|
76
84
|
<div class="group">
|
|
77
85
|
<div class="group" style="border-bottom: 1px #414141 solid; padding: 15px;">
|
|
@@ -79,35 +87,35 @@ use Fleetbase\Support\Utils; ?>
|
|
|
79
87
|
PICKUP:
|
|
80
88
|
</div>
|
|
81
89
|
<div class="places--display-address" style="float: left; display: inline-block">
|
|
82
|
-
<div class="line"><strong
|
|
83
|
-
<div class="line"
|
|
90
|
+
<div class="line"><strong><?php echo e($pickup->name); ?></strong></div>
|
|
91
|
+
<div class="line"><?php echo e($pickup->street1); ?></div>
|
|
84
92
|
<?php if (!empty($pickup->street2)) { ?>
|
|
85
|
-
<div class="line"
|
|
93
|
+
<div class="line"><?php echo e($pickup->street2); ?></div>
|
|
86
94
|
<?php } ?>
|
|
87
95
|
<div class="line">
|
|
88
96
|
<?php if (!empty($pickup->neighborhood)) { ?>
|
|
89
|
-
<span class="segment"
|
|
97
|
+
<span class="segment"><?php echo e($pickup->neighborhood); ?></span>
|
|
90
98
|
<?php } ?>
|
|
91
99
|
<?php if (!empty($pickup->district)) { ?>
|
|
92
|
-
<span class="segment"
|
|
100
|
+
<span class="segment"><?php echo e($pickup->district); ?></span>
|
|
93
101
|
<?php } ?>
|
|
94
102
|
</div>
|
|
95
103
|
<div class="line">
|
|
96
104
|
<?php if (!empty($pickup->postal_code)) { ?>
|
|
97
|
-
<span class="segment"
|
|
105
|
+
<span class="segment"><?php echo e($pickup->postal_code); ?></span>
|
|
98
106
|
<?php } ?>
|
|
99
107
|
<?php if (!empty($pickup->city)) { ?>
|
|
100
|
-
<span class="segment"
|
|
108
|
+
<span class="segment"><?php echo e($pickup->city); ?></span>
|
|
101
109
|
<?php } ?>
|
|
102
110
|
<?php if (!empty($pickup->province)) { ?>
|
|
103
|
-
<span class="segment"
|
|
111
|
+
<span class="segment"><?php echo e($pickup->province); ?></span>
|
|
104
112
|
<?php } ?>
|
|
105
113
|
<?php if (!empty($pickup->country)) { ?>
|
|
106
|
-
<span class="segment"
|
|
114
|
+
<span class="segment"><?php echo e($pickup->country); ?></span>
|
|
107
115
|
<?php } ?>
|
|
108
116
|
</div>
|
|
109
117
|
<?php if (!empty($pickup->phone_number)) { ?>
|
|
110
|
-
<div class="line"
|
|
118
|
+
<div class="line"><?php echo e($pickup->phone_number); ?></div>
|
|
111
119
|
<?php } ?>
|
|
112
120
|
</div>
|
|
113
121
|
</div>
|
|
@@ -120,35 +128,35 @@ use Fleetbase\Support\Utils; ?>
|
|
|
120
128
|
DROPOFF:
|
|
121
129
|
</div>
|
|
122
130
|
<div class="places--display-address" style="float: left; display: inline-block">
|
|
123
|
-
<div class="line"><strong
|
|
124
|
-
<div class="line"
|
|
131
|
+
<div class="line"><strong><?php echo e($dropoff->name); ?></strong></div>
|
|
132
|
+
<div class="line"><?php echo e($dropoff->street1); ?></div>
|
|
125
133
|
<?php if (!empty($dropoff->street2)) { ?>
|
|
126
|
-
<div class="line"
|
|
134
|
+
<div class="line"><?php echo e($dropoff->street2); ?></div>
|
|
127
135
|
<?php } ?>
|
|
128
136
|
<div class="line">
|
|
129
137
|
<?php if (!empty($dropoff->neighborhood)) { ?>
|
|
130
|
-
<span class="segment"
|
|
138
|
+
<span class="segment"><?php echo e($dropoff->neighborhood); ?></span>
|
|
131
139
|
<?php } ?>
|
|
132
140
|
<?php if (!empty($dropoff->district)) { ?>
|
|
133
|
-
<span class="segment"
|
|
141
|
+
<span class="segment"><?php echo e($dropoff->district); ?></span>
|
|
134
142
|
<?php } ?>
|
|
135
143
|
</div>
|
|
136
144
|
<div class="line">
|
|
137
145
|
<?php if (!empty($dropoff->postal_code)) { ?>
|
|
138
|
-
<span class="segment"
|
|
146
|
+
<span class="segment"><?php echo e($dropoff->postal_code); ?></span>
|
|
139
147
|
<?php } ?>
|
|
140
148
|
<?php if (!empty($dropoff->city)) { ?>
|
|
141
|
-
<span class="segment"
|
|
149
|
+
<span class="segment"><?php echo e($dropoff->city); ?></span>
|
|
142
150
|
<?php } ?>
|
|
143
151
|
<?php if (!empty($dropoff->province)) { ?>
|
|
144
|
-
<span class="segment"
|
|
152
|
+
<span class="segment"><?php echo e($dropoff->province); ?></span>
|
|
145
153
|
<?php } ?>
|
|
146
154
|
<?php if (!empty($dropoff->country)) { ?>
|
|
147
|
-
<span class="segment"
|
|
155
|
+
<span class="segment"><?php echo e($dropoff->country); ?></span>
|
|
148
156
|
<?php } ?>
|
|
149
157
|
</div>
|
|
150
158
|
<?php if (!empty($dropoff->phone_number)) { ?>
|
|
151
|
-
<div class="line"
|
|
159
|
+
<div class="line"><?php echo e($dropoff->phone_number); ?></div>
|
|
152
160
|
<?php } ?>
|
|
153
161
|
</div>
|
|
154
162
|
</div>
|
|
@@ -162,12 +170,12 @@ use Fleetbase\Support\Utils; ?>
|
|
|
162
170
|
<div class="line">
|
|
163
171
|
<strong>
|
|
164
172
|
<?php
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
173
|
+
if (isset($entity['name']) && !empty($entity['name'])) {
|
|
174
|
+
echo e($entity['name'] . ' - ' . ($entity['internal_id'] ?? ''));
|
|
175
|
+
} else {
|
|
176
|
+
echo e('ITEM -' . ($entity['internal_id'] ?? ''));
|
|
177
|
+
}
|
|
178
|
+
?>
|
|
171
179
|
</strong>
|
|
172
180
|
</div>
|
|
173
181
|
<?php } ?>
|
|
@@ -177,11 +185,11 @@ use Fleetbase\Support\Utils; ?>
|
|
|
177
185
|
<?php } ?>
|
|
178
186
|
<div class="group">
|
|
179
187
|
<div style="text-align: center; padding: 15px 0px; border-top: 1px #414141 solid;">
|
|
180
|
-
<img src="data:image/png;base64
|
|
181
|
-
<div
|
|
188
|
+
<img src="data:image/png;base64,<?php echo isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode; ?>" style="height: 90px; margin-top: 10px;">
|
|
189
|
+
<div><?php echo e(strtoupper(isset($trackingNumber) ? $trackingNumber->tracking_number : $order->trackingNumber->tracking_number)); ?></div>
|
|
182
190
|
</div>
|
|
183
191
|
</div>
|
|
184
192
|
</div>
|
|
185
193
|
</body>
|
|
186
194
|
|
|
187
|
-
</html>
|
|
195
|
+
</html>
|