@fleetbase/storefront-engine 0.3.4 → 0.3.6

package/addon/templates/products/index/category/new.hbs

@@ -1,20 +1,6 @@
 <Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @width="570px" @fullHeight={{true}} @containerClass="border-l border-transparent dark:border-gray-700">
-    <Overlay::Header
-        @title={{this.overlayTitle}}
-        @titleClass="truncate"
-        @titleWrapperClass="w-3/4"
-        @headerLeftClass="w-70pc"
-        @headerLeftInnerClass="w-full flex-1"
-        @onPressCancel={{this.transitionBack}}
-    >
-        <Button
-            @icon={{this.overlayActionButtonIcon}}
-            @type="primary"
-            @text={{this.overlayActionButtonTitle}}
-            @onClick={{this.saveProduct}}
-            @isLoading={{this.isSaving}}
-            @isSubscriptionRequired={{true}}
-        />
+    <Overlay::Header @title={{this.overlayTitle}} @titleClass="truncate" @titleWrapperClass="w-3/4" @headerLeftClass="w-70pc" @headerLeftInnerClass="w-full flex-1" @onPressCancel={{this.transitionBack}}>
+        <Button @icon={{this.overlayActionButtonIcon}} @type="primary" @text={{this.overlayActionButtonTitle}} @onClick={{perform this.saveProduct}} @isLoading={{not this.saveProduct.isIdle}} />
     </Overlay::Header>
 
     <Overlay::Body @increaseInnerBodyHeightBy="0" @wrapperClass="new-order-overlay-body px-4 space-y-4 pt-4">
@@ -23,48 +9,21 @@
             <Textarea @value={{this.product.description}} class="form-input w-full" placeholder="Enter a description of your product...." rows={{4}} />
         </InputGroup>
         <InputGroup @name="Product Tags">
-            <TagInput
-                class="form-input"
-                @placeholder="Add tags"
-                @allowSpacesInTags={{true}}
-                @tags={{this.product.tags}}
-                @addTag={{this.addTag}}
-                @removeTagAtIndex={{this.removeTag}}
-                as |tag|
-            >
+            <TagInput class="form-input" @placeholder="Add tags" @allowSpacesInTags={{true}} @tags={{this.product.tags}} @addTag={{this.addTag}} @removeTagAtIndex={{this.removeTag}} as |tag|>
                 {{tag}}
             </TagInput>
         </InputGroup>
         <InputGroup @name="Product SKU" @value={{this.product.sku}} @helpText="Enter product SKU if applicable" />
         <div class="grid grid-cols-2 gap-2">
             <InputGroup @name="Price" @helpText="Enter a price users will pay to purchase this product">
-                <MoneyInput
-                    class="w-full"
-                    @currency={{if this.product.currency this.product.currency this.activeStore.currency}}
-                    @value={{this.product.price}}
-                    @canSelectCurrency={{false}}
-                    @onCurrencyChange={{fn (mut this.product.currency)}}
-                />
+                <MoneyInput class="w-full" @currency={{if this.product.currency this.product.currency this.activeStore.currency}} @value={{this.product.price}} @canSelectCurrency={{false}} @onCurrencyChange={{fn (mut this.product.currency)}} />
             </InputGroup>
             <InputGroup @name="Sale Price" @helpText="Optionally add a sale price for the product if the product is put on sale">
-                <MoneyInput
-                    class="w-full"
-                    @currency={{if this.product.currency this.product.currency this.activeStore.currency}}
-                    @value={{this.product.sale_price}}
-                    @canSelectCurrency={{false}}
-                    @onCurrencyChange={{fn (mut this.product.currency)}}
-                />
+                <MoneyInput class="w-full" @currency={{if this.product.currency this.product.currency this.activeStore.currency}} @value={{this.product.sale_price}} @canSelectCurrency={{false}} @onCurrencyChange={{fn (mut this.product.currency)}} />
             </InputGroup>
         </div>
 
-        <ContentPanel
-            @title="Metadata"
-            @open={{this.product.meta_array.length}}
-            @actionButtons={{this.metadataButtons}}
-            @pad={{true}}
-            @panelBodyWrapperClass="px-0 py-4"
-            @panelBodyClass="bg-white dark:bg-gray-800"
-        >
+        <ContentPanel @title="Metadata" @open={{this.product.meta_array.length}} @actionButtons={{this.metadataButtons}} @pad={{true}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
             {{#each this.product.meta_array as |metaField index|}}
                 <div class="px-4 py-3 border-b border-gray-200 dark:border-gray-700">
                     <div class="input-group">
@@ -119,7 +78,7 @@
             </div>
         </div>
 
-        <ContentPanel @title="Variants" @open={{this.product.variants.length}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
+        <ContentPanel @title="Variants" @open={{true}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
             <div class="content-panel-body p-4">
                 <div class="flex items-center justify-end">
                     <Button @text="New Variant" @icon="plus" @iconPrefix="fas" @onClick={{this.createProductVariant}} />
@@ -144,12 +103,7 @@
                                             <Input @type="text" @value={{variantOption.description}} class="form-input w-full" placeholder="Option Description" />
                                         </div>
                                         <div class="col-span-2">
-                                            <MoneyInput
-                                                class="w-full"
-                                                @currency={{if this.product.currency this.product.currency this.activeStore.currency}}
-                                                @canSelectCurrency={{false}}
-                                                @value={{variantOption.additional_cost}}
-                                            />
+                                            <MoneyInput class="w-full" @currency={{if this.product.currency this.product.currency this.activeStore.currency}} @canSelectCurrency={{false}} @value={{variantOption.additional_cost}} />
                                         </div>
                                         <div class="flex items-center justify-center text-center text-sm">
                                             <a href="javascript:;" {{on "click" (fn this.removeVariantOption variant index)}}>Remove</a>
@@ -163,10 +117,10 @@
             </Tabs>
         </ContentPanel>
 
-        <ContentPanel @title="Add-Ons" @open={{this.product.addon_categories.length}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
+        <ContentPanel @title="Add-Ons" @open={{true}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
             <div class="px-4">
                 <div class="flex items-center justify-end mb-3">
-                    <Button @text="Select Addon Categories" @icon="plus" @iconPrefix="fas" @onClick={{this.selectAddonCategory}} />
+                    <Button @text="Select Addon Categories" @icon="plus" @iconPrefix="fas" @onClick={{perform this.promptSelectAddonCategories}} />
                 </div>
                 <div class="space-y-2">
                     {{#each this.product.addon_categories as |addonCategory index|}}
@@ -215,9 +169,7 @@
         <ContentPanel @title="Images & Videos" @open={{this.product.files.length}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
             <div class="px-6 space-y-4">
                 {{#if this.isUploading}}
-                    <div
-                        class="min-h-56 dropzone w-full rounded-lg px-4 py-8 min-h bg-gray-50 dark:bg-gray-900 bg-opacity-25 text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500"
-                    >
+                    <div class="min-h-56 dropzone w-full rounded-lg px-4 py-8 min-h bg-gray-50 dark:bg-gray-900 bg-opacity-25 text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500">
                         <div class="flex items-center justify-center py-5">
                             <Spinner class="text-sm dar:text-gray-100" @loadingMessage={{t "component.dropzone.uploading"}} />
                         </div>
@@ -276,14 +228,7 @@
                             {{#each this.product.files as |file|}}
                                 <FileRecord @file={{file}} @fileIconClass={{if (eq this.product.primary_image_uuid file.id) "border-blue-400"}} @onDelete={{this.removeFile}}>
                                     <div class="flex items-center justify-evenly">
-                                        <Button
-                                            @icon="magic"
-                                            @text="Make Primary"
-                                            @size="xs"
-                                            @textClass="text-xs truncate"
-                                            @onClick={{fn this.makePrimaryFile file}}
-                                            @disabled={{eq this.product.primary_image_uuid file.id}}
-                                        />
+                                        <Button @icon="magic" @text="Make Primary" @size="xs" @textClass="text-xs truncate" @onClick={{fn this.makePrimaryFile file}} @disabled={{eq this.product.primary_image_uuid file.id}} />
                                     </div>
                                 </FileRecord>
                             {{/each}}

package/app/components/context-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/components/context-panel';

package/app/components/customer-panel/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/components/customer-panel/details';

package/app/components/customer-panel/orders.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/components/customer-panel/orders';

package/app/components/customer-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/components/customer-panel';

package/app/components/display-place.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/components/display-place';

package/app/components/order-panel/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/components/order-panel/details';

package/app/components/order-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/components/order-panel';

package/app/controllers/customers/index/view.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/controllers/customers/index/view';

package/app/controllers/orders/index/view.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/controllers/orders/index/view';

package/app/helpers/avatar-url.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/helpers/avatar-url';

package/app/routes/customers/index/view.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/routes/customers/index/view';

package/app/serializers/product-variant-option.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/serializers/product-variant-option';

package/app/services/context-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/services/context-panel';

package/app/templates/customers/index/view.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/templates/customers/index/view';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.4",
+    "version": "0.3.6",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.11",
-        "fleetbase/fleetops-api": "^0.4.17",
+        "fleetbase/core-api": "^1.4.15",
+        "fleetbase/fleetops-api": "^0.4.23",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "laravel-notification-channels/apn": "^5.0",
         "laravel-notification-channels/fcm": "^4.1",
@@ -44,7 +44,7 @@
     "autoload": {
         "psr-4": {
             "Fleetbase\\Storefront\\": "server/src/",
-            "Fleetbase\\Storefront\\Seeders\\": "seeders/"
+            "Fleetbase\\Storefront\\Seeders\\": "server/seeders/"
         }
     },
     "autoload-dev": {

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.4",
+    "version": "0.3.6",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.4",
+    "version": "0.3.6",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -43,9 +43,9 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.2.5",
+        "@fleetbase/ember-core": "^0.2.8",
         "@fleetbase/ember-ui": "^0.2.11",
-        "@fleetbase/fleetops-data": "^0.1.12",
+        "@fleetbase/fleetops-data": "^0.1.14",
         "@babel/core": "^7.23.2",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",
@@ -130,6 +130,12 @@
                 "options": {
                     "singleQuote": false
                 }
+            },
+            {
+                "files": "*.{yml,yaml}",
+                "options": {
+                    "tabWidth": 2
+                }
             }
         ]
     }

package/server/seeders/OrderConfigSeeder.php

@@ -2,10 +2,9 @@
 
 namespace Fleetbase\Storefront\Seeders;
 
-use Fleetbase\FleetOps\Models\OrderConfig;
 use Fleetbase\Models\Company;
+use Fleetbase\Storefront\Support\Storefront;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
 
 class OrderConfigSeeder extends Seeder
 {
@@ -18,253 +17,7 @@ class OrderConfigSeeder extends Seeder
     {
         $companies = Company::all();
         foreach ($companies as $company) {
-            static::createStorefrontConfig($company);
+            Storefront::createStorefrontConfig($company);
         }
     }
-
-    /**
-     * Creates or retrieves an existing storefront configuration for a given company.
-     *
-     * This method checks if a storefront configuration (OrderConfig) already exists for the given company.
-     * If it exists, the method returns the existing configuration. Otherwise, it creates a new configuration with
-     * predefined settings for a storefront order process. The configuration includes various stages like 'created',
-     * 'started', 'canceled', 'completed', etc., each defined with specific attributes like key, code, color, logic,
-     * events, status, actions, details, and more. These stages help manage the order lifecycle in a storefront context.
-     *
-     * @param Company $company The company for which the storefront configuration is being created or retrieved.
-     * @return OrderConfig The storefront order configuration associated with the specified company.
-     */
-    public static function createStorefrontConfig(Company $company): OrderConfig
-    {
-        return OrderConfig::firstOrCreate(
-            [
-                'company_uuid' => $company->uuid,
-                'key'          => 'storefront',
-                'namespace'    => 'system:order-config:storefront',
-            ],
-            [
-                'name'         => 'Storefront',
-                'key'          => 'storefront',
-                'namespace'    => 'system:order-config:storefront',
-                'description'  => 'Storefront order configuration for hyperlocal delivery and pickup',
-                'core_service' => 1,
-                'status'       => 'private',
-                'version'      => '0.0.1',
-                'tags'         => ['storefront', 'ecommerce', 'hyperlocal'],
-                'entities'     => [],
-                'meta'         => [],
-                'flow'         => [
-                    'created' => [
-                        'key'         => 'created',
-                        'code'        => 'created',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Order Created',
-                        'actions'     => [],
-                        'details'     => 'New order was created.',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => ['dispatched'],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'started' => [
-                        'key'         => 'started',
-                        'code'        => 'started',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Order Started',
-                        'actions'     => [],
-                        'details'     => 'Order has been started',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => ['canceled', 'preparing'],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'canceled' => [
-                        'key'         => 'canceled',
-                        'code'        => 'canceled',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => ['order.canceled'],
-                        'status'      => 'Order canceled',
-                        'actions'     => [],
-                        'details'     => 'Order could not be accepted',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => [],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'completed' => [
-                        'key'         => 'completed',
-                        'code'        => 'completed',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Order completed',
-                        'actions'     => [],
-                        'details'     => 'Driver has completed the order',
-                        'options'     => [],
-                        'complete'    => true,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => [],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'picked_up' => [
-                        'key'         => 'completed',
-                        'code'        => 'picked_up',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Order picked up',
-                        'actions'     => [],
-                        'details'     => 'Order has been picked up by customer',
-                        'options'     => [],
-                        'complete'    => true,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => [],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'preparing' => [
-                        'key'         => 'preparing',
-                        'code'        => 'preparing',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Order is being prepared',
-                        'actions'     => [],
-                        'details'     => 'Order has been received by {storefront.name} and is being prepared',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => ['driver_enroute_to_store', 'pickup_ready'],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'dispatched' => [
-                        'key'         => 'dispatched',
-                        'code'        => 'dispatched',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Order Dispatched',
-                        'actions'     => [],
-                        'details'     => 'Order has been dispatched.',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => ['started'],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'pickup_ready' => [
-                        'key'   => 'ready',
-                        'code'  => 'pickup_ready',
-                        'color' => '#1f2937',
-                        'logic' => [
-                            [
-                                'type'       => 'if',
-                                'conditions' => [
-                                    [
-                                        'field'    => 'meta.is_pickup',
-                                        'value'    => 'true',
-                                        'operator' => 'equal',
-                                    ],
-                                ],
-                            ],
-                        ],
-                        'events'      => [],
-                        'status'      => 'Order is ready for pickup',
-                        'actions'     => [],
-                        'details'     => 'Order is ready to be picked up by customer',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => ['picked_up'],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'driver_enroute' => [
-                        'key'         => 'driver_enroute',
-                        'code'        => 'driver_enroute',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Driver en-route',
-                        'actions'     => [],
-                        'details'     => 'Driver is on the way to the customer',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => ['completed'],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'driver_picked_up' => [
-                        'key'         => 'driver_picked_up',
-                        'code'        => 'driver_picked_up',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Driver picked up',
-                        'actions'     => [],
-                        'details'     => 'Driver has picked up order',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => ['driver_enroute'],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                    'driver_enroute_to_store' => [
-                        'key'         => 'driver_enroute',
-                        'code'        => 'driver_enroute_to_store',
-                        'color'       => '#1f2937',
-                        'logic'       => [],
-                        'events'      => [],
-                        'status'      => 'Driver en-route',
-                        'actions'     => [],
-                        'details'     => 'Driver en-route to store',
-                        'options'     => [],
-                        'complete'    => false,
-                        'entities'    => [],
-                        'sequence'    => 0,
-                        'activities'  => ['driver_picked_up'],
-                        'internalId'  => Str::uuid(),
-                        'pod_method'  => 'scan',
-                        'require_pod' => false,
-                    ],
-                ],
-            ]
-        );
-    }
 }

package/server/src/Http/Controllers/AddonCategoryController.php

@@ -2,6 +2,10 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
+use Fleetbase\Storefront\Models\AddonCategory;
+use Fleetbase\Support\Http;
+use Illuminate\Http\Request;
+
 class AddonCategoryController extends StorefrontController
 {
     /**
@@ -10,4 +14,90 @@ class AddonCategoryController extends StorefrontController
      * @var string
      */
     public $resource = 'addon_category';
+
+    /**
+     * Creates a new record based on the provided request data.
+     *
+     * This method handles the creation of a new record using data from the request.
+     * It includes a validation step, creation of the record, and an optional closure
+     * to perform additional operations on the model and request data. The method
+     * returns an instance of a resource, which wraps the created record. Error handling
+     * is implemented to catch and respond to various exceptions that might occur during the process.
+     *
+     * @param Request $request the incoming HTTP request containing data for the new record
+     *
+     * @return mixed an instance of the resource class containing the created record, or an error response
+     *
+     * @throws \Exception                                                general exceptions with a message
+     * @throws \Illuminate\Database\QueryException                       database query exceptions with a message
+     * @throws \Fleetbase\Exceptions\FleetbaseRequestValidationException custom validation exceptions with error details
+     */
+    public function createRecord(Request $request)
+    {
+        try {
+            $this->validateRequest($request);
+
+            $record = $this->model->createRecordFromRequest($request, null, function (&$request, AddonCategory &$addonCategory) {
+                $addons = $request->array('addonCategory.addons');
+                $addonCategory->setAddons($addons);
+            });
+
+            if (Http::isInternalRequest($request)) {
+                $this->resource::wrap($this->resourceSingularlName);
+
+                return new $this->resource($record);
+            }
+
+            return new $this->resource($record);
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
+        } catch (\Illuminate\Database\QueryException $e) {
+            return response()->error($e->getMessage());
+        } catch (\Fleetbase\Exceptions\FleetbaseRequestValidationException $e) {
+            return response()->error($e->getErrors());
+        }
+    }
+
+    /**
+     * Updates an existing record based on the provided request data.
+     *
+     * This method updates a record identified by the provided ID using data from the request.
+     * It includes a validation step, updating of the record, and an optional closure
+     * to perform additional operations on the model and request data. The method returns
+     * an instance of a resource, which wraps the updated record. Error handling is implemented
+     * to catch and respond to various exceptions that might occur during the update process.
+     *
+     * @param Request $request the incoming HTTP request containing data for updating the record
+     * @param string  $id      the identifier of the record to be updated
+     *
+     * @return mixed an instance of the resource class containing the updated record, or an error response
+     *
+     * @throws \Exception                                                general exceptions with a message
+     * @throws \Illuminate\Database\QueryException                       database query exceptions with a message
+     * @throws \Fleetbase\Exceptions\FleetbaseRequestValidationException custom validation exceptions with error details
+     */
+    public function updateRecord(Request $request, string $id)
+    {
+        try {
+            $this->validateRequest($request);
+            $record = $this->model->updateRecordFromRequest($request, $id, function (&$request, AddonCategory &$addonCategory) {
+                $addons = $request->array('addonCategory.addons');
+                $addonCategory->setAddons($addons);
+            });
+
+            if (Http::isInternalRequest($request)) {
+                $this->resource::wrap($this->resourceSingularlName);
+
+                return new $this->resource($record);
+            }
+
+            return new $this->resource($record);
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
+        } catch (\Illuminate\Database\QueryException $e) {
+            return response()->error($e->getMessage());
+        } catch (\Fleetbase\Exceptions\FleetbaseRequestValidationException $e) {
+            return response()->error($e->getErrors());
+        }
+    }
 }