@fleetbase/storefront-engine 0.3.4 → 0.3.6

package/server/src/Http/Controllers/v1/ReviewController.php

@@ -28,40 +28,20 @@ class ReviewController extends Controller
         $offset = $request->input('offset', false);
         $sort   = $request->input('sort');
 
+        if ($sort) {
+            $this->applySort($request, $sort);
+        }
+
         if (session('storefront_store')) {
-            $results = Review::queryWithRequest($request, function (&$query) use ($limit, $offset, $sort) {
-                $query->where('subject_uuid', session('storefront_store'));
+            $results = Review::queryWithRequest($request, function (&$query) use ($store, $limit, $offset) {
+                $query->where('subject_uuid', $store->uuid);
 
                 if ($limit) {
                     $query->limit($limit);
                 }
 
                 if ($offset) {
-                    $query->limit($offset);
-                }
-
-                if ($sort) {
-                    switch ($sort) {
-                        case 'highest':
-                        case 'highest rated':
-                            $query->orderByDesc('rating');
-                            break;
-
-                        case 'lowest':
-                        case 'lowest rated':
-                            $query->orderBy('rating');
-                            break;
-
-                        case 'newest':
-                        case 'newest first':
-                            $query->orderByDesc('created_at');
-                            break;
-
-                        case 'oldest':
-                        case 'oldest first':
-                            $query->orderBy('created_at');
-                            break;
-                    }
+                    $query->offset($offset);
                 }
             });
         }
@@ -79,7 +59,7 @@ class ReviewController extends Controller
                     return response()->json(['error' => 'Cannot find reviews for store'], 400);
                 }
 
-                $results = Review::queryWithRequest($request, function (&$query) use ($store, $sort, $limit, $offset) {
+                $results = Review::queryWithRequest($request, function (&$query) use ($store, $limit, $offset) {
                     $query->where('subject_uuid', $store->uuid);
 
                     if ($limit) {
@@ -89,30 +69,6 @@ class ReviewController extends Controller
                     if ($offset) {
                         $query->limit($offset);
                     }
-
-                    if ($sort) {
-                        switch ($sort) {
-                            case 'highest':
-                            case 'highest rated':
-                                $query->orderByDesc('rating');
-                                break;
-
-                            case 'lowest':
-                            case 'lowest rated':
-                                $query->orderBy('rating');
-                                break;
-
-                            case 'newest':
-                            case 'newest first':
-                                $query->orderByDesc('created_at');
-                                break;
-
-                            case 'oldest':
-                            case 'oldest first':
-                                $query->orderBy('created_at');
-                                break;
-                        }
-                    }
                 });
             }
         }
@@ -120,6 +76,41 @@ class ReviewController extends Controller
         return StorefrontReview::collection($results);
     }
 
+    public function applySort($request, $sort)
+    {
+        if ($sort) {
+            switch ($sort) {
+                case 'highest':
+                case 'highest rated':
+                    $request->merge(['sort' => 'rating', 'sort_direction' => 'desc']);
+
+                    break;
+
+                case 'lowest':
+                case 'lowest rated':
+                    $request->merge(['sort' => 'rating', 'sort_direction' => 'asc']);
+
+                    break;
+
+                case 'newest':
+                case 'newest first':
+                    $request->merge(['sort' => 'created_at', 'sort_direction' => 'desc']);
+
+                    break;
+
+                case 'oldest':
+                case 'oldest first':
+                    $request->merge(['sort' => 'created_at', 'sort_direction' => 'asc']);
+
+                    break;
+
+                default:
+                    // Handle unknown sorting criteria
+                    break;
+            }
+        }
+    }
+
     /**
      * Coutns the number of ratings between 1-5 for a store.
      *

package/server/src/Http/Controllers/v1/ServiceQuoteController.php

@@ -5,11 +5,11 @@ namespace Fleetbase\Storefront\Http\Controllers\v1;
 use Fleetbase\FleetOps\Http\Resources\v1\ServiceQuote as ServiceQuoteResource;
 use Fleetbase\FleetOps\Models\Entity;
 use Fleetbase\FleetOps\Models\IntegratedVendor;
+use Fleetbase\FleetOps\Models\OrderConfig;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\FleetOps\Models\ServiceQuoteItem;
 use Fleetbase\FleetOps\Models\ServiceRate;
-use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Storefront\Http\Requests\GetServiceQuoteFromCart;
@@ -100,12 +100,11 @@ class ServiceQuoteController extends Controller
         $serviceQuotes = collect();
 
         // get order configurations for ecommerce / task
-        $orderConfigs = Flow::queryOrderConfigurations(function (&$query) use ($config) {
-            $query->where('key', $config);
-        });
+        $orderConfig    = OrderConfig::resolveFromIdentifier($config);
+        $orderConfigKey = data_get($orderConfig, 'key', 'storefront');
 
         // get service rates for config type
-        $serviceRates = ServiceRate::whereIn('service_type', $orderConfigs->pluck('key'))->get();
+        $serviceRates = ServiceRate::where('service_type', $orderConfigKey)->get();
 
         // if no service rates send an empty quote
         if ($serviceRates->isEmpty()) {
@@ -289,12 +288,11 @@ class ServiceQuoteController extends Controller
         $serviceQuotes = collect();
 
         // get order configurations for ecommerce / task
-        $orderConfigs = Flow::queryOrderConfigurations(function (&$query) use ($config) {
-            $query->where('key', $config);
-        });
+        $orderConfig    = OrderConfig::resolveFromIdentifier($config);
+        $orderConfigKey = data_get($orderConfig, 'key', 'storefront');
 
         // get service rates for config type
-        $serviceRates = ServiceRate::whereIn('service_type', $orderConfigs->pluck('key'))->get();
+        $serviceRates = ServiceRate::where('service_type', $orderConfigKey)->get();
 
         // if no service rates send an empty quote
         if ($serviceRates->isEmpty()) {

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

@@ -17,38 +17,40 @@ class Network extends FleetbaseResource
     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),
-            '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 ?? [],
-            'alertable'       => $this->alertable,
-            '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 ?? [],
+            'alertable'             => $this->alertable,
+            '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)),
+            'gateways'              => $this->when($request->boolean('with_gateways') || $request->inArray('with', 'gateways'), Gateway::collection($this->gateways)),
+            'notification_channels' => $this->when($request->boolean('with_notification_channels') || $request->inArray('with', 'notification_channels'), NotificationChannel::collection($this->notificationChannels)),
+            'is_network'            => true,
+            'is_store'              => false,
+            'slug'                  => $this->slug,
+            'created_at'            => $this->created_at,
+            'updated_at'            => $this->updated_at,
         ];
     }
 }

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Resources;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class NotificationChannel extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @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,
+            'scheme'         => $this->scheme,
+            'options'        => $this->options,
+            'is_apn_gateway' => $this->is_apn_gateway,
+            'is_fcm_gateway' => $this->is_fcm_gateway,
+            'created_at'     => $this->created_at,
+            'updated_at'     => $this->updated_at,
+        ];
+    }
+}

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

@@ -97,14 +97,16 @@ class Product extends FleetbaseResource
 
             if (Http::isInternalRequest()) {
                 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,
+                    'uuid'                    => $addonCategory->uuid,
+                    'product_uuid'            => $addonCategory->product_uuid,
+                    'category_uuid'           => $addonCategory->category_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 [

package/server/src/Models/AddonCategory.php

@@ -3,6 +3,8 @@
 namespace Fleetbase\Storefront\Models;
 
 use Fleetbase\Models\Category;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 class AddonCategory extends Category
 {
@@ -25,4 +27,39 @@ class AddonCategory extends Category
     {
         return $this->setConnection(config('storefront.connection.db'))->hasMany(ProductAddon::class, 'category_uuid');
     }
+
+    public function setAddons(array $addons = []): AddonCategory
+    {
+        foreach ($addons as $addon) {
+            // get uuid if set
+            $id = data_get($addon, 'uuid');
+
+            // make sure the cateogry is set to this current
+            data_set($addon, 'category_uuid', $this->uuid);
+
+            // make sure sale price is 0 if null
+            if (data_get($addon, 'sale_price') === null) {
+                data_set($addon, 'sale_price', 0);
+            }
+
+            // update product addon category
+            if (Str::isUuid($id)) {
+                ProductAddon::where('uuid', $id)->update(Arr::except($addon, ['uuid', 'created_at', 'updated_at']));
+                continue;
+            }
+
+            // create new product addon category
+            ProductAddon::create([
+                'category_uuid'    => $this->uuid,
+                'name'             => data_get($addon, 'name'),
+                'description'      => data_get($addon, 'description'),
+                'translations'     => data_get($addon, 'translations', []),
+                'price'            => data_get($addon, 'price'),
+                'sale_price'       => data_get($addon, 'sale_price'),
+                'is_on_sale'       => data_get($addon, 'is_on_sale'),
+            ]);
+        }
+
+        return $this;
+    }
 }

package/server/src/Models/Product.php

@@ -304,18 +304,17 @@ class Product extends StorefrontModel
             // get uuid if set
             $id = data_get($addonCategory, 'uuid');
 
+            // Make sure product is set
+            data_set($addonCategory, 'product_uuid', $this->uuid);
+
             // update product addon category
             if (Str::isUuid($id)) {
-                ProductAddonCategory::where('uuid', $id)->update([
-                    'excluded_addons' => data_get($addonCategory, 'excluded_addons'),
-                    'max_selectable'  => data_get($addonCategory, 'max_selectable'),
-                    'is_required'     => data_get($addonCategory, 'is_required'),
-                ]);
+                ProductAddonCategory::where('uuid', $id)->update(Arr::except($addonCategory, ['uuid', 'created_at', 'updated_at', 'name', 'category']));
                 continue;
             }
 
             // create new product addon category
-            $productAddonCategory = ProductAddonCategory::create([
+            ProductAddonCategory::create([
                 'product_uuid'    => $this->uuid,
                 'category_uuid'   => data_get($addonCategory, 'category_uuid'),
                 'excluded_addons' => data_get($addonCategory, 'excluded_addons'),
@@ -369,7 +368,7 @@ class Product extends StorefrontModel
                                 $option['additional_cost'] = Utils::numbersOnly($option['additional_cost']);
                             }
 
-                            $productVariantOptionInput = Arr::except($option, ['uuid']);
+                            $productVariantOptionInput = Arr::except($option, ['uuid', 'created_at', 'updated_at']);
                             ProductVariantOption::where('uuid', $option['uuid'])->update($productVariantOptionInput);
                             continue;
                         }

package/server/src/Models/ProductAddon.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\Casts\Money;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Category;
 use Fleetbase\Models\User;
@@ -66,6 +67,8 @@ class ProductAddon extends StorefrontModel
     protected $casts = [
         'is_on_sale'   => 'boolean',
         'translations' => Json::class,
+        'price'        => Money::class,
+        'sale_price'   => Money::class,
     ];
 
     /**

package/server/src/Models/ProductAddonCategory.php

@@ -84,8 +84,18 @@ class ProductAddonCategory extends StorefrontModel
         return static::attributeFromCache($this, 'category.name');
     }
 
-    public function getExcludedAddonsAttribute($excluded)
+    /**
+     * Decode excluded addons.
+     *
+     * @param string $excluded
+     */
+    public function getExcludedAddonsAttribute($excluded): array
     {
-        return Json::decode($excluded);
+        $excludedAddons = is_array($excluded) ? $excluded : Json::decode($excluded);
+        if (is_array($excludedAddons)) {
+            return $excludedAddons;
+        }
+
+        return [];
     }
 }

