From b688aaf3210cf054b2048ce4ec33471f05792a67 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Mon, 16 Nov 2020 20:42:37 +0530 Subject: [PATCH] Formatted Price According To Translation --- .../Webkul/API/Http/Controllers/Shop/CheckoutController.php | 2 +- packages/Webkul/Shop/src/Http/Controllers/OnepageController.php | 2 +- .../Shop/src/Resources/views/checkout/cart/index.blade.php | 2 +- .../Shop/src/Resources/views/checkout/cart/mini-cart.blade.php | 2 +- .../src/Resources/views/shop/checkout/cart/mini-cart.blade.php | 2 +- .../src/Resources/views/shop/checkout/total/summary.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php b/packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php index 79c077e4f..d2bb5ac7a 100644 --- a/packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php +++ b/packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php @@ -174,7 +174,7 @@ class CheckoutController extends Controller return response()->json([ 'status' => ! $status ? false : true, - 'message' => ! $status ? trans('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) : 'Success', + 'message' => ! $status ? trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) : 'Success', 'data' => [ 'cart' => new CartResource($cart), ] diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 40c320433..aa4349cd8 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -231,7 +231,7 @@ class OnepageController extends Controller $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; if (! $cart->checkMinimumOrder()) { - throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount])); + throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); } if ($cart->haveStockableItems() && ! $cart->shipping_address) { diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index c02b87872..d44caa83c 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -139,7 +139,7 @@ add-class="btn btn-lg btn-primary" text="{{ __('shop::app.checkout.cart.proceed-to-checkout') }}" is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}" - minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}"> + minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}"> @endif diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php index 68e69eeb3..4477af9b0 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -97,7 +97,7 @@ add-class="btn btn-primary btn-lg" text="{{ __('shop::app.minicart.checkout') }}" is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}" - minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}" + minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}" style="color: white;"> diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php index a56720004..d54876e62 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php @@ -10,6 +10,6 @@ checkout-url="{{ route('shop.checkout.onepage.index') }}" subtotal-text="{{ __('shop::app.checkout.cart.cart-subtotal') }}" is-minimum-order-completed="{{ Cart::checkMinimumOrder() }}" - minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}"> + minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}"> \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php index 767aed680..50fb7be86 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php @@ -54,7 +54,7 @@ add-class="theme-btn text-uppercase col-12 remove-decoration fw6 text-center" text="{{ __('velocity::app.checkout.proceed') }}" is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}" - minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}"> + minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}"> \ No newline at end of file