@fleetbase/storefront-engine 0.3.25 → 0.3.27

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.25",
+    "version": "0.3.27",
     "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.27",
     "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.27",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",

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

@@ -19,6 +19,7 @@ use Fleetbase\Storefront\Http\Requests\InitializeCheckoutRequest;
 use Fleetbase\Storefront\Models\Cart;
 use Fleetbase\Storefront\Models\Checkout;
 use Fleetbase\Storefront\Models\Customer;
+use Fleetbase\Storefront\Models\FoodTruck;
 use Fleetbase\Storefront\Models\Gateway;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
@@ -475,8 +476,8 @@ class CheckoutController extends Controller
         $invoiceAmount       = $amount;
         $invoiceCode         = $gateway->sandbox ? 'TEST_INVOICE' : $gateway->config->invoice_id;
         $invoiceDescription  = $about->name . ' cart checkout';
-        $invoiceReceiverCode = $gateway->public_id;
-        $senderInvoiceNo     = $cart->id;
+        $invoiceReceiverCode = $checkout->public_id;
+        $senderInvoiceNo     = $checkout->public_id;
 
         // Create qpay invoice
         $invoice = $qpay->createSimpleInvoice($invoiceAmount, $invoiceCode, $invoiceDescription, $invoiceReceiverCode, $senderInvoiceNo, $callbackUrl);
@@ -491,69 +492,137 @@ class CheckoutController extends Controller
         ]);
     }
 
