@fleetbase/storefront-engine 0.3.18 → 0.3.20

package/server/migrations/2023_05_03_025307_create_stores_table.php

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/v1/CheckoutController.php

@@ -132,7 +132,7 @@ class CheckoutController extends Controller
         ]);
     }
 
-    public static function initializeStripeCheckout(Contact $customer, Gateway $gateway, ServiceQuote $serviceQuote, Cart $cart, $checkoutOptions)
+    public static function initializeStripeCheckout(Contact $customer, Gateway $gateway, ?ServiceQuote $serviceQuote, Cart $cart, $checkoutOptions)
     {
         // check if pickup order
         $isPickup = $checkoutOptions->is_pickup;
@@ -202,7 +202,7 @@ class CheckoutController extends Controller
             'network_uuid'       => session('storefront_network'),
             'cart_uuid'          => $cart->uuid,
             'gateway_uuid'       => $gateway->uuid,
-            'service_quote_uuid' => $serviceQuote->uuid,
+            'service_quote_uuid' => $serviceQuote ? $serviceQuote->uuid : null,
             'owner_uuid'         => $customer->uuid,
             'owner_type'         => 'fleet-ops:contact',
             'amount'             => $amount,
@@ -327,9 +327,6 @@ class CheckoutController extends Controller
         $serviceQuote = ServiceQuote::select(['amount', 'meta', 'uuid', 'public_id'])
             ->where('public_id', $serviceQuoteId)
             ->first();
-        if (!$serviceQuote) {
-            return response()->apiError('Invalid service quote ID provided');
-        }
 
         // Recalculate amount based on cart, serviceQuote, and checkoutOptions
         $amount   = static::calculateCheckoutAmount($cart, $serviceQuote, $checkoutOptions);
@@ -398,7 +395,7 @@ class CheckoutController extends Controller
             'network_uuid'       => session('storefront_network'),
             'cart_uuid'          => $cart->uuid,
             'gateway_uuid'       => $gateway->uuid,
-            'service_quote_uuid' => $serviceQuote->uuid,
+            'service_quote_uuid' => $serviceQuote ? $serviceQuote->uuid : null,
             'owner_uuid'         => $customer->uuid,
             'owner_type'         => 'fleet-ops:contact',
             'amount'             => $amount,
@@ -418,7 +415,7 @@ class CheckoutController extends Controller
         ]);
     }
 
-    public static function initializeQPayCheckout(Contact $customer, Gateway $gateway, ServiceQuote $serviceQuote, Cart $cart, $checkoutOptions)
+    public static function initializeQPayCheckout(Contact $customer, Gateway $gateway, ?ServiceQuote $serviceQuote, Cart $cart, $checkoutOptions)
     {
         // Get store info
         $about = Storefront::about();
@@ -455,7 +452,7 @@ class CheckoutController extends Controller
             'network_uuid'       => session('storefront_network'),
             'cart_uuid'          => $cart->uuid,
             'gateway_uuid'       => $gateway->uuid,
-            'service_quote_uuid' => $serviceQuote->uuid,
+            'service_quote_uuid' => $serviceQuote ? $serviceQuote->uuid : null,
             'owner_uuid'         => $customer->uuid,
             'owner_type'         => 'fleet-ops:contact',
             'amount'             => $amount,
@@ -612,8 +609,8 @@ class CheckoutController extends Controller
         $customer     = $checkout->owner;
         $serviceQuote = $checkout->serviceQuote;
         $gateway      = $checkout->is_cod ? Gateway::cash() : $checkout->gateway;
-        $origin       = $serviceQuote->getMeta('origin', []);
-        $destination  = $serviceQuote->getMeta('destination');
+        $origin       = $serviceQuote ? $serviceQuote->getMeta('origin', []) : null;
+        $destination  = $serviceQuote ? $serviceQuote->getMeta('destination') : null;
         $cart         = $checkout->cart;
 
         // if cart is null then cart has either been deleted or expired
@@ -848,7 +845,9 @@ class CheckoutController extends Controller
         Storefront::alertNewOrder($order);
 
         // purchase service quote
-        $order->purchaseQuote($serviceQuote->uuid, $transactionDetails);
+        if ($serviceQuote) {
+            $order->purchaseQuote($serviceQuote->uuid, $transactionDetails);
+        }
 
         // if order is auto accepted update status
         if ($about->isOption('auto_accept_orders')) {
@@ -1199,7 +1198,7 @@ class CheckoutController extends Controller
      *
      * @param stdClass $checkoutOptions
      */
-    private static function calculateCheckoutAmount(Cart $cart, ServiceQuote $serviceQuote, $checkoutOptions): int
+    private static function calculateCheckoutAmount(Cart $cart, ?ServiceQuote $serviceQuote, $checkoutOptions): int
     {
         // cast checkout options to object always
         $checkoutOptions = (object) $checkoutOptions;

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\Storefront\Http\Controllers\v1;
 
+use Fleetbase\FleetOps\Exceptions\UserAlreadyExistsException;
 use Fleetbase\FleetOps\Http\Requests\UpdateContactRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Order as OrderResource;
@@ -174,7 +175,6 @@ class CustomerController extends Controller
 
         // verify code
         $isVerified = VerificationCode::where(['code' => $code, 'for' => 'storefront_create_customer', 'meta->identity' => $identity])->exists();
-
         if (!$isVerified) {
             return response()->error('Invalid verification code provided!');
         }
@@ -209,13 +209,21 @@ class CustomerController extends Controller
         ];
 
         // create the customer/contact
-        $customer = Contact::create($input);
+        try {
+            $customer = Contact::create($input);
+        } catch (UserAlreadyExistsException $e) {
+            // If the exception is thrown because user already exists and
+            // that user is the same user already assigned continue
+            $customer = Contact::where(['company_uuid' => session('company'), 'phone' => $input['phone']])->first();
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
 
         // generate auth token
         try {
             $token = $user->createToken($customer->uuid);
         } catch (\Exception $e) {
-            return response()->error($e->getMessage());
+            return response()->apiError($e->getMessage());
         }
 
         $customer->token = $token->plainTextToken;

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

@@ -371,13 +371,13 @@ class ServiceQuoteController extends Controller
 
     /**
      * Returns a place from either a place id or store location id.
-     *
-     * @param string $id
-     *
-     * @return Place
      */
-    public function getPlaceFromId($id)
+    public function getPlaceFromId(string|array $id): ?Place
     {
+        if (is_array($id)) {
+            $id = implode(',', $id);
+        }
+
         if (Str::startsWith($id, 'store_location')) {
             $storeLocation = StoreLocation::select(['place_uuid'])->where(['public_id' => $id, 'store_uuid' => session('storefront_store')])->with(['place'])->first();
 

package/server/src/Http/Requests/CreateCustomerRequest.php

@@ -29,11 +29,15 @@ class CreateCustomerRequest extends FleetbaseRequest
             'name'  => 'required',
             'email' => [
                 'email', 'nullable', Rule::unique('contacts')->where(function ($query) {
+                    $query->where('company_uuid', session('company'));
+
                     return $query->whereNull('deleted_at');
                 }),
             ],
             'phone' => [
                 'nullable', Rule::unique('contacts')->where(function ($query) {
+                    $query->where('company_uuid', session('company'));
+
                     return $query->whereNull('deleted_at');
                 }),
             ],

package/server/src/Http/Requests/InitializeCheckoutRequest.php

@@ -5,6 +5,7 @@ namespace Fleetbase\Storefront\Http\Requests;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Storefront\Rules\CustomerExists;
 use Fleetbase\Storefront\Rules\GatewayExists;
+use Illuminate\Validation\Rule;
 
 class InitializeCheckoutRequest extends FleetbaseRequest
 {
@@ -29,7 +30,7 @@ class InitializeCheckoutRequest extends FleetbaseRequest
             'gateway'      => ['required', new GatewayExists()],
             'customer'     => ['required', new CustomerExists()],
             'cart'         => ['required', 'exists:storefront.carts,public_id'],
-            'serviceQuote' => ['required', 'exists:service_quotes,public_id'],
+            'serviceQuote' => [Rule::requiredIf(fn () => !$this->boolean('pickup')), 'exists:service_quotes,public_id'],
             'cash'         => ['sometimes', 'boolean'],
             'pickup'       => ['sometimes', 'boolean'],
         ];

package/server/src/Models/Store.php

@@ -310,7 +310,7 @@ class Store extends StorefrontModel
      *
      * @param string $id the ID of the network for which the category is to be retrieved
      *
-     * @return \Fleetbase\Models\Category|null the category of the store in the given network, or null if the store does not belong to the network
+     * @return Category|null the category of the store in the given network, or null if the store does not belong to the network
      */
     public function getNetworkCategoryUsingId(?string $id)
     {
@@ -334,7 +334,7 @@ class Store extends StorefrontModel
      *
      * @param Network $network the network for which the category is to be retrieved
      *
-     * @return \Fleetbase\Models\Category|null the category of the store in the given network, or null if the store does not belong to the network
+     * @return Category|null the category of the store in the given network, or null if the store does not belong to the network
      */
     public function getNetworkCategory(Network $network)
     {

package/server/src/Observers/OrderObserver.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Observers;
 
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Storefront\Support\Storefront;
 
 class OrderObserver
 {
@@ -11,7 +12,12 @@ class OrderObserver
      *
      * @return void
      */
-    public function created(Order $order)
+    public function creating(Order $order)
     {
+        // Set the storefront order config
+        $orderConfig = Storefront::getDefaultOrderConfig();
+        if ($orderConfig) {
+            $order->order_config_uuid = $orderConfig->uuid;
+        }
     }
 }

package/server/src/Rules/IsValidLocation.php

@@ -20,12 +20,12 @@ class IsValidLocation implements Rule
     public function passes($attribute, $value)
     {
         // Validate Place id
-        if (Str::startsWith($value, 'place_')) {
+        if (is_string($value) && Str::startsWith($value, 'place_')) {
             return Place::where('public_id', $value)->exists();
         }
 
         // Validate StoreLocation id
-        if (Str::startsWith($value, 'store_location_')) {
+        if (is_string($value) && Str::startsWith($value, 'store_location_')) {
             return StoreLocation::where('public_id', $value)->exists();
         }
 

package/server/src/Support/Storefront.php

@@ -12,6 +12,7 @@ use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Notifications\StorefrontOrderCreated;
+use Fleetbase\Support\Auth;
 use Fleetbase\Support\Utils;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Redis;
@@ -203,6 +204,39 @@ class Storefront
         return $stripeCustomer;
     }
 
+    public static function patchOrderConfig(Order $order)
+    {
+        $orderConfig = $order->config();
+        if (!$orderConfig) {
+            $orderConfig = Storefront::getDefaultOrderConfig();
+            if ($orderConfig) {
+                $order->update(['order_config_uuid' => $orderConfig->uuid]);
+            }
+        }
+
+        return $orderConfig;
+    }
+
+    public static function getDefaultOrderConfig()
+    {
+        $company = Auth::getCompany();
+        if ($company) {
+            return static::getOrderConfig($company);
+        }
+
+        return null;
+    }
+
+    public static function getOrderConfig(Company $company)
+    {
+        $orderConfig = OrderConfig::where(['company_uuid' => $company->uuid, 'key' => 'storefront', 'namespace' => 'system:order-config:storefront'])->first();
+        if (!$orderConfig) {
+            $orderConfig = static::createStorefrontConfig($company);
+        }
+
+        return $orderConfig;
+    }
+
     /**
      * Creates or retrieves an existing storefront configuration for a given company.
      *

package/translations/en-us.yaml

@@ -226,7 +226,8 @@ storefront:
       orders:
         widget-title: Recent Orders
         id-column: Order ID
-        accept-order: Accept Order
+        cancel-order: Cancel Order
+        accept-order: Accept Order!
         mark-as-ready: Mark as Ready!
         mark-as-completed: Mark as Completed
         more-details: More Details
@@ -236,8 +237,11 @@ storefront:
         delivery-fee: Delivery fee
         delivery-tip: Delivery tip
         tip: Tip
+        total: Total
         change-driver: Change Driver
         assign-driver: Assign Driver
+        customer-pickup: Customer Pickup
+        pickup-order: Pickup Order
         mark-as-ready-modal-pickup-title: Mark order ready for pickup?
         mark-as-ready-modal-pickup-body: Marking the order as ready will notify the customer their order is ready for pickup!
         mark-as-ready-modal-pickup-accept-button-text: Ready for Pickup!
@@ -429,6 +433,7 @@ storefront:
       select-order-dropoff-location: Select order dropoff location
       scheduled-at: Scheduled At
       transaction-total: Transaction Total
+      total: Total
       tracking-number: Tracking Number
       driver-assigned: Driver Assigned
       select-driver-for-order: Select driver for order