@fleetbase/storefront-engine 0.4.5 → 0.4.7

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.4.5",
+    "version": "0.4.7",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.4.5",
+    "version": "0.4.7",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",

package/package.json

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

package/server/config/storefront.php

@@ -43,7 +43,7 @@ return [
     |--------------------------------------------------------------------------
     */
     'throttle' => [
-        'max_attempts' => env('STOREFRONT_THROTTLE_REQUESTS_PER_MINUTE', 500),
+        'max_attempts' => env('STOREFRONT_THROTTLE_REQUESTS_PER_MINUTE', 600),
         'decay_minutes' => env('STOREFRONT_THROTTLE_DECAY_MINUTES', 1),
     ],
 ];

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

@@ -474,7 +474,7 @@ class CheckoutController extends Controller
         $invoiceAmount       = $amount;
         $invoiceCode         = $gateway->sandbox ? 'TEST_INVOICE' : $gateway->config?->invoice_id ?? null;
         $invoiceDescription  = $about->name . ' cart checkout';
-        $invoiceReceiverCode = $checkout->public_id;
+        $invoiceReceiverCode = 'CITIZEN';
         $senderInvoiceNo     = $checkout->public_id;
         $districtCode        = $gateway->config?->district_code ?? null;
         $invoiceReceiverData = Utils::filterArray([
@@ -482,18 +482,18 @@ class CheckoutController extends Controller
             'email'    => $customer->email ?? null,
             'phone'    => $customer->phone ?? null,
         ]);
