npm - @fleetbase/storefront-engine - Versions diffs - 0.3.17 → 0.3.20 - Mend

@fleetbase/storefront-engine 0.3.17 → 0.3.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (102) hide show

package/server/migrations/2023_05_03_025307_create_product_addon_categories_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_product_addons_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_product_hours_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_product_store_locations_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_product_variant_options_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_product_variants_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_products_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_reviews_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_store_hours_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_store_locations_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_stores_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025307_create_votes_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_carts_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_checkouts_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_gateways_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_network_stores_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_networks_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_notification_channels_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_payment_methods_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_addon_categories_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_addons_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_hours_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_store_locations_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_variant_options_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_variants_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_products_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_reviews_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_store_hours_table.php CHANGED Viewed

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_store_locations_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_stores_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/migrations/2023_05_03_025310_add_foreign_keys_to_votes_table.php CHANGED Viewed

@@ -6,7 +6,7 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-return new class() extends Migration {
+return new class extends Migration {
     /**
      * Run the migrations.
      *

package/server/src/Http/Controllers/ActionController.php CHANGED Viewed

@@ -87,9 +87,10 @@ class ActionController extends Controller
             ->where('meta->storefront_id', $store->public_id)
             ->with(['transaction'])
             ->whereNotIn('status', ['canceled'])
+            ->whereNull('deleted_at')
             ->get()
             ->sum(function ($order) {
-                return $order->transaction->amount;
+                return data_get($order, 'meta.total');
             });
         return response()->json($metrics);

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

@@ -5,6 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 use Fleetbase\FleetOps\Http\Controllers\Internal\v1\OrderController as FleetbaseOrderController;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Storefront\Notifications\StorefrontOrderPreparing;
+use Fleetbase\Storefront\Support\Storefront;
 use Illuminate\Http\Request;
 class OrderController extends FleetbaseOrderController
@@ -38,6 +39,9 @@ class OrderController extends FleetbaseOrderController
             ], 400);
         }
+        // Patch order config
+        Storefront::patchOrderConfig($order);
         // update activity to prepating
         $order->updateStatus('preparing');
         $order->customer->notify(new StorefrontOrderPreparing($order));
@@ -58,7 +62,7 @@ class OrderController extends FleetbaseOrderController
     {
         $adhoc  = $request->boolean('adhoc');
         $driver = $request->input('driver');
-        /** @var \Fleetbase\Models\Order $order */
+        /** @var Order $order */
         $order = Order::where('uuid', $request->order)->whereNull('deleted_at')->with(['customer'])->first();
         if (!$order) {
@@ -67,8 +71,11 @@ class OrderController extends FleetbaseOrderController
             ], 400);
         }
+        // Patch order config
+        Storefront::patchOrderConfig($order);
         if ($order->isMeta('is_pickup')) {
-            $order->updateStatus('ready');
+            $order->updateStatus('pickup_ready');
             return response()->json([
                 'status' => 'ok',
@@ -113,6 +120,9 @@ class OrderController extends FleetbaseOrderController
             ], 400);
         }
+        // Patch order config
+        Storefront::patchOrderConfig($order);
         // update activity to completed
         $order->updateStatus('completed');
@@ -138,6 +148,9 @@ class OrderController extends FleetbaseOrderController
             ], 400);
         }
+        // Patch order config
+        Storefront::patchOrderConfig($order);
         // update activity to dispatched
         $order->updateStatus('cancel');

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

@@ -41,6 +41,8 @@ class ProductController extends StorefrontController
                 $variants        = $request->array('product.variants');
                 $files           = $request->array('product.files');
+                // dd($addonCategories);
                 // save addon categories
                 $product->setAddonCategories($addonCategories);