From bf154aa2c429af34ccc393f3e89be95d75dddedb Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 15 Jan 2021 11:09:07 +0530 Subject: [PATCH 1/2] Added Case Back --- packages/Webkul/Checkout/src/Cart.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 048aca2da..f6ea7abab 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -558,6 +558,14 @@ class Cart $cart->grand_total = $cart->sub_total + $cart->tax_total - $cart->discount_amount; $cart->base_grand_total = $cart->base_sub_total + $cart->base_tax_total - $cart->base_discount_amount; + if ($shipping = $cart->selected_shipping_rate) { + $cart->grand_total = (float) $cart->grand_total + $shipping->price - $shipping->discount_amount; + $cart->base_grand_total = (float) $cart->base_grand_total + $shipping->base_price - $shipping->base_discount_amount; + + $cart->discount_amount += $shipping->discount_amount; + $cart->base_discount_amount += $shipping->base_discount_amount; + } + $cart = $this->finalizeCartTotals($cart); $quantities = 0; From 99f797c81470558b2d4fee6ca78a2a3e515870c1 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Mon, 18 Jan 2021 10:51:32 +0530 Subject: [PATCH 2/2] Manual Require Added --- .../Admin/src/Http/Controllers/Sales/InvoiceController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php index a06b3706d..8ef762ae9 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php @@ -156,7 +156,10 @@ class InvoiceController extends Controller */ private function adjustArabicAndPersianContent($html) { - $arabic = new \ArPHP\I18N\Arabic(); + /* temporary require */ + require_once base_path('vendor/khaled.alshamaa/ar-php/src/arabic.php'); + + $arabic = new \ArPHP\I18N\arabic(); $p = $arabic->arIdentify($html);