@fleetbase/storefront-engine 0.4.5 → 0.4.6

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.4.5",
+    "version": "0.4.6",
     "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.6",
     "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.6",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",

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([
@@ -486,14 +486,14 @@ class CheckoutController extends Controller
         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',
                 '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/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

@@ -312,11 +312,11 @@ 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;
     }
 }