+    /**
+     * Capture and process QPay callback.
+     *
+     * This controller method handles QPay callback requests by verifying and processing
+     * payment information for a specified checkout. It performs the following steps:
+     *
+     * - Retrieves the checkout identifier from the request.
+     * - Looks up the associated Checkout and Gateway records.
+     * - If in sandbox mode and a test scenario is provided, it simulates a test payment
+     *   response for either success or error scenarios.
+     * - Initializes a QPay instance with the gateway configuration and sets the authentication token.
+     * - Retrieves the invoice ID from the checkout options and performs a payment check using QPay's API.
+     * - Publishes the payment data or error response to the SocketCluster channel.
+     *
+     * Depending on the 'respond' flag from the request, the method returns a JSON response
+     * or completes the processing without returning data.
+     *
+     * @param Request $request The HTTP request containing:
+     *                         - `checkout` (string): The public checkout identifier.
+     *                         - `respond` (boolean): Whether to return a JSON response.
+     *                         - `test` (string|null): A test scenario indicator ('success' or 'error') for sandbox mode.
+     *
+     * @return \Illuminate\Http\JsonResponse a JSON response with payment data or error details
+     *
+     * @throws \Exception if an error occurs during payment processing, an API error is returned
+     */
     public function captureQPayCallback(Request $request)
     {
-        $checkoutId = $request->input('checkout');
-        $respond    = $request->boolean('respond');
-        $test       = $request->input('test'); // success, error
-
-        if ($checkoutId) {
-            // Get the checkout instance
-            $checkout = Checkout::where('public_id', $checkoutId)->first();
-            if ($checkout) {
-                // Restore the payment gateway instance
-                $gateway = Gateway::where('uuid', $checkout->gateway_uuid)->first();
-                if ($gateway) {
-                    try {
-                        // If testing send back test data
-                        // Handle test below
-                        if ($gateway->sandbox && is_string($test) && in_array($test, ['success', 'error'])) {
-                            $data = ['error' => null, 'checkout' => $checkout->public_id, 'payment' => null];
-                            if ($test === 'success') {
-                                $data['payment'] = QPay::createTestPaymentDataFromCheckout($checkout);
-                            } else {
-                                $data['error'] = ['error' => 'PAYMENT_NOT_PAID', 'message' => 'Payment has not paid!'];
-                            }
-
-                            SocketClusterService::publish('checkout.' . $checkout->public_id, $data);
-                            if ($respond) {
-                                return response()->json($data);
-                            }
-
-                            return;
-                        }
-
-                        // Create qpay instance
-                        $qpay = QPay::instance($gateway->config->username, $gateway->config->password, $gateway->callback_url);
-                        if ($gateway->sandbox) {
-                            $qpay = $qpay->useSandbox();
-                        }
-
-                        // Set auth token
-                        $qpay = $qpay->setAuthToken();
-
-                        // Check payment status from qpay
-                        $payment = $qpay->paymentGet($checkoutId);
-                        if ($payment) {
-                            $data = [];
-                            if ($payment->error) {
-                                $data = ['error' => (array) $payment, 'checkout' => $checkout->public_id, 'payment' => null];
-                            } else {
-                                $data = ['payment' =>(array) $payment, 'checkout' => $checkout->public_id, 'error' => null];
-                            }
-
-                            SocketClusterService::publish('checkout.' . $checkout->public_id, $data);
-                            if ($respond) {
-                                return response()->json($data);
-                            }
-                        }
-                    } catch (\Exception $e) {
-                        Log::error('[QPAY CHECKOUT ERROR: ' . $e->getMessage() . ']', $checkout->toArray());
-                        if ($respond) {
-                            return response()->apiError($e->getMessage());
-                        }
-                    }
+        $checkoutId    = $request->input('checkout');
+        $shouldRespond = $request->boolean('respond');
+        $testScenario  = $request->input('test'); // Expected: 'success' or 'error'
+
+        if (!$checkoutId) {
+            return response()->json([
+                'error'    => 'CHECKOUT_ID_MISSING',
+                'checkout' => null,
+                'payment'  => null,
+            ]);
+        }
+
+        $checkout = Checkout::where('public_id', $checkoutId)->first();
+        if (!$checkout) {
+            return response()->json([
+                'error'    => 'CHECKOUT_SESSION_NOT_FOUND',
+                'checkout' => null,
+                'payment'  => null,
+            ]);
+        }
+
+        $gateway = Gateway::where('uuid', $checkout->gateway_uuid)->first();
+        if (!$gateway) {
+            return response()->json([
+                'error'    => 'GATEWAY_NOT_CONFIGURED',
+                'checkout' => $checkout->public_id,
+                'payment'  => null,
+            ]);
+        }
+
+        try {
+            // Handle test scenarios if in sandbox mode.
+            if ($gateway->sandbox && in_array($testScenario, ['success', 'error'], true)) {
+                $data = [
+                    'checkout' => $checkout->public_id,
+                    'payment'  => null,
+                    'error'    => null,
+                ];
+
+                if ($testScenario === 'success') {
+                    $data['payment'] = QPay::createTestPaymentDataFromCheckout($checkout);
+                } else {
+                    $data['error'] = [
+                        'error'   => 'PAYMENT_NOT_PAID',
+                        'message' => 'Payment has not been paid!',
+                    ];
                 }
+
+                SocketClusterService::publish('checkout.' . $checkout->public_id, $data);
+
+                return $shouldRespond ? response()->json($data) : response()->json();
+            }
+
+            // Create the QPay instance.
+            $qpay = QPay::instance(
+                $gateway->config->username,
+                $gateway->config->password,
+                $gateway->callback_url
+            );
+
+            if ($gateway->sandbox) {
+                $qpay->useSandbox();
+            }
+
+            $qpay->setAuthToken();
+
+            $invoiceId = $checkout->getOption('qpay_invoice_id');
+            if (!$invoiceId) {
+                Log::error("Missing QPay invoice ID for checkout: {$checkout->public_id}");
+
+                return response()->json([
+                    'error'    => 'MISSING_INVOICE_ID',
+                    'checkout' => $checkout->public_id,
+                    'payment'  => null,
+                ]);
+            }
+
+            $paymentCheck = $qpay->paymentCheck($invoiceId);
+
+            if (!$paymentCheck || empty($paymentCheck->count) || $paymentCheck->count < 1) {
+                return response()->json([
+                    'error'    => 'PAYMENT_NOTFOUND',
+                    'checkout' => $checkout->public_id,
+                    'payment'  => null,
+                ]);
+            }
+
+            $payment = data_get($paymentCheck, 'rows.0');
+            if ($payment) {
+                $data = [
+                    'checkout' => $checkout->public_id,
+                    'payment'  => (array) $payment,
+                    'error'    => null,
+                ];
+
+                SocketClusterService::publish('checkout.' . $checkout->public_id, $data);
+
+                return $shouldRespond ? response()->json($data) : response()->json();
+            }
+        } catch (\Exception $e) {
+            Log::error('[QPAY CHECKOUT ERROR]: ' . $e->getMessage(), ['checkout' => $checkout->toArray()]);
+            if ($shouldRespond) {
+                return response()->apiError($e->getMessage());
             }
         }
 
@@ -598,6 +667,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)) {
@@ -737,6 +807,18 @@ class CheckoutController extends Controller
             $origin = Arr::first($origin);
         }
 
+        // Check if the order origin is from a food truck via cart property
+        $foodTruck = collect($cart->items)
+            ->map(function ($cartItem) {
+                return data_get($cartItem, 'food_truck_id');
+            })
+            ->unique()
+            ->filter()
+            ->map(function ($foodTruckId) {
+                return FoodTruck::where('public_id', $foodTruckId)->first();
+            })
+            ->first();
+
         // if there is no origin attempt to get from cart
         if (!$origin) {
             $storeLocation = collect($cart->items)->map(function ($cartItem) {
@@ -817,6 +899,11 @@ class CheckoutController extends Controller
             ...$transactionDetails,
         ]);
 
+        // if there is a food truck include it in the order meta
+        if ($foodTruck) {
+            $orderMeta['food_truck_id'] = $foodTruck->public_id;
+        }
+
         // initialize order creation input
         $orderInput = [
             'company_uuid'     => $store->company_uuid ?? session('company'),
@@ -828,6 +915,7 @@ class CheckoutController extends Controller
             'type'             => 'storefront',
             'status'           => 'created',
             'meta'             => $orderMeta,
+            'notes'            => $notes,
         ];
 
         // if it's integrated vendor order apply to meta
@@ -879,6 +967,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 +1144,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/FoodTruckController.php

@@ -5,6 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers\v1;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Storefront\Http\Resources\FoodTruck as FoodTruckResource;
 use Fleetbase\Storefront\Models\FoodTruck;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 
 class FoodTruckController extends Controller
@@ -36,4 +37,22 @@ class FoodTruckController extends Controller
 
         return FoodTruckResource::collection($results);
     }
+
+    /**
+     * Finds a single Storefront FoodTruck resources.
+     *
+     * @return \Fleetbase\Http\Resources\EntityCollection
+     */
+    public function find($id)
+    {
+        // find for the food truck
+        try {
+            $foodTruck = FoodTruck::findRecordOrFail($id);
+        } catch (ModelNotFoundException $exception) {
+            return response()->error('Food Truck resource not found.');
+        }
+
+        // response the product resource
+        return new FoodTruckResource($foodTruck);
+    }
 }

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/FoodTruck.php

@@ -20,23 +20,24 @@ class FoodTruck 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),
-            'company_uuid'                  => $this->when(Http::isInternalRequest(), $this->company_uuid),
-            'created_by_uuid'               => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
-            'store_uuid'                    => $this->when(Http::isInternalRequest(), $this->store_uuid),
-            'service_area_uuid'             => $this->when(Http::isInternalRequest(), $this->service_area_uuid),
-            'zone_uuid'                     => $this->when(Http::isInternalRequest(), $this->zone_uuid),
-            'vehicle_uuid'                  => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
-            'vehicle'                       => $this->vehicle ? new VehicleResource($this->vehicle) : null,
-            'service_area'                  => $this->serviceArea ? new ServiceAreaResource($this->serviceArea) : null,
-            'zone'                          => $this->zone ? new ZoneResource($this->zone) : null,
-            'catalogs'                      => Catalog::collection($this->catalogs ?? []),
-            'online'                        => $this->vehicle ? $this->vehicle->online : false,
-            'status'                        => $this->status,
-            '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),
+            'created_by_uuid'                => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'store_uuid'                     => $this->when(Http::isInternalRequest(), $this->store_uuid),
+            'service_area_uuid'              => $this->when(Http::isInternalRequest(), $this->service_area_uuid),
+            'zone_uuid'                      => $this->when(Http::isInternalRequest(), $this->zone_uuid),
+            'vehicle_uuid'                   => $this->when(Http::isInternalRequest(), $this->vehicle_uuid),
+            'vehicle'                        => $this->vehicle ? new VehicleResource($this->vehicle) : null,
+            'service_area'                   => $this->serviceArea ? new ServiceAreaResource($this->serviceArea) : null,
+            'zone'                           => $this->zone ? new ZoneResource($this->zone) : null,
+            'catalogs'                       => Catalog::collection($this->catalogs ?? []),
+            'location'                       => $this->vehicle ? $this->vehicle->location : null,
+            'online'                         => $this->vehicle ? $this->vehicle->online : false,
+            'status'                         => $this->status,
+            'created_at'                     => $this->created_at,
+            'updated_at'                     => $this->updated_at,
         ];
     }
 }

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;
         }
     }
 }