@fleetbase/storefront-engine 0.2.5 → 0.2.6

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

@@ -2,21 +2,21 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Models\Category;
+use Fleetbase\Models\Invite;
 use Fleetbase\Storefront\Http\Requests\AddStoreToNetworkCategory;
 use Fleetbase\Storefront\Http\Requests\NetworkActionRequest;
 use Fleetbase\Storefront\Mail\StorefrontNetworkInvite;
 use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\NetworkStore;
-use Fleetbase\Models\Category;
-use Fleetbase\Models\Invite;
-use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 
 class NetworkController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */
@@ -25,12 +25,11 @@ class NetworkController extends StorefrontController
     /**
      * Find network by public_id or invitation code.
      *
-     * @param string $id 
      * @return \Illuminate\Http\Response
      */
     public function findNetwork(string $id)
     {
-        $id = trim($id);
+        $id         = trim($id);
         $isPublicId = Str::startsWith($id, ['storefront_network_', 'network_']);
 
         if ($isPublicId) {
@@ -49,24 +48,22 @@ class NetworkController extends StorefrontController
     /**
      * Add stores to a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\NetworkActionRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function sendInvites(string $id, NetworkActionRequest $request)
     {
-        $network = Network::find($id);
+        $network    = Network::find($id);
         $recipients = $request->input('recipients', []);
 
         // create invitation
         $invitation = Invite::create([
-            'company_uuid' => session('company'),
+            'company_uuid'    => session('company'),
             'created_by_uuid' => session('user'),
-            'subject_uuid' => $network->uuid,
-            'subject_type' => Utils::getMutationType($network),
-            'protocol' => 'email',
-            'recipients' => $recipients,
-            'reason' => 'join_storefront_network'
+            'subject_uuid'    => $network->uuid,
+            'subject_type'    => Utils::getMutationType($network),
+            'protocol'        => 'email',
+            'recipients'      => $recipients,
+            'reason'          => 'join_storefront_network',
         ]);
 
         // make sure subject is set
@@ -82,15 +79,13 @@ class NetworkController extends StorefrontController
     /**
      * Add stores to a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\NetworkActionRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function addStores(string $id, NetworkActionRequest $request)
     {
         $network = Network::find($id);
-        $stores = collect($request->input('stores', []));
-        $remove = collect($request->input('remove', []));
+        $stores  = collect($request->input('stores', []));
+        $remove  = collect($request->input('remove', []));
 
         // firstOrCreate each
         foreach ($stores as $storeId) {
@@ -111,8 +106,6 @@ class NetworkController extends StorefrontController
     /**
      * Remove stores from a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\NetworkActionRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function removeStores(string $id, NetworkActionRequest $request)
@@ -130,14 +123,12 @@ class NetworkController extends StorefrontController
     /**
      * Remove stores to a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\AddStoreToNetworkCategory  $request
      * @return \Illuminate\Http\Response
      */
     public function addStoreToCategory(string $id, AddStoreToNetworkCategory $request)
     {
         $category = $request->input('category');
-        $store = $request->input('store');
+        $store    = $request->input('store');
 
         // get network store instance
         $networkStore = NetworkStore::where(['network_uuid' => $id, 'store_uuid' => $store])->first();
@@ -148,11 +139,10 @@ class NetworkController extends StorefrontController
 
         return response()->json(['status' => 'ok']);
     }
+
     /**
      * Remove stores to a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\NetworkActionRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function deleteCategory(string $id, NetworkActionRequest $request)

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class NotificationChannelController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -2,22 +2,22 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Http\Controllers\Internal\v1\OrderController as FleetbaseOrderController;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Storefront\Notifications\StorefrontOrderPreparing;
 use Illuminate\Http\Request;
 
 class OrderController extends FleetbaseOrderController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */
     public $resource = 'order';
 
     /**
-     * The filter to use
+     * The filter to use.
      *
      * @var \Fleetbase\Http\Filter\Filter
      */
@@ -26,7 +26,6 @@ class OrderController extends FleetbaseOrderController
     /**
      * Accept an order by incrementing status to preparing.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function acceptOrder(Request $request)
@@ -35,7 +34,7 @@ class OrderController extends FleetbaseOrderController
 
         if (!$order) {
             return response()->json([
-                'error' => 'No order to accept!'
+                'error' => 'No order to accept!',
             ], 400);
         }
 
@@ -45,27 +44,26 @@ class OrderController extends FleetbaseOrderController
 
         return response()->json([
             'status' => 'ok',
-            'order' => $order->public_id,
-            'status' => $order->status
+            'order'  => $order->public_id,
+            'status' => $order->status,
         ]);
     }
 
     /**
      * Accept an order by incrementing status to preparing.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function markOrderAsReady(Request $request)
     {
-        $adhoc = $request->boolean('adhoc');
+        $adhoc  = $request->boolean('adhoc');
         $driver = $request->input('driver');
         /** @var \Fleetbase\Models\Order $order */
         $order = Order::where('uuid', $request->order)->whereNull('deleted_at')->with(['customer'])->first();
 
         if (!$order) {
             return response()->json([
-                'error' => 'No order to update!'
+                'error' => 'No order to update!',
             ], 400);
         }
 
@@ -74,8 +72,8 @@ class OrderController extends FleetbaseOrderController
 
             return response()->json([
                 'status' => 'ok',
-                'order' => $order->public_id,
-                'status' => $order->status
+                'order'  => $order->public_id,
+                'status' => $order->status,
             ]);
         }
 
@@ -94,15 +92,14 @@ class OrderController extends FleetbaseOrderController
 
         return response()->json([
             'status' => 'ok',
-            'order' => $order->public_id,
-            'status' => $order->status
+            'order'  => $order->public_id,
+            'status' => $order->status,
         ]);
     }
 
     /**
      * Accept an order by incrementing status to preparing.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function markOrderAsCompleted(Request $request)
@@ -112,7 +109,7 @@ class OrderController extends FleetbaseOrderController
 
         if (!$order) {
             return response()->json([
-                'error' => 'No order to update!'
+                'error' => 'No order to update!',
             ], 400);
         }
 
@@ -121,15 +118,14 @@ class OrderController extends FleetbaseOrderController
 
         return response()->json([
             'status' => 'ok',
-            'order' => $order->public_id,
-            'status' => $order->status
+            'order'  => $order->public_id,
+            'status' => $order->status,
         ]);
     }
 
     /**
      * Reject order and notify customer order is rejected/canceled.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function rejectOrder(Request $request)
@@ -138,7 +134,7 @@ class OrderController extends FleetbaseOrderController
 
         if (!$order) {
             return response()->json([
-                'error' => 'No order to cancel!'
+                'error' => 'No order to cancel!',
             ], 400);
         }
 
@@ -147,8 +143,8 @@ class OrderController extends FleetbaseOrderController
 
         return response()->json([
             'status' => 'ok',
-            'order' => $order->public_id,
-            'status' => $order->status
+            'order'  => $order->public_id,
+            'status' => $order->status,
         ]);
     }
 }

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

@@ -2,11 +2,10 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-
 class ProductAddonCategoryController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -2,11 +2,10 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-
 class ProductAddonController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -2,42 +2,87 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Models\Category;
+use Fleetbase\Models\File;
 use Fleetbase\Storefront\Imports\ProductsImport;
 use Fleetbase\Storefront\Jobs\DownloadProductImageUrl;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Models\Category;
-use Fleetbase\Models\File;
-use Fleetbase\FleetOps\Support\Utils;
-use Maatwebsite\Excel\Facades\Excel;
+use Fleetbase\Support\Http;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Maatwebsite\Excel\Facades\Excel;
 
 class ProductController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */
     public $resource = 'product';
 
