@fleetbase/storefront-engine 0.3.17 → 0.3.20

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;
@@ -251,6 +259,14 @@ class CustomerController extends Controller
         // always customer type
         $input['type'] = 'customer';
 
+        // If setting a default location for the contact
+        if ($request->has('place')) {
+            $input['place_uuid'] = Utils::getUuid('places', [
+                'public_id'    => $request->input('place'),
+                'company_uuid' => session('company'),
+            ]);
+        }
+
         // update the contact
         $contact->update($input);
 
@@ -474,4 +490,73 @@ class CustomerController extends Controller
 
         return $phone;
     }
+
+    public function getStripeEphemeralKey(Request $request)
+    {
+        $customer = Storefront::getCustomerFromToken();
+        if (!$customer) {
+            return response()->error('Not authorized to view customers places');
+        }
+
+        $gateway    = Storefront::findGateway('stripe');
+        if (!$gateway) {
+            return response()->apiError('Stripe not setup.');
+        }
+
+        \Stripe\Stripe::setApiKey($gateway->config->secret_key);
+
+        // Ensure customer has a stripe_id
+        if ($customer->missingMeta('stripe_id')) {
+            Storefront::createStripeCustomerForContact($customer);
+        }
+
+        try {
+            // Create Ephemeral Key
+            $ephemeralKey = \Stripe\EphemeralKey::create(
+                ['customer' => $customer->getMeta('stripe_id')],
+                ['stripe_version' => '2020-08-27']
+            );
+
+            return response()->json([
+                'ephemeralKey'          => $ephemeralKey->secret,
+                'customer'              => $customer->getMeta('stripe_id'),
+            ]);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
+    }
+
+    public function getStripeSetupIntent(Request $request)
+    {
+        $customer = Storefront::getCustomerFromToken();
+        if (!$customer) {
+            return response()->error('Not authorized to view customers places');
+        }
+
+        $gateway    = Storefront::findGateway('stripe');
+        if (!$gateway) {
+            return response()->apiError('Stripe not setup.');
+        }
+
+        \Stripe\Stripe::setApiKey($gateway->config->secret_key);
+
+        // Ensure customer has a stripe_id
+        if ($customer->missingMeta('stripe_id')) {
+            Storefront::createStripeCustomerForContact($customer);
+        }
+
+        try {
+            // Create SetupIntent
+            $setupIntent = \Stripe\SetupIntent::create([
+                'customer' => $customer->getMeta('stripe_id'),
+            ]);
+
+            return response()->json([
+                'setupIntentId'          => $setupIntent->id,
+                'setupIntent'            => $setupIntent->client_secret,
+            ]);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
+    }
 }

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/Controllers/v1/StoreController.php

@@ -4,11 +4,12 @@ namespace Fleetbase\Storefront\Http\Controllers\v1;
 
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Storefront\Http\Resources\Gateway as GatewayResource;
-use Fleetbase\Storefront\Http\Resources\Network;
+use Fleetbase\Storefront\Http\Resources\Network as NetworkResource;
 use Fleetbase\Storefront\Http\Resources\Product as ProductResource;
-use Fleetbase\Storefront\Http\Resources\Store as StorefrontStore;
+use Fleetbase\Storefront\Http\Resources\Store as StorefrontResource;
 use Fleetbase\Storefront\Http\Resources\StoreLocation as StoreLocationResource;
 use Fleetbase\Storefront\Models\Gateway;
+use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Models\StoreLocation;
@@ -32,10 +33,34 @@ class StoreController extends Controller
         }
 
         if ($about->is_store) {
-            return new StorefrontStore($about);
+            return new StorefrontResource($about);
         }
 
-        return new Network($about);
+        return new NetworkResource($about);
+    }
+
+    /**
+     * Lookup a store or network provided the ID.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function lookup(?string $id)
+    {
+        if (!$id) {
+            return response()->apiError('No ID provided for lookup.');
+        }
+
+        $store = Store::where(['public_id' => $id, 'company_uuid' => session('company')])->first();
+        if ($store) {
+            return new StorefrontResource($store);
+        }
+
+        $network = Network::where(['public_id' => $id, 'company_uuid' => session('company')])->first();
+        if ($network) {
+            return new NetworkResource($network);
+        }
+
+        return response()->apiError('Unable to find store or network for ID provided.');
     }
 
     /**
@@ -125,7 +150,12 @@ class StoreController extends Controller
         $ownerId = session('storefront_store') ?? session('storefront_network');
 
         $sandbox = $request->input('sandbox', false);
-        $query   = Gateway::select(['public_id', 'name', 'code', 'type', 'sandbox', 'return_url', 'callback_url'])->where(['public_id' => $id, 'owner_uuid' => $ownerId]);
+        $query   = Gateway::select(['public_id', 'name', 'code', 'type', 'sandbox', 'return_url', 'callback_url'])
+            ->where(['owner_uuid' => $ownerId])
+            ->where(function ($q) use ($id) {
+                $q->where('public_id', $id);
+                $q->orWhere('code', $id);
+            });
 
         if ($sandbox) {
             $query->where('sandbox', 1);

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/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/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/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/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();
         }