-        $lines = [];
+        $lines = QPay::createQpayInitialLines($cart, $serviceQuote, $checkoutOptions);
         foreach ($cart->items as $item) {
             $lines[] = [
                 'line_description'    => $item->name,
-                'line_quantity'       => $item->quantity ?? 1,
+                'line_quantity'       => number_format($item->quantity ?? 1, 2, '.', ''),
                 'line_unit_price'     => number_format($item->price, 2, '.', ''),
                 'note'                => $checkout->public_id,
-                'classification_code' => '0111100',
+                'classification_code' => '6511100',
                 'taxes'               => [
                     [
-                        // 'tax_code'    => 'VAT', // only works without this
-                        'description' => 'НӨАТ',
+                        'tax_code'    => 'VAT',
+                        'description' => 'VAT',
                         'amount'      => QPay::calculateTax($item->subtotal),
                         'note'        => $checkout->public_id,
                     ],

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

@@ -139,23 +139,29 @@ class CustomerController extends Controller
         $customer = new Contact($attributes);
         $meta     = ['identity' => $identity];
 
-        if ($isEmail) {
-            VerificationCode::generateEmailVerificationFor($customer, 'storefront_create_customer', [
-                'messageCallback' => function ($verification) use ($about) {
-                    return "Your {$about->name} verification code is {$verification->code}";
-                },
-                'meta' => $meta,
-            ]);
-        } else {
-            VerificationCode::generateSmsVerificationFor($customer, 'storefront_create_customer', [
-                'messageCallback' => function ($verification) use ($about) {
-                    return "Your {$about->name} verification code is {$verification->code}";
-                },
-                'meta' => $meta,
-            ]);
-        }
+        try {
+            if ($isEmail) {
+                VerificationCode::generateEmailVerificationFor($customer, 'storefront_create_customer', [
+                    'messageCallback' => function ($verification) use ($about) {
+                        return "Your {$about->name} verification code is {$verification->code}";
+                    },
+                    'meta' => $meta,
+                ]);
+            } else {
+                VerificationCode::generateSmsVerificationFor($customer, 'storefront_create_customer', [
+                    'messageCallback' => function ($verification) use ($about) {
+                        return "Your {$about->name} verification code is {$verification->code}";
+                    },
+                    'meta' => $meta,
+                ]);
+            }
 
-        return response()->json(['status' => 'ok']);
+            return response()->json(['status' => 'ok']);
+        } catch (\Exception $e) {
+            return response()->apiError(app()->hasDebugModeEnabled() ? $e->getMessage() : 'Error sending verification code.');
+        } catch (\Twilio\Exceptions\RestException $e) {
+            return response()->apiError($e->getMessage());
+        }
     }
 
     /**

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

@@ -157,8 +157,16 @@ class OrderController extends Controller
             return $ebarimt; // Return error response if creation failed
         }
 
+        // get ebarimt qr data
+        $qrData = data_get($ebarimt, 'ebarimt_qr_data');
+        if (!empty($qrData)) {
+            $order->updateMeta('ebarimt_qr_data', $qrData);
+        }
+
         // Store receipt in order metadata
-        $order->updateMeta('ebarimt', $ebarimt);
+        if ($order->doesntHaveMeta('ebarimt')) {
+            $order->updateMeta('ebarimt', $ebarimt);
+        }
 
         return response()->json($ebarimt);
     }

package/server/src/Models/FoodTruck.php

@@ -83,7 +83,7 @@ class FoodTruck extends StorefrontModel
      */
     public function vehicle(): BelongsTo
     {
-        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Vehicle::class, 'vehicle_uuid', 'uuid');
+        return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Vehicle::class, 'vehicle_uuid', 'uuid')->withTrashed();
     }
 
     /**

package/server/src/Support/QPay.php

@@ -2,7 +2,10 @@
 
 namespace Fleetbase\Storefront\Support;
 
+use Fleetbase\FleetOps\Models\ServiceQuote;
+use Fleetbase\Storefront\Models\Cart;
 use Fleetbase\Storefront\Models\Checkout;
+use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Support\Utils;
 use GuzzleHttp\Client;
 use Illuminate\Support\Str;
@@ -312,11 +315,84 @@ class QPay
         ];
     }
 
-    public static function calculateTax($amount): string
+    public static function calculateTax($amount): float
     {
-        $result = ((float) $amount / 1.1) * 0.10;
-        $result = floor($result * 100) / 100;
+        $result    = ((float) $amount / 1.1) * 0.10;
+        $truncated = floor($result * 10000) / 10000;
 
-        return number_format($result, 2, '.', '');
+        return $truncated;
+    }
+
+    public static function createQpayInitialLines(Cart $cart, ?ServiceQuote $serviceQuote, $checkoutOptions): array
+    {
+        // Prepare dependencies
+        $checkoutOptions = (object) $checkoutOptions;
+        $subtotal        = (int) $cart->subtotal;
+        $total           = $subtotal;
+        $tip             = $checkoutOptions->tip ?? false;
+        $deliveryTip     = $checkoutOptions->delivery_tip ?? false;
+        $isPickup        = $checkoutOptions->is_pickup ?? false;
+
+        // Initialize lines
+        $lines = [];
+
+        if ($tip) {
+            $tipAmount = Storefront::calculateTipAmount($tip, $subtotal);
+            $lines[]   = [
+                'line_description'    => 'Tip',
+                'line_quantity'       => number_format(1, 2, '.', ''),
+                'line_unit_price'     => number_format($tipAmount, 2, '.', ''),
+                'note'                => 'Tip',
+                'classification_code' => '6511100',
+                'taxes'               => [
+                    [
+                        'tax_code'    => 'VAT',
+                        'description' => 'VAT',
+                        'amount'      => QPay::calculateTax($tipAmount),
+                        'note'        => 'Tip',
+                    ],
+                ],
+            ];
+        }
+
+        if ($deliveryTip && !$isPickup) {
+            $deliveryTipAmount = Storefront::calculateTipAmount($deliveryTip, $subtotal);
+            $lines[]           = [
+                'line_description'    => 'Delivery Tip',
+                'line_quantity'       => number_format(1, 2, '.', ''),
+                'line_unit_price'     => number_format($deliveryTipAmount, 2, '.', ''),
+                'note'                => 'Delivery Tip',
+                'classification_code' => '6511100',
+                'taxes'               => [
+                    [
+                        'tax_code'    => 'VAT',
+                        'description' => 'VAT',
+                        'amount'      => QPay::calculateTax($deliveryTipAmount),
+                        'note'        => 'Delivery Tip',
+                    ],
+                ],
+            ];
+        }
+
+        if (!$isPickup) {
+            $serviceQuoteAmount = Utils::numbersOnly($serviceQuote->amount);
+            $lines[]            = [
+                'line_description'    => 'Delivery Fee',
+                'line_quantity'       => number_format(1, 2, '.', ''),
+                'line_unit_price'     => number_format($serviceQuoteAmount, 2, '.', ''),
+                'note'                => 'Delivery Fee',
+                'classification_code' => '6511100',
+                'taxes'               => [
+                    [
+                        'tax_code'    => 'VAT',
+                        'description' => 'VAT',
+                        'amount'      => QPay::calculateTax($serviceQuoteAmount),
+                        'note'        => 'Delivery Fee',
+                    ],
+                ],
+            ];
+        }
+
+        return $lines;
     }
 }

package/server/src/Support/Storefront.php

@@ -21,6 +21,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 use Laravel\Sanctum\PersonalAccessToken;
 
@@ -729,4 +730,17 @@ class Storefront
 
         return null;
     }
+
+    public static function calculateTipAmount($tip, $subtotal)
+    {
+        $tipAmount = 0;
+
+        if (is_string($tip) && Str::endsWith($tip, '%')) {
+            $tipAmount = Utils::calculatePercentage(Utils::numbersOnly($tip), $subtotal);
+        } else {
+            $tipAmount = Utils::numbersOnly($tip);
+        }
+
+        return $tipAmount;
+    }
 }