merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
rahul shukla 2021-01-18 16:24:09 +05:30
parent 142f04ad41 2b276acd55
commit e61d89a3d0
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php
View File

@ -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);

8
packages/Webkul/Checkout/src/Cart.php
View File

@ -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;