@fleetbase/storefront-engine 0.3.22 → 0.3.24

package/addon/services/storefront.js

@@ -221,7 +221,7 @@ export default class StorefrontService extends Service.extend(Evented) {
                 modal.startLoading();
 
                 try {
-                    const store = await store.save();
+                    await store.save();
                     this.notifications.success(this.intl.t('storefront.service.storefront.storefront-create-success'));
                     // this.currentUser.setOption('activeStorefront', store.id);
                     this.setActiveStorefront(store);

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.22",
+    "version": "0.3.24",
     "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.22",
+    "version": "0.3.24",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",

package/server/src/Console/Commands/PurgeExpiredCarts.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Fleetbase\Storefront\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class PurgeExpiredCarts extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'storefront:purge-carts';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Permanently delete all expired carts from the database';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        // Alternatively, using the DB facade for direct deletion
+        $dbDeletedCount = DB::table('carts')->where('expires_at', '<', now())->delete();
+
+        // Log and output the results
+        $this->info("Successfully deleted {$dbDeletedCount} expired carts.");
+
+        return Command::SUCCESS;
+    }
+}

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

@@ -0,0 +1,43 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Controllers\v1;
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Storefront\Support\Storefront;
+use Illuminate\Http\Request;
+
+class OrderController extends Controller
+{
+    /**
+     * Marks a pickup order as completed by "customer pickup".
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function completeOrderPickup(Request $request)
+    {
+        $customer = Storefront::getCustomerFromToken();
+        $order    = Order::where('public_id', $request->order)->whereNull('deleted_at')->with(['customer'])->first();
+
+        if (!$order) {
+            return response()->apiError('No order found.');
+        }
+
+        // Confirm the completion is done by the customer
+        if ($order->customer_uuid !== $customer->uuid) {
+            return response()->apiError('Not authorized to pickup this order for completion.');
+        }
+
+        // Patch order config
+        Storefront::patchOrderConfig($order);
+
+        // update activity to completed
+        $order->updateStatus('completed');
+
+        return response()->json([
+            'status' => 'ok',
+            'order'  => $order->public_id,
+            'status' => $order->status,
+        ]);
+    }
+}

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

@@ -5,6 +5,7 @@ namespace Fleetbase\Storefront\Http\Resources;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
 class Product extends FleetbaseResource
@@ -55,7 +56,7 @@ class Product extends FleetbaseResource
         ];
     }
 
-    public function mapHours(?\Illuminate\Database\Eloquent\Collection $hours = null): array
+    public function mapHours(Collection|array $hours = []): array
     {
         if (empty($hours)) {
             return [];
@@ -79,7 +80,7 @@ class Product extends FleetbaseResource
         );
     }
 
-    public function mapFiles(?\Illuminate\Database\Eloquent\Collection $files = null, $contentType = 'image')
+    public function mapFiles(Collection|array $files = [], $contentType = 'image')
     {
         return collect($files)->map(function ($file) use ($contentType) {
             if (!Str::contains($file->content_type, $contentType)) {
@@ -90,7 +91,7 @@ class Product extends FleetbaseResource
         })->filter()->values();
     }
 
-    public function mapAddonCategories(?\Illuminate\Database\Eloquent\Collection $addonCategories = null)
+    public function mapAddonCategories(Collection|array $addonCategories = [])
     {
         return collect($addonCategories)->map(function ($addonCategory) {
             $addons = data_get($addonCategory, 'category.addons', []);
@@ -122,7 +123,7 @@ class Product extends FleetbaseResource
         });
     }
 
-    public function mapProductAddons(?\Illuminate\Database\Eloquent\Collection $addons = null, $excluded = [])
+    public function mapProductAddons(Collection|array $addons = [], $excluded = [])
     {
         return collect($addons)->map(function ($addon) use ($excluded) {
             if (is_array($excluded) && in_array($addon->uuid, $excluded)) {
@@ -159,7 +160,7 @@ class Product extends FleetbaseResource
         })->filter()->values();
     }
 
-    public function mapVariants(?\Illuminate\Database\Eloquent\Collection $variants = null)
+    public function mapVariants(Collection|array $variants = [])
     {
         return collect($variants)->map(function ($variant) {
             $productVariantArr = [

package/server/src/Notifications/StorefrontOrderPreparing.php

@@ -5,7 +5,9 @@ namespace Fleetbase\Storefront\Notifications;
 use Exception;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\NotificationChannel;
+use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Support\Storefront;
 // use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Bus\Queueable;
@@ -28,6 +30,9 @@ class StorefrontOrderPreparing extends Notification
 {
     use Queueable;
 
+    public Order $order;
+    public Store|Network $storefront;
+
     /**
      * Create a new notification instance.
      *

package/server/src/Providers/StorefrontServiceProvider.php

@@ -55,6 +55,7 @@ class StorefrontServiceProvider extends CoreServiceProvider
     public $commands = [
         \Fleetbase\Storefront\Console\Commands\NotifyStorefrontOrderNearby::class,
         \Fleetbase\Storefront\Console\Commands\SendOrderNotification::class,
+        \Fleetbase\Storefront\Console\Commands\PurgeExpiredCarts::class,
     ];
 
     /**
@@ -89,6 +90,7 @@ class StorefrontServiceProvider extends CoreServiceProvider
         $this->registerCommands();
         $this->scheduleCommands(function ($schedule) {
             $schedule->command('storefront:notify-order-nearby')->everyMinute()->storeOutputInDb();
+            $schedule->command('storefront:purge-carts')->daily()->storeOutputInDb();
         });
         $this->registerObservers();
         $this->registerMiddleware();

package/server/src/routes.php

@@ -84,6 +84,11 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
                     $router->delete('{id}', 'ReviewController@find');
                 });
 
+                // storefront/v1/orders
+                $router->group(['prefix' => 'orders'], function () use ($router) {
+                    $router->put('picked-up', 'OrderController@completeOrderPickup');
+                });
+
                 // storefront/v1/customers
                 $router->group(['prefix' => 'customers'], function () use ($router) {
                     $router->put('{id}', 'CustomerController@update');