- @lang('admin::app.sales.invoices.view.sub-total-summary')
-
+ @if (core()->getConfigData('sales.taxes.sales.display_subtotal') == 'both')
+
+ @lang('admin::app.sales.invoices.view.sub-total-summary-excl-tax')
+
+ @lang('admin::app.sales.invoices.view.sub-total-summary-incl-tax')
+
+ @lang('admin::app.sales.invoices.view.sub-total-summary')
+
- @lang('admin::app.sales.invoices.view.shipping-and-handling')
-
+ @if (core()->getConfigData('sales.taxes.sales.display_shipping_amount') == 'both')
+
+ @lang('admin::app.sales.invoices.view.shipping-and-handling-excl-tax')
+
+ @lang('admin::app.sales.invoices.view.shipping-and-handling-incl-tax')
+
+ @lang('admin::app.sales.invoices.view.shipping-and-handling')
+
@lang('admin::app.sales.invoices.view.summary-tax')
-
+
@if ($invoice->base_discount_amount > 0)
@lang('admin::app.sales.invoices.view.summary-discount')
@@ -239,14 +287,42 @@ class="relative h-[60px] max-h-[60px] w-full max-w-[60px] rounded"
-
- {{ core()->formatBasePrice($invoice->base_sub_total) }}
-
+ @if (core()->getConfigData('sales.taxes.sales.display_subtotal') == 'including_tax')
+
+ {{ core()->formatBasePrice($invoice->base_sub_total_incl_tax) }}
+
+ @elseif (core()->getConfigData('sales.taxes.sales.display_subtotal') == 'both')
+
+ {{ core()->formatBasePrice($invoice->base_sub_total) }}
+
+
+
+ {{ core()->formatBasePrice($invoice->base_sub_total_incl_tax) }}
+
+ @else
+
+ {{ core()->formatBasePrice($invoice->base_sub_total) }}
+
+ @endif
-
- {{ core()->formatBasePrice($invoice->base_shipping_amount) }}
-
+ @if (core()->getConfigData('sales.taxes.sales.display_shipping_amount') == 'including_tax')
+
+ {{ core()->formatBasePrice($invoice->base_shipping_amount_incl_tax) }}
+
+ @elseif (core()->getConfigData('sales.taxes.sales.display_shipping_amount') == 'both')
+
+ {{ core()->formatBasePrice($invoice->base_shipping_amount) }}
+
+
+
+ {{ core()->formatBasePrice($invoice->base_shipping_amount_incl_tax) }}
+
+ @else
+
+ {{ core()->formatBasePrice($invoice->base_shipping_amount) }}
+
+ @endif
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart-items.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart-items.blade.php
index 8c2a25fe757..895637c4170 100644
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart-items.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart-items.blade.php
@@ -70,8 +70,24 @@ class="relative h-[60px] max-h-[60px] w-full max-w-[60px] overflow-hidden rounde
-
- @{{ item.formatted_price }}
+
+
+ @{{ item.formatted_price_incl_tax }}
+
+
+
+ @{{ item.formatted_price_incl_tax }}
+
+
+ @lang('admin::app.sales.orders.create.cart-items.excl-tax')
+
+ @{{ item.formatted_price }}
+
+
+
+
+ @{{ item.formatted_price }}
+
@@ -159,9 +175,15 @@ class="grid justify-center justify-items-center gap-3.5 px-2.5 py-10"
data() {
return {
- isLoading: false,
+ displayTax: {
+ prices: "{{ core()->getConfigData('sales.taxes.shopping_cart.display_prices') }}",
+
+ subtotal: "{{ core()->getConfigData('sales.taxes.shopping_cart.display_subtotal') }}",
+ },
items: [],
+
+ isLoading: false,
};
},
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart/items.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart/items.blade.php
index df595efebb7..06a1ae47640 100644
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart/items.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart/items.blade.php
@@ -34,8 +34,24 @@ class="h-5 w-5 animate-spin"
-
- @{{ "@lang('admin::app.sales.orders.create.cart.items.sub-total', ['sub_total' => 'replace'])".replace('replace', cart.formatted_sub_total) }}
+
+
+ @{{ "@lang('admin::app.sales.orders.create.cart.items.sub-total', ['sub_total' => 'replace'])".replace('replace', cart.formatted_sub_total_incl_tax) }}
+
+
+
+ @{{ "@lang('admin::app.sales.orders.create.cart.items.sub-total', ['sub_total' => 'replace'])".replace('replace', cart.formatted_sub_total_incl_tax) }}
+
+
+ @lang('admin::app.sales.orders.create.cart.items.excl-tax')
+
+ @{{ cart.formatted_sub_total }}
+
+
+
+
+ @{{ "@lang('admin::app.sales.orders.create.cart.items.sub-total', ['sub_total' => 'replace'])".replace('replace', cart.formatted_sub_total) }}
+
@@ -136,8 +152,26 @@ class="grid w-full gap-2"
@@ -426,10 +435,27 @@ class="max-h-[50px] min-w-[50px] cursor-pointer rounded-xl"
template: '#v-product-review-item-template',
props: ['review'],
-
+
data() {
return {
isLoading: false,
+
+ isImageZooming: false,
+
+ activeIndex: 0,
+ }
+ },
+
+ computed: {
+ attachments() {
+ let data = [...this.review.images].map((file) => {
+ return {
+ url: file.url,
+ type: file.type,
+ }
+ });
+
+ return data;
}
},
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/types/configurable.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/types/configurable.blade.php
index 612a407b71f..1473970ba27 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view/types/configurable.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/types/configurable.blade.php
@@ -473,7 +473,7 @@ class="text-sm text-gray-600 max-sm:text-xs"
});
if (galleryImages.length) {
- this.$parent.$parent.$refs.gallery.media.images = { ...galleryImages };
+ this.$parent.$parent.$refs.gallery.media.images = [...galleryImages];
}
this.$emitter.emit('configurable-variant-update-images-event', galleryImages);
diff --git a/packages/Webkul/Shop/src/Resources/views/search/images/results.blade.php b/packages/Webkul/Shop/src/Resources/views/search/images/results.blade.php
index c1a6aa929c8..5659c8eefbf 100644
--- a/packages/Webkul/Shop/src/Resources/views/search/images/results.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/search/images/results.blade.php
@@ -2,7 +2,7 @@