@fleetbase/storefront-engine 0.3.17 → 0.3.20

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

@@ -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
@@ -598,7 +603,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: