@fleetbase/storefront-engine 0.2.4 → 0.2.6

package/server/src/Http/Requests/GetServiceQuoteFromCart.php

@@ -27,9 +27,9 @@ class GetServiceQuoteFromCart extends FleetbaseRequest
     {
         // valid origin is only required if store_ key
         return [
-            'origin' => $this->isStoreKey() ? ['required',  new IsValidLocation()] : [],
+            'origin'      => $this->isStoreKey() ? ['required',  new IsValidLocation()] : [],
             'destination' => ['required', new IsValidLocation()],
-            'cart' => 'required'
+            'cart'        => 'required',
         ];
     }
 

package/server/src/Http/Requests/InitializeCheckoutRequest.php

@@ -27,12 +27,12 @@ class InitializeCheckoutRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'gateway' => ['required', new GatewayExists],
-            'customer' => ['required', new CustomerExists],
-            'cart' => ['required', 'exists:storefront.carts,public_id'],
+            'gateway'      => ['required', new GatewayExists()],
+            'customer'     => ['required', new CustomerExists()],
+            'cart'         => ['required', 'exists:storefront.carts,public_id'],
             'serviceQuote' => ['required', 'exists:service_quotes,public_id'],
-            'cash' => ['sometimes', 'boolean'],
-            'pickup' => ['sometimes', 'boolean'],
+            'cash'         => ['sometimes', 'boolean'],
+            'pickup'       => ['sometimes', 'boolean'],
         ];
     }
 }

package/server/src/Http/Requests/NetworkActionRequest.php

@@ -13,7 +13,7 @@ class NetworkActionRequest extends FleetbaseRequest
      */
     public function all($keys = null)
     {
-        $data = parent::all($keys);
+        $data       = parent::all($keys);
         $data['id'] = $this->route('id');
 
         return $data;
@@ -37,7 +37,7 @@ class NetworkActionRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'id' => ['required', 'exists:storefront.networks,uuid']
+            'id' => ['required', 'exists:storefront.networks,uuid'],
         ];
     }
 }

package/server/src/Http/Requests/VerifyCreateCustomerRequest.php

@@ -24,8 +24,8 @@ class VerifyCreateCustomerRequest extends FleetbaseRequest
     public function rules()
     {
         return [
-            'mode' => 'required|in:email,sms',
-            'identity' => 'required'
+            'mode'     => 'required|in:email,sms',
+            'identity' => 'required',
         ];
     }
 }

package/server/src/Http/Resources/Cart.php

@@ -3,29 +3,38 @@
 namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
 
 class Cart extends FleetbaseResource
 {
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         return [
-            'id' => $this->public_id,
-            'currency' => $this->currency,
-            'subtotal' => $this->subtotal,
-            'total_items' => $this->total_items,
+            'id'                 => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'               => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'          => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company_uuid'       => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'user_uuid'          => $this->when(Http::isInternalRequest(), $this->user_uuid),
+            'checkout_uuid'      => $this->when(Http::isInternalRequest(), $this->checkout_uuid),
+            'checkout_uuid'      => $this->when(Http::isInternalRequest(), $this->checkout_uuid),
+            'customer_id'        => $this->customer_id,
+            'currency'           => $this->currency,
+            'subtotal'           => $this->subtotal,
+            'total_items'        => $this->total_items,
             'total_unique_items' => $this->total_unique_items,
-            'items' => $this->items ?? [],
-            'events' => $this->events ?? [],
-            'discount_code' => $this->discount_code,
-            'expires_at' => $this->expires_at,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'items'              => $this->items ?? [],
+            'events'             => $this->events ?? [],
+            'discount_code'      => $this->discount_code,
+            'expires_at'         => $this->expires_at,
+            'created_at'         => $this->created_at,
+            'updated_at'         => $this->updated_at,
         ];
     }
 }

package/server/src/Http/Resources/Category.php