package/server/src/Observers/CompanyObserver.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Fleetbase\Storefront\Observers;
+
+use Fleetbase\Models\Company;
+use Fleetbase\Storefront\Support\Storefront;
+
+class CompanyObserver
+{
+    /**
+     * Handle the Company "created" event.
+     *
+     * @return void
+     */
+    public function created(Company $company)
+    {
+        // Add the default storefront order config
+        Storefront::createStorefrontConfig($company);
+    }
+}

package/server/src/Providers/StorefrontServiceProvider.php

@@ -26,6 +26,7 @@ class StorefrontServiceProvider extends CoreServiceProvider
     public $observers = [
         \Fleetbase\Storefront\Models\Product::class => \Fleetbase\Storefront\Observers\ProductObserver::class,
         \Fleetbase\Storefront\Models\Network::class => \Fleetbase\Storefront\Observers\NetworkObserver::class,
+        \Fleetbase\Models\Company::class            => \Fleetbase\Storefront\Observers\CompanyObserver::class,
     ];
 
     /**
@@ -86,7 +87,7 @@ class StorefrontServiceProvider extends CoreServiceProvider
     {
         $this->registerCommands();
         $this->scheduleCommands(function ($schedule) {
-            $schedule->command('storefront:notify-order-nearby')->everyMinute();
+            $schedule->command('storefront:notify-order-nearby')->everyMinute()->storeOutputInDb();
         });
         $this->registerObservers();
         $this->registerMiddleware();