@fleetbase/storefront-engine 0.3.17 → 0.3.18

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

@@ -0,0 +1,31 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+use Fleetbase\Storefront\Rules\CustomerExists;
+
+class CreateStripeSetupIntentRequest extends FleetbaseRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return session('storefront_key');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'customer'     => ['required', new CustomerExists()],
+        ];
+    }
+}

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

@@ -0,0 +1,31 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Requests;
+
+use Fleetbase\Http\Requests\FleetbaseRequest;
+use Fleetbase\Storefront\Rules\CustomerExists;
+
+class CustomerRequest extends FleetbaseRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return session('storefront_key');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'customer'     => ['required', new CustomerExists()],
+        ];
+    }
+}

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

@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Support\Http;
 
 class Cart extends FleetbaseResource
@@ -29,7 +30,7 @@ class Cart extends FleetbaseResource
             'subtotal'           => $this->subtotal,
             'total_items'        => $this->total_items,
             'total_unique_items' => $this->total_unique_items,
-            'items'              => $this->items ?? [],
+            'items'              => $this->getCartItems(),
             'events'             => $this->events ?? [],
             'discount_code'      => $this->discount_code,
             'expires_at'         => $this->expires_at,
@@ -37,4 +38,20 @@ class Cart extends FleetbaseResource
             'updated_at'         => $this->updated_at,
         ];
     }
+
+    public function getCartItems()
+    {
+        $items = $this->items ?? [];
+
+        return array_map(function ($cartItem) {
+            $product = Product::select(['public_id', 'primary_image_uuid', 'name', 'description'])->where('public_id', data_get($cartItem, 'product_id'))->first();
+            if ($product) {
+                data_set($cartItem, 'name', $product->name);
+                data_set($cartItem, 'description', $product->description);
+                data_set($cartItem, 'product_image_url', $product->primary_image_url);
+            }
+
+            return $cartItem;
+        }, $items);
+    }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\Storefront\Http\Resources;
 
+use Fleetbase\FleetOps\Http\Resources\v1\Place;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 use Illuminate\Support\Str;
@@ -17,21 +18,25 @@ class Customer extends FleetbaseResource
      */
     public function toArray($request)
     {
+        $this->loadMissing(['place', 'places']);
+
         return [
-            'id'          => $this->when(Http::isInternalRequest(), $this->id, Str::replaceFirst('contact', 'customer', $this->public_id)),
-            'uuid'        => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'   => $this->when(Http::isInternalRequest(), $this->public_id),
-            'internal_id' => $this->internal_id,
-            'name'        => $this->name,
-            'photo_url'   => $this->photo_url,
-            'email'       => $this->email,
-            'phone'       => $this->phone,
-            'address'     => data_get($this, 'address.address'),
-            'addresses'   => $this->addresses,
-            'token'       => $this->when($this->token, $this->token),
-            'slug'        => $this->slug,
-            'created_at'  => $this->created_at,
-            'updated_at'  => $this->updated_at,
+            'id'                   => $this->when(Http::isInternalRequest(), $this->id, Str::replaceFirst('contact', 'customer', $this->public_id)),
+            'uuid'                 => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'            => $this->when(Http::isInternalRequest(), $this->public_id),
+            'address_id'           => $this->place ? $this->place->public_id : null,
+            'internal_id'          => $this->internal_id,
+            'name'                 => $this->name,
+            'photo_url'            => $this->photo_url,
+            'email'                => $this->email,
+            'phone'                => $this->phone,
+            'address'              => data_get($this, 'place.address'),
+            'addresses'            => $this->whenLoaded('places', Place::collection($this->places)),
+            'token'                => $this->when($this->token, $this->token),
+            'meta'                 => $this->meta ?? [],
+            'slug'                 => $this->slug,
+            'created_at'           => $this->created_at,
+            'updated_at'           => $this->updated_at,
         ];
     }
 }

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

@@ -4,6 +4,7 @@ namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
+use Fleetbase\Support\Utils;
 
 class Store extends FleetbaseResource
 {
@@ -16,6 +17,8 @@ class Store extends FleetbaseResource
      */
     public function toArray($request)
     {
+        $currency = $this->currency ?? 'USD';
+
         return [
             'id'              => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'            => $this->when(Http::isInternalRequest(), $this->uuid),
@@ -35,7 +38,8 @@ class Store extends FleetbaseResource
             'email'           => $this->email,
             'phone'           => $this->phone,
             'tags'            => $this->tags ?? [],
-            'currency'        => $this->currency ?? 'USD',
+            'currency'        => $currency,
+            'country'         => Utils::getCountryCodeByCurrency($currency, 'US'),
             'options'         => $this->formatOptions($this->options),
             'logo_url'        => $this->logo_url,
             'backdrop_url'    => $this->backdrop_url,

package/server/src/Models/AddonCategory.php

@@ -2,8 +2,8 @@
 
 namespace Fleetbase\Storefront\Models;
 
+use Fleetbase\Casts\Money as MoneyCast;
 use Fleetbase\Models\Category;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 class AddonCategory extends Category
@@ -34,29 +34,27 @@ class AddonCategory extends Category
             // get uuid if set
             $id = data_get($addon, 'uuid');
 
-            // make sure the cateogry is set to this current
-            data_set($addon, 'category_uuid', $this->uuid);
-
-            // make sure sale price is 0 if null
-            if (data_get($addon, 'sale_price') === null) {
-                data_set($addon, 'sale_price', 0);
-            }
+            // create an upsertable array
+            $upsertableProductAddon = [
+                'category_uuid'    => $this->uuid,
+                'name'             => data_get($addon, 'name'),
+                'description'      => data_get($addon, 'description'),
+                'translations'     => data_get($addon, 'translations', []),
+                'price'            => MoneyCast::apply($addon['price'] ?? 0),
+                'sale_price'       => MoneyCast::apply($addon['sale_price'] ?? 0),
+                'is_on_sale'       => data_get($addon, 'is_on_sale'),
+            ];
 
             // update product addon category
             if (Str::isUuid($id)) {
-                ProductAddon::where('uuid', $id)->update(Arr::except($addon, ['uuid', 'created_at', 'updated_at']));
+                ProductAddon::where('uuid', $id)->update($upsertableProductAddon);
                 continue;
             }
 
             // create new product addon category
             ProductAddon::create([
-                'category_uuid'    => $this->uuid,
-                'name'             => data_get($addon, 'name'),
-                'description'      => data_get($addon, 'description'),
-                'translations'     => data_get($addon, 'translations', []),
-                'price'            => data_get($addon, 'price'),
-                'sale_price'       => data_get($addon, 'sale_price'),
-                'is_on_sale'       => data_get($addon, 'is_on_sale'),
+                ...$upsertableProductAddon,
+                'created_by_uuid' => session('user'),
             ]);
         }
 

package/server/src/Models/Cart.php

@@ -5,6 +5,7 @@ namespace Fleetbase\Storefront\Models;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Company;
+use Fleetbase\Models\User;
 use Fleetbase\Traits\Expirable;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
@@ -294,11 +295,10 @@ class Cart extends StorefrontModel
     /**
      * Adds an item to cart.
      *
-     * @param \Fleetbase\Models\Storefront\Product $product
-     * @param int                                  $quantity
-     * @param array                                $variants
-     * @param array                                $addons
-     * @param string                               $createdAt
+     * @param int    $quantity
+     * @param array  $variants
+     * @param array  $addons
+     * @param string $createdAt
      */
     public function addItem(Product $product, $quantity = 1, $variants = [], $addons = [], $storeLocationId = null, $scheduledAt = null, $createdAt = null)
     {
@@ -673,4 +673,9 @@ class Cart extends StorefrontModel
     {
         return Product::select(['uuid', 'store_uuid', 'public_id', 'name', 'description', 'price', 'currency', 'sale_price', 'is_on_sale'])->where(['public_id' => $id])->with([])->first();
     }
+
+    public function getCurrency(?string $fallbackCurrency = null): ?string
+    {
+        return $this->currency ?? session('storefront_currency', $fallbackCurrency);
+    }
 }

package/server/src/Models/Customer.php

@@ -75,9 +75,9 @@ class Customer extends Contact
      *
      * @param string $publicId The public ID of the customer to find
      *
-     * @return static|null The customer with the given public ID, or null if none was found
+     * @return Customer|null The customer with the given public ID, or null if none was found
      */
-    public static function findFromCustomerId($publicId)
+    public static function findFromCustomerId($publicId): self
     {
         if (Str::startsWith($publicId, 'customer')) {
             $publicId = Str::replaceFirst('customer', 'contact', $publicId);

package/server/src/Models/Gateway.php

@@ -136,14 +136,19 @@ class Gateway extends StorefrontModel
         return (object) $sortedConfig;
     }
 
-    public function getIsStripeGatewayAttribute()
+    public function getIsStripeGatewayAttribute(): bool
     {
-        return $this->type === 'stripe';
+        return $this->isGateway('stripe');
     }
 
-    public function getIsQpayGatewayAttribute()
+    public function getIsQPayGatewayAttribute(): bool
     {
-        return $this->type === 'qpay';
+        return $this->isGateway('qpay');
+    }
+
+    public function isGateway(string $type): bool
+    {
+        return strtolower($this->type) === strtolower($type);
     }
 
     /**

package/server/src/Models/Product.php

@@ -305,23 +305,22 @@ class Product extends StorefrontModel
             // get uuid if set
             $id = data_get($addonCategory, 'uuid');
 
-            // Make sure product is set
-            data_set($addonCategory, 'product_uuid', $this->uuid);
+            $upsertableAddonCategory = [
+                'product_uuid'    => $this->uuid,
+                'category_uuid'   => data_get($addonCategory, 'category_uuid'),
+                'excluded_addons' => data_get($addonCategory, 'excluded_addons'),
+                'max_selectable'  => data_get($addonCategory, 'max_selectable'),
+                'is_required'     => data_get($addonCategory, 'is_required'),
+            ];
 
             // update product addon category
             if (Str::isUuid($id)) {
-                ProductAddonCategory::where('uuid', $id)->update(Arr::except($addonCategory, ['uuid', 'created_at', 'updated_at', 'name', 'category']));
+                ProductAddonCategory::where('uuid', $id)->update($upsertableAddonCategory);
                 continue;
             }
 
             // create new product addon category
-            ProductAddonCategory::create([
-                'product_uuid'    => $this->uuid,
-                'category_uuid'   => data_get($addonCategory, 'category_uuid'),
-                'excluded_addons' => data_get($addonCategory, 'excluded_addons'),
-                'max_selectable'  => data_get($addonCategory, 'max_selectable'),
-                'is_required'     => data_get($addonCategory, 'is_required'),
-            ]);
+            ProductAddonCategory::create($upsertableAddonCategory);
         }
 
         return $this;

package/server/src/Models/ProductAddonCategory.php

@@ -35,6 +35,7 @@ class ProductAddonCategory extends StorefrontModel
         'category_uuid',
         'excluded_addons',
         'max_selectable',
+        'is_required',
     ];
 
     /**
@@ -44,6 +45,7 @@ class ProductAddonCategory extends StorefrontModel
      */
     protected $casts = [
         'excluded_addons' => Json::class,
+        'is_required'     => 'boolean',
     ];
 
     /**

package/server/src/Support/QPay.php

@@ -2,7 +2,10 @@
 
 namespace Fleetbase\Storefront\Support;
 
+use Fleetbase\Storefront\Models\Checkout;
+use Fleetbase\Support\Utils;
 use GuzzleHttp\Client;
+use Illuminate\Support\Str;
 
 class QPay
 {
@@ -14,7 +17,7 @@ class QPay
 
     public function __construct(?string $username = null, ?string $password = null, ?string $callbackUrl = null)
     {
-        $this->callbackUrl    = $callbackUrl;
+        $this->callbackUrl    = $callbackUrl ?? Utils::apiUrl('storefront/v1/checkouts/process-qpay');
         $this->requestOptions = [
             'base_uri' => $this->buildRequestUrl(),
             'auth'     => [$username, $password],
@@ -37,6 +40,13 @@ class QPay
         return $this->client;
     }
 
+    public function setCallback(string $url)
+    {
+        $this->callbackUrl = $url;
+
+        return $this;
+    }
+
     public function setNamespace(string $namespace): ?QPay
     {
         $this->namespace = $namespace;
@@ -163,6 +173,11 @@ class QPay
         return $this->post('invoice', $params, $options);
     }
 
+    public function paymentGet(string $paymentId)
+    {
+        return $this->get('payment/' . $paymentId);
+    }
+
     public function paymentCheck(string $invoiceId, $options = [])
     {
         $params = [
@@ -207,4 +222,23 @@ class QPay
 
         return preg_replace('/[^A-Za-z0-9\-]/', '', $code);
     }
+
+    public static function createTestPaymentDataFromCheckout(Checkout $checkout): array
+    {
+        return [
+            'payment_id'        => (string) Str::uuid(),
+            'payment_status'    => 'PAID',
+            'payment_fee'       => '1.00',
+            'payment_amount'    => $checkout->amount,
+            'payment_currency'  => $checkout->currency,
+            'payment_date'      => now(),
+            'payment_wallet'    => 'TEST',
+            'object_type'       => 'INVOICE',
+            'object_id'         => $checkout->getOption('qpay_invoice_id', (string) Str::uuid()),
+            'next_payment_date' => null,
+            'transaction_type'  => 'P2P',
+            'card_transactions' => [],
+            'p2p_transactions'  => [],
+        ];
+    }
 }

package/server/src/Support/StripeUtils.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Fleetbase\Storefront\Support;
+
+use Fleetbase\Storefront\Models\Customer;
+use Illuminate\Support\Facades\Log;
+use Stripe\PaymentMethod;
+
+class StripeUtils
+{
+    /**
+     * Checks if the given customer's saved payment method is valid and attached to them on Stripe.
+     * If not, attempts to attach it.
+     *
+     * @param Customer $customer an instance of your Customer model
+     *
+     * @return bool true if the payment method is valid and attached, false otherwise
+     */
+    public static function isCustomerPaymentMethodValid(Customer $customer): bool
+    {
+        $stripeCustomerId = $customer->getMeta('stripe_id');
+        $paymentMethodId  = $customer->getMeta('stripe_payment_method_id');
+
+        if (!$stripeCustomerId || !$paymentMethodId) {
+            return false;
+        }
+
+        try {
+            $pm = PaymentMethod::retrieve($paymentMethodId);
+
+            return $pm && $pm->customer === $stripeCustomerId;
+        } catch (\Exception $e) {
+            Log::error('Error verifying or attaching payment method: ' . $e->getMessage());
+
+            return false;
+        }
+    }
+}

package/server/src/routes.php

@@ -15,6 +15,20 @@ use Illuminate\Support\Facades\Route;
 
 Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace('Fleetbase\Storefront\Http\Controllers')->group(
     function ($router) {
+        /*
+        |--------------------------------------------------------------------------
+        | Public/Callback Receivable Storefront API Routes
+        |--------------------------------------------------------------------------
+        |
+        | End-user API routes, these are routes that the SDK and applications will interface with, and require API credentials.
+        */
+        Route::group(['prefix' => 'v1', 'namespace' => 'v1'], function ($router) {
+            // storefront/v1/checkouts
+            $router->group(['prefix' => 'checkouts'], function () use ($router) {
+                $router->match(['get', 'post'], 'capture-qpay', 'CheckoutController@captureQpayCallback');
+            });
+        });
+
         /*
         |--------------------------------------------------------------------------
         | Consumable Storefront API Routes
@@ -26,6 +40,7 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
             ->middleware('storefront.api')
             ->namespace('v1')
             ->group(function ($router) {
+                $router->get('lookup/{id}', 'StoreController@lookup');
                 $router->get('about', 'StoreController@about');
                 $router->get('locations/{id}', 'StoreController@location');
                 $router->get('locations', 'StoreController@locations');
@@ -40,6 +55,8 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
                 $router->group(['prefix' => 'checkouts'], function () use ($router) {
                     $router->get('before', 'CheckoutController@beforeCheckout');
                     $router->post('capture', 'CheckoutController@captureOrder');
+                    $router->post('stripe-setup-intent', 'CheckoutController@createStripeSetupIntentForCustomer');
+                    $router->put('stripe-update-payment-intent', 'CheckoutController@updateStripePaymentIntent');
                 });
 
                 // storefront/v1/service-quotes
@@ -80,6 +97,8 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
                     $router->post('verify-code', 'CustomerController@verifyCode');
                     $router->post('login', 'CustomerController@login');
                     $router->post('request-creation-code', 'CustomerController@requestCustomerCreationCode');
+                    $router->post('stripe-ephemeral-key', 'CustomerController@getStripeEphemeralKey');
+                    $router->post('stripe-setup-intent', 'CustomerController@getStripeSetupIntent');
                 });
 
                 // hotfix! storefront-app sending customer update to /contacts/ route

package/translations/en-us.yaml

@@ -598,7 +598,8 @@ storefront:
       proof-of-delivery-method: Proof of Delivery Method
       enable-cash-on-delivery: Enable cash on delivery
       enable-order-pickup: Enable order pickup
-      enable-tip: Enable tips
+      enable-tips: Enable tips
+      enable-delivery-tips: Enable delivery tips
       enable-integrated-vendors: Enable integrated vendors
       save-changes: Save Changes
     locations: