@fleetbase/storefront-engine 0.3.25 → 0.3.26

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.25",
+    "version": "0.3.26",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.25",
+    "version": "0.3.26",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.25",
+    "version": "0.3.26",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",

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

@@ -598,6 +598,7 @@ class CheckoutController extends Controller
     {
         $token              = $request->input('token');
         $transactionDetails = $request->input('transactionDetails', []); // optional details to be supplied about transaction
+        $notes              = $request->input('notes');
 
         // validate transaction details
         if (!is_array($transactionDetails)) {
@@ -828,6 +829,7 @@ class CheckoutController extends Controller
             'type'             => 'storefront',
             'status'           => 'created',
             'meta'             => $orderMeta,
+            'notes'            => $notes,
         ];
 
         // if it's integrated vendor order apply to meta
@@ -879,6 +881,7 @@ class CheckoutController extends Controller
     {
         $token              = $request->input('token');
         $transactionDetails = $request->input('transactionDetails', []); // optional details to be supplied about transaction
+        $notes              = $request->input('notes');
 
         // validate transaction details
         if (!is_array($transactionDetails)) {
@@ -1055,6 +1058,7 @@ class CheckoutController extends Controller
                 'adhoc'            => $about->isOption('auto_dispatch'),
                 'type'             => 'storefront',
                 'status'           => 'created',
+                'notes'            => $notes,
             ];
 
             // if it's integrated vendor order apply to meta

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

@@ -270,7 +270,11 @@ class CustomerController extends Controller
         }
 
         // update the contact
-        $contact->update($input);
+        try {
+            $contact->update($input);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
 
         // response the contact resource
         return new Customer($contact);

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

@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Http\Controllers\v1;
 
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Models\Category;
 use Fleetbase\Storefront\Http\Resources\Gateway as GatewayResource;
 use Fleetbase\Storefront\Http\Resources\Network as NetworkResource;
 use Fleetbase\Storefront\Http\Resources\Product as ProductResource;
@@ -188,6 +189,15 @@ class StoreController extends Controller
                 ->whereStatus('published')
                 ->get();
 
+            // Search categories as well
+            $categories = Category::where(['company_uuid' => session('company'), 'for' => 'storefront_product'])->search($searchQuery)->get();
+            if ($categories) {
+                foreach ($categories as $category) {
+                    $categoryProducts = Product::where('category_uuid', $category->uuid)->get();
+                    $results          = $results->merge($categoryProducts)->unique('uuid');
+                }
+            }
+
             return ProductResource::collection($results);
         }
 

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

@@ -25,6 +25,8 @@ class ReviewCustomer extends FleetbaseResource
             'email'         => $this->email,
             'phone'         => $this->phone,
             'photo_url'     => $this->photo_url,
+            'reviews_count' => $this->resource->reviews()->count(),
+            'uploads_count' => $this->resource->reviewUploads()->count(),
             'slug'          => $this->slug,
             'created_at'    => $this->created_at,
             'updated_at'    => $this->updated_at,

package/server/src/Models/Product.php

@@ -48,12 +48,19 @@ class Product extends StorefrontModel
      */
     protected $table = 'products';
 
+    /**
+     * The default database connection to use.
+     *
+     * @var string
+     */
+    protected $connection = 'storefront';
+
     /**
      * These attributes that can be queried.
      *
      * @var array
      */
-    protected $searchableColumns = ['name', 'description'];
+    protected $searchableColumns = ['name', 'description', 'tags'];
 
     /**
      * The attributes that are mass assignable.
@@ -383,6 +390,11 @@ class Product extends StorefrontModel
                                 $option['additional_cost'] = Utils::numbersOnly($option['additional_cost']);
                             }
 
+                            // additional cost can never be null
+                            if ($option['additional_cost'] === null) {
+                                $option['additional_cost'] = 0;
+                            }
+
                             $productVariantOptionInput = Arr::except($option, ['uuid', 'created_at', 'updated_at']);
                             ProductVariantOption::where('uuid', $option['uuid'])->update($productVariantOptionInput);
                             continue;

package/server/src/Models/Review.php

@@ -2,8 +2,8 @@
 
 namespace Fleetbase\Storefront\Models;
 
-use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\Models\File;
+use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;
@@ -84,7 +84,7 @@ class Review extends StorefrontModel
      */
     public function customer()
     {
-        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Contact::class);
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Customer::class);
     }
 
     /**

package/server/src/Observers/ProductObserver.php

@@ -4,6 +4,7 @@ namespace Fleetbase\Storefront\Observers;
 
 use Fleetbase\Models\File;
 use Fleetbase\Storefront\Models\Product;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Request;
 
 class ProductObserver
@@ -15,20 +16,25 @@ class ProductObserver
      */
     public function saved(Product $product): void
     {
-        $addonCategories = Request::input('product.addon_categories', []);
-        $variants        = Request::input('product.variants', []);
-        $files           = Request::input('product.files', []);
+        try {
+            $addonCategories = Request::input('product.addon_categories', []);
+            $variants        = Request::input('product.variants', []);
+            $files           = Request::input('product.files', []);
 
-        // save addon categories
-        $product->setAddonCategories($addonCategories);
+            // save addon categories
+            $product->setAddonCategories($addonCategories);
 
-        // save product variants
-        $product->setProductVariants($variants);
+            // save product variants
+            $product->setProductVariants($variants);
 
-        // set keys on files
-        foreach ($files as $file) {
-            $fileRecord = File::where('uuid', $file['uuid'])->first();
-            $fileRecord->setKey($product);
+            // set keys on files
+            foreach ($files as $file) {
+                $fileRecord = File::where('uuid', $file['uuid'])->first();
+                $fileRecord->setKey($product);
+            }
+        } catch (\Exception $e) {
+            Log::error($e->getMessage());
+            throw $e;
         }
     }
 }