Merge pull request #16 from fleetbase/dev-v0.3.2

release v0.3.2

addon/components/schedule-manager.js

@@ -44,8 +44,8 @@ export default class ScheduleManagerComponent extends Component {
         });
 
         this.modalsManager.show('modals/add-store-hours', {
-            title: this.intl.t('storefront.component.schedule-manager.add-new-hours-for-day', { Day: day }),
-            acceptButtonText: this.intl.t('storefront.component.schedule-manager-add-hours'),
+            title: this.intl.t('storefront.component.schedule-manager.add-new-hours-for-day', { day: day }),
+            acceptButtonText: this.intl.t('storefront.component.schedule-manager.add-hours'),
             acceptButtonIcon: 'save',
             hours,
             confirm: (modal) => {

addon/controllers/networks/index/network/index.js

@@ -49,6 +49,13 @@ export default class NetworksIndexNetworkIndexController extends Controller {
      */
     @service intl;
 
+    /**
+     * Store service to handle file uploads and other network requests.
+     *
+     * @property {Service} store
+     */
+    @service store;
+
     /**
      * Proof of delivery methods.
      *

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.7",
-        "fleetbase/fleetops-api": "^0.4.13",
+        "fleetbase/core-api": "^1.4.9",
+        "fleetbase/fleetops-api": "^0.4.15",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "laravel-notification-channels/apn": "^5.0",
         "laravel-notification-channels/fcm": "^4.1",

extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "MIT",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",

server/src/Expansions/EntityExpansion.php

@@ -3,6 +3,8 @@
 namespace Fleetbase\Storefront\Expansions;
 
 use Fleetbase\Build\Expansion;
+use Fleetbase\FleetOps\Models\Entity;
+use Fleetbase\Storefront\Models\Product;
 
 class EntityExpansion implements Expansion
 {
@@ -13,18 +15,18 @@ class EntityExpansion implements Expansion
      */
     public static function target()
     {
-        return \Fleetbase\FleetOps\Models\Entity::class;
+        return Entity::class;
     }
 
     /**
      * Create a new Entity from a Storefront Product.
      *
-     * @return \Fleetbase\FleetOps\Models\Entity
+     * @return Entity
      */
     public function fromStorefrontProduct()
     {
-        return static function (\Fleetbase\Storefront\Models\Product $product) {
-            return new static([
+        return static function (Product $product) {
+            return new Entity([
                 'company_uuid' => session('company'),
                 'photo_uuid'   => $product->primary_image_uuid,
                 'internal_id'  => $product->public_id,

server/src/Http/Controllers/v1/CheckoutController.php

@@ -17,6 +17,7 @@
 use Fleetbase\Storefront\Http\Requests\InitializeCheckoutRequest;
 use Fleetbase\Storefront\Models\Cart;
 use Fleetbase\Storefront\Models\Checkout;
+use Fleetbase\Storefront\Models\Customer;
 use Fleetbase\Storefront\Models\Gateway;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
@@ -53,7 +54,7 @@ public function beforeCheckout(InitializeCheckoutRequest $request)
         // find and validate cart session
         $cart         = Cart::retrieve($cartId);
         $gateway      = Storefront::findGateway($gatewayCode);
-        $customer     = Contact::findFromCustomerId($customerId);
+        $customer     = Customer::findFromCustomerId($customerId);
         $serviceQuote = ServiceQuote::select(['amount', 'meta', 'uuid', 'public_id'])->where('public_id', $serviceQuoteId)->first();
 
         // handle cash orders
@@ -113,7 +114,7 @@ public static function initializeCashCheckout(Contact $customer, Gateway $gatewa
             'gateway_uuid'       => $gateway->uuid ?? null,
             'service_quote_uuid' => $serviceQuote->uuid,
             'owner_uuid'         => $customer->uuid,
-            'owner_type'         => 'contact',
+            'owner_type'         => 'fleet-ops:contact',
             'amount'             => $amount,
             'currency'           => $currency,
             'is_cod'             => true,
@@ -187,7 +188,7 @@ public static function initializeStripeCheckout(Contact $customer, Gateway $gate
             'gateway_uuid'       => $gateway->uuid,
             'service_quote_uuid' => $serviceQuote->uuid,
             'owner_uuid'         => $customer->uuid,
-            'owner_type'         => 'contact',
+            'owner_type'         => 'fleet-ops:contact',
             'amount'             => $amount,
             'currency'           => $currency,
             'is_pickup'          => $isPickup,
@@ -249,7 +250,7 @@ public static function initializeQpayCheckout(Contact $customer, Gateway $gatewa
             'gateway_uuid'       => $gateway->uuid,
             'service_quote_uuid' => $serviceQuote->uuid,
             'owner_uuid'         => $customer->uuid,
-            'owner_type'         => 'contact',
+            'owner_type'         => 'fleet-ops:contact',
             'amount'             => $amount,
             'currency'           => $currency,
             'is_pickup'          => $isPickup,
@@ -345,7 +346,7 @@ public function captureOrder(CaptureOrderRequest $request)
         $transaction = Transaction::create([
             'company_uuid'           => session('company'),
             'customer_uuid'          => $customer->uuid,
-            'customer_type'          => 'contact',
+            'customer_type'          => Utils::getMutationType('fleet-ops:contact'),
             'gateway_transaction_id' => Utils::or($transactionDetails, ['id', 'transaction_id']) ?? Transaction::generateNumber(),
             'gateway'                => $gateway->code,
             'gateway_uuid'           => $gateway->uuid,
@@ -458,18 +459,7 @@ public function captureOrder(CaptureOrderRequest $request)
         // create entities
         foreach ($cart->items as $cartItem) {
             $product = Product::where('public_id', $cartItem->product_id)->first();
-            $entity  = Entity::fromStorefrontProduct($product)->fill([
-                'company_uuid'  => session('company'),
-                'payload_uuid'  => $payload->uuid,
-                'customer_uuid' => $customer->uuid,
-                'customer_type' => 'contact',
-            ])->setMetas([
-                'variants'     => $cartItem->variants,
-                'addons'       => $cartItem->addons,
-                'subtotal'     => $cartItem->subtotal,
-                'quantity'     => $cartItem->quantity,
-                'scheduled_at' => $cartItem->scheduled_at ?? null,
-            ]);
+            $entity  = Entity::fromStorefrontProduct($product);
 
             $entity->save();
         }
@@ -505,7 +495,7 @@ public function captureOrder(CaptureOrderRequest $request)
             'company_uuid'     => $store->company_uuid ?? session('company'),
             'payload_uuid'     => $payload->uuid,
             'customer_uuid'    => $customer->uuid,
-            'customer_type'    => 'contact',
+            'customer_type'    => Utils::getMutationType('fleet-ops:contact'),
             'transaction_uuid' => $transaction->uuid,
             'adhoc'            => $about->isOption('auto_dispatch'),
             'type'             => 'storefront',
@@ -525,6 +515,8 @@ public function captureOrder(CaptureOrderRequest $request)
         // create order
         $order = Order::create($orderInput);
 
+        info('Order created', $order->toArray());
+
         // notify order creation
         Storefront::alertNewOrder($order);
 
@@ -610,7 +602,7 @@ public function captureMultipleOrders(CaptureOrderRequest $request)
         $transaction = Transaction::create([
             'company_uuid'           => session('company'),
             'customer_uuid'          => $customer->uuid,
-            'customer_type'          => 'contact',
+            'customer_type'          => Utils::getMutationType('fleet-ops:contact'),
             'gateway_transaction_id' => Utils::or($transactionDetails, ['id', 'transaction_id']) ?? Transaction::generateNumber(),
             'gateway'                => $gateway->code,
             'gateway_uuid'           => $gateway->uuid,
@@ -706,7 +698,7 @@ public function captureMultipleOrders(CaptureOrderRequest $request)
                     'company_uuid'  => $store->company_uuid,
                     'payload_uuid'  => $payload->uuid,
                     'customer_uuid' => $customer->uuid,
-                    'customer_type' => 'contact',
+                    'customer_type' => Utils::getMutationType('fleet-ops:contact'),
                 ])->setMetas([
                     'variants'     => $cartItem->variants,
                     'addons'       => $cartItem->addons,
@@ -746,7 +738,7 @@ public function captureMultipleOrders(CaptureOrderRequest $request)
                 'company_uuid'     => $store->company_uuid,
                 'payload_uuid'     => $payload->uuid,
                 'customer_uuid'    => $customer->uuid,
-                'customer_type'    => 'contact',
+                'customer_type'    => Utils::getMutationType('fleet-ops:contact'),
                 'transaction_uuid' => $transaction->uuid,
                 'adhoc'            => $about->isOption('auto_dispatch'),
                 'type'             => 'storefront',
@@ -811,7 +803,7 @@ public function captureMultipleOrders(CaptureOrderRequest $request)
                 'company_uuid'  => session('company'),
                 'payload_uuid'  => $payload->uuid,
                 'customer_uuid' => $customer->uuid,
-                'customer_type' => 'contact',
+                'customer_type' => Utils::getMutationType('fleet-ops:contact'),
             ])->setMetas([
                 'variants'     => $cartItem->variants,
                 'addons'       => $cartItem->addons,
@@ -849,7 +841,7 @@ public function captureMultipleOrders(CaptureOrderRequest $request)
             'company_uuid'     => session('company'),
             'payload_uuid'     => $payload->uuid,
             'customer_uuid'    => $customer->uuid,
-            'customer_type'    => 'contact',
+            'customer_type'    => Utils::getMutationType('fleet-ops:contact'),
             'transaction_uuid' => $transaction->uuid,
             'adhoc'            => $about->isOption('auto_dispatch'),
             'type'             => 'storefront',

server/src/Models/Checkout.php

@@ -3,9 +3,9 @@
 namespace Fleetbase\Storefront\Models;
 
 use Fleetbase\Casts\Json;
-use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\Models\Company;
-use Fleetbase\Models\ServiceQuote;
+use Fleetbase\Support\Utils;
 use Fleetbase\Traits\HasOptionsAttributes;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;

server/src/Models/StoreLocation.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Models;
 
 use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicid;
@@ -13,6 +14,7 @@ class StoreLocation extends StorefrontModel
     use HasUuid;
     use HasPublicid;
     use HasApiModelBehavior;
+    use SpatialTrait;
 
     /**
      * The type of public Id to generate.

server/src/routes.php

@@ -39,7 +39,7 @@ function ($router) {
                 // storefront/v1/checkouts
                 $router->group(['prefix' => 'checkouts'], function () use ($router) {
                     $router->get('before', 'CheckoutController@beforeCheckout');
-                    $router->get('capture', 'CheckoutController@captureOrder');
+                    $router->post('capture', 'CheckoutController@captureOrder');
                 });
 
                 // storefront/v1/service-quotes
@@ -105,7 +105,7 @@ function ($router) {
         */
         $router->prefix(config('storefront.api.routing.internal_prefix', 'int'))->group(
             function ($router) {
-                $router->group(['prefix' => 'int/v1', 'middleware' => ['internal.cors']], function () use ($router) {
+                $router->group(['prefix' => 'v1'], function () use ($router) {
                     $router->get('networks/find/{id}', 'NetworkController@findNetwork');
                 });