@@ -10,26 +10,27 @@ class Category extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
      */
     public function toArray($request)
     {
         return [
-            'id' => $this->public_id,
-            'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
-            'name' => $this->name,
+            'id'          => $this->public_id,
+            'uuid'        => $this->when(Http::isInternalRequest(), $this->uuid),
+            'name'        => $this->name,
             'description' => $this->description,
-            'icon_url' => $this->icon_url,
-            'parent' => $this->whenLoaded(
+            'icon_url'    => $this->icon_url,
+            'parent'      => $this->whenLoaded(
                 'parentCategory',
                 function ($parentCategory) {
                     return $parentCategory->public_id;
                 }
             ),
-            'tags' => $this->tags ?? [],
-            'translations' => $this->translations ?? [],
-            'products' => Product::collection($this->whenLoaded('products')),
+            'tags'          => $this->tags ?? [],
+            'translations'  => $this->translations ?? [],
+            'products'      => Product::collection($this->whenLoaded('products')),
             'subcategories' => $this->when(
                 $request->has('with_subcategories'),
                 array_map(
@@ -39,8 +40,8 @@ class Category extends FleetbaseResource
                     $this->subCategories->toArray()
                 )
             ),
-            'order' => $this->order,
-            'slug' => $this->slug,
+            'order'      => $this->order,
+            'slug'       => $this->slug,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
         ];

package/server/src/Http/Resources/Customer.php

@@ -11,26 +11,27 @@ class Customer extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         return [
-            'id' => $this->when(Http::isInternalRequest(), $this->id, Str::replaceFirst('contact', 'customer', $this->public_id)),
-            'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
+            'id'          => $this->when(Http::isInternalRequest(), $this->id, Str::replaceFirst('contact', 'customer', $this->public_id)),
+            'uuid'        => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'   => $this->when(Http::isInternalRequest(), $this->public_id),
             'internal_id' => $this->internal_id,
-            'name' => $this->name,
-            'photo_url' => $this->photo_url,
-            'email' => $this->email,
-            'phone' => $this->phone,
-            'address' => data_get($this, 'address.address'),
-            'addresses' => $this->addresses,
-            'token' => $this->when($this->token, $this->token),
-            'slug' => $this->slug,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'name'        => $this->name,
+            'photo_url'   => $this->photo_url,
+            'email'       => $this->email,
+            'phone'       => $this->phone,
+            'address'     => data_get($this, 'address.address'),
+            'addresses'   => $this->addresses,
+            'token'       => $this->when($this->token, $this->token),
+            'slug'        => $this->slug,
+            'created_at'  => $this->created_at,
+            'updated_at'  => $this->updated_at,
         ];
     }
 }

package/server/src/Http/Resources/Gateway.php

@@ -10,22 +10,23 @@ class Gateway extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         return [
-            'id' => $this->when(Http::isInternalRequest(), $this->id,$this->public_id),
-            'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
-            'name' => $this->name,
-            'description' => $this->description,
-            'logo_url' => $this->logo_url,
-            'code' => $this->code,
-            'type' => $this->type,
-            'sandbox' => $this->sandbox,
-            'return_url' => $this->return_url,
+            'id'           => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'         => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'    => $this->when(Http::isInternalRequest(), $this->public_id),
+            'name'         => $this->name,
+            'description'  => $this->description,
+            'logo_url'     => $this->logo_url,
+            'code'         => $this->code,
+            'type'         => $this->type,
+            'sandbox'      => $this->sandbox,
+            'return_url'   => $this->return_url,
             'callback_url' => $this->callback_url,
         ];
     }

package/server/src/Http/Resources/Media.php

@@ -10,19 +10,20 @@ class Media extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         return [
-            'id' => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
-            'filename' => data_get($this, 'original_filename'),
-            'type' => data_get($this, 'content_type'),
-            'caption' => data_get($this, 'caption'),
-            'url' => data_get($this, 'url'),
-            'created_at' => $this->when(Http::isInternalRequest(),  $this->created_at),
+            'id'         => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'       => $this->when(Http::isInternalRequest(), $this->uuid),
+            'filename'   => data_get($this, 'original_filename'),
+            'type'       => data_get($this, 'content_type'),
+            'caption'    => data_get($this, 'caption'),
+            'url'        => data_get($this, 'url'),
+            'created_at' => $this->when(Http::isInternalRequest(), $this->created_at),
             'updated_at' => $this->when(Http::isInternalRequest(), $this->updated_at),
         ];
     }

package/server/src/Http/Resources/Network.php

@@ -10,39 +10,44 @@ class Network extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         return [
-            'id' => $this->when(Http::isInternalRequest(), $this->id,$this->public_id),
-            'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
-            'key' => $this->when(Http::isInternalRequest(), $this->key),
-            'name' => $this->name,
-            'description' => $this->description,
-            'translations' => $this->translations ?? [],
-            'website' => $this->website,
-            'facebook' => $this->facebook,
-            'instagram' => $this->instagram,
-            'twitter' => $this->twitter,
-            'email' => $this->email,
-            'phone' => $this->phone,
-            'tags' => $this->tags ?? [],
-            'currency' => $this->currency ?? 'USD',
-            'options' => $this->options ?? [],
-            'logo_url' => $this->logo_url,
-            'backdrop_url' => $this->backdrop_url,
-            'rating' => $this->rating,
-            'online' => $this->online,
-            'stores' => $this->when($request->boolean('with_stores') || $request->inArray('with', 'stores'), Store::collection($this->stores)),
-            'categories' => $this->when($request->boolean('with_categories') || $request->inArray('with', 'categories'), Category::collection($this->categories)),
-            'is_network' => true,
-            'is_store' => false,
-            'slug' => $this->slug,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'id'              => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'       => $this->when(Http::isInternalRequest(), $this->public_id),
+            'key'             => $this->when(Http::isInternalRequest(), $this->key),
+            'company_uuid'    => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'created_by_uuid' => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'logo_uuid'       => $this->when(Http::isInternalRequest(), $this->logo_uuid),
+            'backdrop_uuid'   => $this->when(Http::isInternalRequest(), $this->backdrop_uuid),
+            'name'            => $this->name,
+            'description'     => $this->description,
+            'translations'    => $this->translations ?? [],
+            'website'         => $this->website,
+            'facebook'        => $this->facebook,
+            'instagram'       => $this->instagram,
+            'twitter'         => $this->twitter,
+            'email'           => $this->email,
+            'phone'           => $this->phone,
+            'tags'            => $this->tags ?? [],
+            'currency'        => $this->currency ?? 'USD',
+            'options'         => $this->options ?? [],
+            'logo_url'        => $this->logo_url,
+            'backdrop_url'    => $this->backdrop_url,
+            'rating'          => $this->rating,
+            'online'          => $this->online,
+            'stores'          => $this->when($request->boolean('with_stores') || $request->inArray('with', 'stores'), Store::collection($this->stores)),
+            'categories'      => $this->when($request->boolean('with_categories') || $request->inArray('with', 'categories'), Category::collection($this->categories)),
+            'is_network'      => true,
+            'is_store'        => false,
+            'slug'            => $this->slug,
+            'created_at'      => $this->created_at,
+            'updated_at'      => $this->updated_at,
         ];
     }
 }

package/server/src/Http/Resources/Product.php

@@ -12,44 +12,50 @@ class Product extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         return [
-            'id' => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id' => $this->when(Http::isInternalRequest(), $this->public_id),
-            'name' => $this->name,
-            'description' => $this->description,
-            'sku' => $this->sku,
-            'primary_image_url' => $this->primary_image_url,
-            'price' => $this->price,
-            'sale_price' => $this->sale_price,
-            'currency' => $this->currency,
-            'is_on_sale' => $this->is_on_sale,
-            'is_recommended' => $this->is_recommended,
-            'is_service' => $this->is_service,
-            'is_bookable' => $this->is_bookable,
-            'is_available' => $this->is_available,
-            'tags' => $this->tags ?? [],
-            'status' => $this->status,
-            'slug' => $this->slug,
-            'translations' => $this->translations ?? [],
-            'addon_categories' => $this->mapAddonCategories($this->addonCategories),
-            'variants' => $this->mapVariants($this->variants),
-            'files' => $this->when(Http::isInternalRequest(), $this->files),
-            'images' => $this->when(!Http::isInternalRequest(), $this->mapFiles($this->files)),
-            'videos' => $this->when(!Http::isInternalRequest(), $this->mapFiles($this->files, 'video')),
-            'hours' => $this->mapHours($this->hours),
-            'youtube_urls' => $this->youtube_urls ?? [],
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'id'                 => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'               => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'          => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company_uuid'       => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'store_uuid'         => $this->when(Http::isInternalRequest(), $this->store_uuid),
+            'category_uuid'      => $this->when(Http::isInternalRequest(), $this->category_uuid),
+            'created_by_uuid'    => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'primary_image_uuid' => $this->when(Http::isInternalRequest(), $this->primary_image_uuid),
+            'name'               => $this->name,
+            'description'        => $this->description,
+            'sku'                => $this->sku,
+            'primary_image_url'  => $this->primary_image_url,
+            'price'              => $this->price,
+            'sale_price'         => $this->sale_price,
+            'currency'           => $this->currency,
+            'is_on_sale'         => $this->is_on_sale,
+            'is_recommended'     => $this->is_recommended,
+            'is_service'         => $this->is_service,
+            'is_bookable'        => $this->is_bookable,
+            'is_available'       => $this->is_available,
+            'tags'               => $this->tags ?? [],
+            'status'             => $this->status,
+            'slug'               => $this->slug,
+            'translations'       => $this->translations ?? [],
+            'addon_categories'   => $this->mapAddonCategories($this->addonCategories),
+            'variants'           => $this->mapVariants($this->variants),
+            'files'              => $this->when(Http::isInternalRequest(), $this->files),
+            'images'             => $this->when(!Http::isInternalRequest(), $this->mapFiles($this->files)),
+            'videos'             => $this->when(!Http::isInternalRequest(), $this->mapFiles($this->files, 'video')),
+            'hours'              => $this->mapHours($this->hours),
+            'youtube_urls'       => $this->youtube_urls ?? [],
+            'created_at'         => $this->created_at,
+            'updated_at'         => $this->updated_at,
         ];
     }
 
-    public function mapHours(?\Illuminate\Database\Eloquent\Collection $hours = null): array
+    public function mapHours(\Illuminate\Database\Eloquent\Collection $hours = null): array
     {
         if (empty($hours)) {
             return [];
@@ -59,21 +65,21 @@ class Product extends FleetbaseResource
             function ($hour) {
                 // modify for internal requests
                 if (Http::isInternalRequest()) {
-                    $hour['id'] = data_get($hour, 'id');
+                    $hour['id']   = data_get($hour, 'id');
                     $hour['uuid'] = data_get($hour, 'uuid');
                 }
 
                 return array_merge($hour, [
-                    'day' => data_get($hour, 'day_of_week'),
+                    'day'   => data_get($hour, 'day_of_week'),
                     'start' => data_get($hour, 'start'),
-                    'end' => data_get($hour, 'end'),
+                    'end'   => data_get($hour, 'end'),
                 ]);
             },
             $hours->toArray()
         );
     }
 
-    public function mapFiles(?\Illuminate\Database\Eloquent\Collection $files = null, $contentType = 'image')
+    public function mapFiles(\Illuminate\Database\Eloquent\Collection $files = null, $contentType = 'image')
     {
         return collect($files)->map(function ($file) use ($contentType) {
             if (!Str::contains($file->content_type, $contentType)) {
@@ -84,35 +90,37 @@ class Product extends FleetbaseResource
         })->filter()->values();
     }
 
-    public function mapAddonCategories(?\Illuminate\Database\Eloquent\Collection $addonCategories = null)
+    public function mapAddonCategories(\Illuminate\Database\Eloquent\Collection $addonCategories = null)
     {
         return collect($addonCategories)->map(function ($addonCategory) {
-            $addonCategoryArr = [
-                'id' => $addonCategory->category->public_id ?? null,
-                'name' => $addonCategory->name,
-                'description' => $addonCategory->category->description ?? null,
-                'addons' => $this->mapProductAddons($addonCategory->category->addons ?? [], $addonCategory->excluded_addons)
-            ];
+            $addons = data_get($addonCategory, 'category.addons', []);
 
-            // modify for internal requests
             if (Http::isInternalRequest()) {
-                $addonCategoryArr['id'] = $addonCategory->category->id;
-
-                $addonCategoryArr = Arr::insertAfterKey(
-                    $addonCategoryArr,
-                    [
-                        'uuid' => $addonCategory->category->uuid,
-                        'public_id' => $addonCategory->category->public_id
-                    ],
-                    'id'
-                );
+                return [
+                    'uuid'               => $addonCategory->uuid,
+                    'public_id'          => data_get($addonCategory, 'category.public_id'),
+                    'id'                 => $addonCategory->id,
+                    'name'               => $addonCategory->name,
+                    'excluded_addons'    => $addonCategory->excluded_addons,
+                    'category'           => $addonCategory->category,
+                    'created_at'         => $addonCategory->created_at,
+                    'updated_at'         => $addonCategory->updated_at,
+                ];
+            } else {
+                return [
+                    'id'              => data_get($addonCategory, 'category.public_id'),
+                    'name'            => data_get($addonCategory, 'name'),
+                    'description'     => data_get($addonCategory, 'category.description'),
+                    'excluded_addons' => $addonCategory->excluded_addons,
+                    'addons'          => $this->mapProductAddons($addons, $addonCategory->excluded_addons),
+                ];
             }
 
-            return $addonCategoryArr;
+            return [];
         });
     }
 
-    public function mapProductAddons(?\Illuminate\Database\Eloquent\Collection $addons = null, $excluded = [])
+    public function mapProductAddons(\Illuminate\Database\Eloquent\Collection $addons = null, $excluded = [])
     {
         return collect($addons)->map(function ($addon) use ($excluded) {
             if (is_array($excluded) && in_array($addon->uuid, $excluded)) {
@@ -120,15 +128,15 @@ class Product extends FleetbaseResource
             }
 
             $productAddonArr = [
-                'id' => $addon->public_id,
-                'name' => $addon->name,
+                'id'          => $addon->public_id,
+                'name'        => $addon->name,
                 'description' => $addon->description,
-                'price' => $addon->price,
-                'sale_price' => $addon->sale_price,
-                'is_on_sale' => $addon->is_on_sale,
-                'slug' => $addon->slug,
-                'created_at' => $addon->created_at,
-                'updated_at' => $addon->updated_at
+                'price'       => $addon->price,
+                'sale_price'  => $addon->sale_price,
+                'is_on_sale'  => $addon->is_on_sale,
+                'slug'        => $addon->slug,
+                'created_at'  => $addon->created_at,
+                'updated_at'  => $addon->updated_at,
             ];
 
             // modify for internal requests
@@ -138,8 +146,8 @@ class Product extends FleetbaseResource
                 $productAddonArr = Arr::insertAfterKey(
                     $productAddonArr,
                     [
-                        'uuid' => $addon->uuid,
-                        'public_id' => $addon->public_id
+                        'uuid'      => $addon->uuid,
+                        'public_id' => $addon->public_id,
                     ],
                     'id'
                 );
@@ -149,24 +157,24 @@ class Product extends FleetbaseResource
         })->filter()->values();
     }
 
-    public function mapVariants(?\Illuminate\Database\Eloquent\Collection $variants = null)
+    public function mapVariants(\Illuminate\Database\Eloquent\Collection $variants = null)
     {
         return collect($variants)->map(function ($variant) {
             $productVariantArr = [
-                'id' => $variant->public_id,
-                'name' => $variant->name,
-                'description' => $variant->description,
+                'id'             => $variant->public_id,
+                'name'           => $variant->name,
+                'description'    => $variant->description,
                 'is_multiselect' => $variant->is_multiselect,
-                'is_required' => $variant->is_required,
-                'slug' => $variant->slug,
-                'options' => collect($variant->options)->map(function ($variantOpt) {
+                'is_required'    => $variant->is_required,
+                'slug'           => $variant->slug,
+                'options'        => collect($variant->options)->map(function ($variantOpt) {
                     $variantOptArr = [
-                        'id' => $variantOpt->public_id,
-                        'name' => $variantOpt->name,
-                        'description' => $variantOpt->description,
+                        'id'              => $variantOpt->public_id,
+                        'name'            => $variantOpt->name,
+                        'description'     => $variantOpt->description,
                         'additional_cost' => $variantOpt->additional_cost,
-                        'created_at' => $variantOpt->created_at,
-                        'updated_at' => $variantOpt->updated_at
+                        'created_at'      => $variantOpt->created_at,
+                        'updated_at'      => $variantOpt->updated_at,
                     ];
 
                     // modify for internal requests
@@ -176,8 +184,8 @@ class Product extends FleetbaseResource
                         $variantOptArr = Arr::insertAfterKey(
                             $variantOptArr,
                             [
-                                'uuid' => $variantOpt->uuid,
-                                'public_id' => $variantOpt->public_id
+                                'uuid'      => $variantOpt->uuid,
+                                'public_id' => $variantOpt->public_id,
                             ],
                             'id'
                         );
@@ -186,7 +194,7 @@ class Product extends FleetbaseResource
                     return $variantOptArr;
                 }),
                 'created_at' => $variant->created_at,
-                'updated_at' => $variant->updated_at
+                'updated_at' => $variant->updated_at,
             ];
 
             // modify for internal requests
@@ -196,8 +204,8 @@ class Product extends FleetbaseResource
                 $productVariantArr = Arr::insertAfterKey(
                     $productVariantArr,
                     [
-                        'uuid' => $variant->uuid,
-                        'public_id' => $variant->public_id
+                        'uuid'      => $variant->uuid,
+                        'public_id' => $variant->public_id,
                     ],
                     'id'
                 );