+    /**
+     * Update a Product record.
+     * This update method was overwritten because the ProductObserver
+     * isn't firing on the `updated` callback.
+     *
+     * @return \Fleetbase\Storefront\Http\Resources\Product
+     */
+    public function updateRecord(Request $request, string $id)
+    {
+        try {
+            $this->validateRequest($request);
+            $record = $this->model->updateRecordFromRequest($request, $id, function (&$request, Product &$product) {
+                $addonCategories = $request->array('product.addon_categories');
+                $variants        = $request->array('product.variants');
+                $files           = $request->array('product.files');
+
+                // save addon categories
+                $product->setAddonCategories($addonCategories);
+
+                // save product variants
+                $product->setProductVariants($variants);
+
+                // set keys on files
+                foreach ($files as $file) {
+                    $fileRecord = File::where('uuid', $file['uuid'])->first();
+                    $fileRecord->setKey($product);
+                }
+            });
+
+            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());
+        }
+    }
+
     /**
      * List all activity options for current order.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function processImports(Request $request)
     {
-        $disk = env('FILESYSTEM_DRIVER');
-        $store = $request->input('store');
-        $category = $request->input('category');
-        $files = $request->input('files');
-        $files = File::whereIn('uuid', $files)->get();
+        $disk           = $request->input('disk', config('filesystems.default'));
+        $store          = $request->input('store');
+        $category       = $request->input('category');
+        $files          = $request->input('files');
+        $files          = File::whereIn('uuid', $files)->get();
         $validFileTypes = ['csv', 'tsv', 'xls', 'xlsx'];
-        $imports = collect();
+        $imports        = collect();
 
         if ($category) {
             $category = Category::find($category);
@@ -59,7 +104,7 @@ class ProductController extends StorefrontController
                 return response()->error('Invalid file, unable to proccess.');
             }
 
-            $data = Arr::first($data);
+            $data    = Arr::first($data);
             $imports = $imports->merge($data);
         }
 
@@ -72,42 +117,42 @@ class ProductController extends StorefrontController
             }
 
             // $importId = (string) Str::uuid();
-            $name = Utils::or($row, ['name', 'product_name', 'entry_name', 'entity_name', 'entity', 'item_name', 'item', 'service', 'service_name']);
-            $description = Utils::or($row, ['description', 'product_description', 'details', 'info', 'about', 'item_description']);
-            $tags = Utils::or($row, ['tags']);
-            $sku = Utils::or($row, ['sku', 'internal_id', 'stock_number']);
-            $price = Utils::or($row, ['price', 'cost', 'value']);
-            $salePrice = Utils::or($row, ['sale_price', 'sale_cost', 'sale_value']);
-            $isService = Utils::or($row, ['is_service'], false);
-            $isBookable = Utils::or($row, ['is_bookable', 'bookable'], false);
-            $isOnSale = Utils::or($row, ['on_sale', 'is_on_sale'], false);
-            $isAvailable = Utils::or($row, ['available', 'is_available'], true);
+            $name          = Utils::or($row, ['name', 'product_name', 'entry_name', 'entity_name', 'entity', 'item_name', 'item', 'service', 'service_name']);
+            $description   = Utils::or($row, ['description', 'product_description', 'details', 'info', 'about', 'item_description']);
+            $tags          = Utils::or($row, ['tags']);
+            $sku           = Utils::or($row, ['sku', 'internal_id', 'stock_number']);
+            $price         = Utils::or($row, ['price', 'cost', 'value']);
+            $salePrice     = Utils::or($row, ['sale_price', 'sale_cost', 'sale_value']);
+            $isService     = Utils::or($row, ['is_service'], false);
+            $isBookable    = Utils::or($row, ['is_bookable', 'bookable'], false);
+            $isOnSale      = Utils::or($row, ['on_sale', 'is_on_sale'], false);
+            $isAvailable   = Utils::or($row, ['available', 'is_available'], true);
             $isRecommended = Utils::or($row, ['recommended', 'is_recommended'], false);
-            $canPickup = Utils::or($row, ['can_pickup', 'is_pickup', 'is_pickup_only'], false);
-            $youtubeUrls = Utils::or($row, ['youtube', 'youtube_urls', 'youtube_videos']);
-            $images = Utils::or($row, ['photos', 'images', 'image', 'photo', 'primary_image', 'product_image', 'thumbnail', 'photo1', 'image1']);
+            $canPickup     = Utils::or($row, ['can_pickup', 'is_pickup', 'is_pickup_only'], false);
+            $youtubeUrls   = Utils::or($row, ['youtube', 'youtube_urls', 'youtube_videos']);
+            $images        = Utils::or($row, ['photos', 'images', 'image', 'photo', 'primary_image', 'product_image', 'thumbnail', 'photo1', 'image1']);
 
             $products[] = $product = Product::create(
                 [
-                    'company_uuid' => $request->session()->get('company'),
+                    'company_uuid'    => $request->session()->get('company'),
                     'created_by_uuid' => $request->session()->get('user'),
-                    'store_uuid' => $store->uuid,
-                    'name' => Utils::unicodeDecode($name),
-                    'description' => Utils::unicodeDecode($description),
-                    'sku' => $sku,
-                    'tags' => explode(',', $tags),
-                    'youtube_urls' => explode(',', $youtubeUrls),
-                    'price' => $price,
-                    'sale_price' => $salePrice,
-                    'currency' => $store->currency,
-                    'is_service' => $isService,
-                    'is_bookable' => $isBookable,
-                    'is_on_sale' => $isOnSale,
-                    'is_available' => $isAvailable,
-                    'is_recommended' => $isRecommended,
-                    'can_pickup' => $canPickup,
-                    'category_uuid' => $category ? $category->uuid : null,
-                    'status' => 'published'
+                    'store_uuid'      => $store->uuid,
+                    'name'            => Utils::unicodeDecode($name),
+                    'description'     => Utils::unicodeDecode($description),
+                    'sku'             => $sku,
+                    'tags'            => explode(',', $tags),
+                    'youtube_urls'    => explode(',', $youtubeUrls),
+                    'price'           => $price,
+                    'sale_price'      => $salePrice,
+                    'currency'        => $store->currency,
+                    'is_service'      => $isService,
+                    'is_bookable'     => $isBookable,
+                    'is_on_sale'      => $isOnSale,
+                    'is_available'    => $isAvailable,
+                    'is_recommended'  => $isRecommended,
+                    'can_pickup'      => $canPickup,
+                    'category_uuid'   => $category ? $category->uuid : null,
+                    'status'          => 'published',
                 ]
             );
 

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class ProductHourController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class ProductVariantController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class ProductVariantOptionController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class ReviewController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -8,13 +8,12 @@ use Illuminate\Http\Request;
 class StoreController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */
     public $resource = 'store';
 
-
     public function allStores(Request $request)
     {
         $stores = Store::select(['uuid', 'name', 'description', 'created_at'])

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class StoreHourController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class StoreLocationController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -8,8 +8,6 @@ class StorefrontController extends FleetbaseController
 {
     /**
      * The package namespace used to resolve from.
-     *
-     * @var string
      */
     public string $namespace = '\\Fleetbase\\Storefront';
 }

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class VoteController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */