diff --git a/packages/Webkul/CustomerDocument/src/Repositories/CustomerDocumentRepository.php b/packages/Webkul/CustomerDocument/src/Repositories/CustomerDocumentRepository.php index c13c40162..892f5ab36 100644 --- a/packages/Webkul/CustomerDocument/src/Repositories/CustomerDocumentRepository.php +++ b/packages/Webkul/CustomerDocument/src/Repositories/CustomerDocumentRepository.php @@ -34,6 +34,5 @@ class CustomerDocumentRepository extends Repository ->whereIn('customer_id', [$id, 0]) ->where('status', '1') ->get(); - } } \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php index b584554f3..9303f0b27 100644 --- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php +++ b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php @@ -56,7 +56,7 @@
- @{{ errors.first('description') }} diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php index e483d586c..f91e8a394 100644 --- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php +++ b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php @@ -58,10 +58,8 @@
- + @{{ errors.first('description') }}
@@ -102,4 +100,4 @@
-@stop \ No newline at end of file +@stop diff --git a/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php b/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php index 0602bd90a..a1fc2a723 100644 --- a/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php +++ b/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php @@ -248,12 +248,12 @@ class StripeConnectController extends Controller try { $cart = Cart::getCart(); - if(Cart::getCart()->base_currency_code == 'YEN' ||Cart::getCart()->base_currency_code == 'yen') { + if($cart->base_currency_code == 'YEN' ||$cart->base_currency_code == 'yen') { $result = StripeCharge::create ([ - "amount" => Cart::getCart()->base_grand_total, - "currency" => Cart::getCart()->base_currency_code, + "amount" => $cart->base_grand_total, + "currency" => $cart->base_currency_code, "source" => $stripeToken, - "description" => "Purchased ".Cart::getCart()->items_count." items on ".config('app.name'), + "description" => "Purchased ".$cart->items_count." items on ".config('app.name'), 'application_fee_amount' => $applicationFee * 100, 'statement_descriptor' => $this->statementDescriptor, ], [ @@ -265,10 +265,10 @@ class StripeConnectController extends Controller $applicationFee = (0.029 * $applicationFee) + (0.02 * $applicationFee) + 0.3; $result = StripeCharge::create([ - "amount" => round(Cart::getCart()->base_grand_total, 2) * 100, - "currency" => Cart::getCart()->base_currency_code, + "amount" => round($cart->base_grand_total, 2) * 100, + "currency" => $cart->base_currency_code, "source" => $stripeToken, - "description" => "Purchased ".Cart::getCart()->items_count." items on ".config('app.name'), + "description" => "Purchased ".$cart->items_count." items on ".config('app.name'), 'application_fee_amount' => round($applicationFee, 2) * 100, 'statement_descriptor' => $this->statementDescriptor, ], [ @@ -279,8 +279,13 @@ class StripeConnectController extends Controller $applicationFee = (0.029 * $applicationFee) + (0.02 * $applicationFee) + 0.3; $applicationFee1 = 0.02 * ($applicationFee + $cart->base_grand_total12); + $cart->update([ + 'base_grand_total' => $cart->grand_total + $applicationFee, + 'grand_total' => $cart->base_grand_total + ]); + $result = StripeCharge::create([ - "amount" => round(Cart::getCart()->base_grand_total, 2) * 100 + round($applicationFee, 2) * 100, + "amount" => round(Cart::getCart()->base_grand_total, 2) * 100, "currency" => Cart::getCart()->base_currency_code, "source" => $stripeToken, "description" => "Purchased ".Cart::getCart()->items_count." items on ".config('app.name'),