Merge pull request bagisto#10139 from bagisto/2.2

feat: 2.2 updates
mathsolutions · Sep 30, 2024 · 179c23f · 179c23f
2 parents 6462792 + 208c9bc
commit 179c23f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -47,7 +47,7 @@
         "spatie/laravel-sitemap": "^6.2"
     },
     "require-dev": {
-        "bagisto/laravel-datafaker": "dev-master",
+        "bagisto/laravel-datafaker": "^2.2.0",
         "barryvdh/laravel-debugbar": "^3.8",
         "fakerphp/faker": "^1.9.1",
         "laravel/pint": "^1.8",

diff --git a/composer.lock b/composer.lock
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -312,7 +312,7 @@ class="relative h-[60px] max-h-[60px] w-full max-w-[60px] rounded"
                         <div class="flex flex-col gap-y-1.5">
                             @if (core()->getConfigData('sales.taxes.sales.display_subtotal') == 'including_tax')
                                 <p class="font-semibold !leading-5 text-gray-600 dark:text-gray-300">
-                                    {{ core()->formatBasePrice($order->base_sub_total) }}
+                                    {{ core()->formatBasePrice($order->base_sub_total_incl_tax) }}
                                 </p>
                             @elseif (core()->getConfigData('sales.taxes.sales.display_subtotal') == 'both')
                                 <p class="font-semibold !leading-5 text-gray-600 dark:text-gray-300">