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

Removed exception when seller ain't supporting stripe and added statement descriptor and who will pay service fees

This commit is contained in:
Prashant Singh 2019-06-22 18:29:52 +05:30
parent bddb039ce6
commit df2e63a12a
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php
View File

@ -109,7 +109,11 @@ class StripeConnectController extends Controller
$this->stripeLiveSecretKey = env('STRIPE_LIVE_SECRET_KEY');
$this->statementDescriptor = 'null';
if (config('stripe.connect.details.statementdescriptor')) {
$this->statementDescriptor = config('stripe.connect.details.statementdescriptor');
} else {
$this->statementDescriptor = env('STRIPE_STATEMENT_DESCRIPTOR');
}
}
public function collectToken()
@ -206,9 +210,9 @@ class StripeConnectController extends Controller
if ($stripeConnect->count()) {
$sellerUserId = $stripeConnect->first()->stripe_user_id;
} else {
session()->flash('error', 'Stripe unavailable for this seller');
session()->flash('warning', 'Stripe unavailable for this seller');
return false;
return redirect()->route('shop.checkout.success');
}
if($this->testMode) {
@ -218,8 +222,8 @@ class StripeConnectController extends Controller
}
$stripeCard = $this->stripeCart->findWhere([
'cart_id' => Cart::getCart()->id
])->first()->stripe_token;
'cart_id' => Cart::getCart()->id
])->first()->stripe_token;
$stripeCard = json_decode($stripeCard);
@ -243,6 +247,7 @@ class StripeConnectController extends Controller
try {
$cart = Cart::getCart();
$applicationFee = $cart->base_grand_total;
$applicationFee = (0.029 * $applicationFee) + (0.02 * $applicationFee) + 0.3;
@ -258,16 +263,29 @@ class StripeConnectController extends Controller
'stripe_account' => '{{'.$sellerUserId.'}}'
]);
} else {
$result = StripeCharge::create ([
"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'),
'application_fee_amount' => round($applicationFee, 2) * 100,
'statement_descriptor' => $this->statementDescriptor,
], [
'stripe_account' => $sellerUserId
]);
if (core()->getConfigData('stripe.connect.details.stripefees') == "seller" || core()->getConfigData('stripe.connect.details.stripefees') == null) {
$result = StripeCharge::create([
"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'),
'application_fee_amount' => round($applicationFee, 2) * 100,
'statement_descriptor' => $this->statementDescriptor,
], [
'stripe_account' => $sellerUserId
]);
} else {
$result = StripeCharge::create([
"amount" => round(Cart::getCart()->base_grand_total, 2) * 100 + round($applicationFee, 2) * 100,
"currency" => Cart::getCart()->base_currency_code,
"source" => $stripeToken,
"description" => "Purchased ".Cart::getCart()->items_count." items on ".config('app.name'),
'application_fee_amount' => round($applicationFee, 2) * 100,
'statement_descriptor' => $this->statementDescriptor,
], [
'stripe_account' => $sellerUserId
]);
}
}
} catch(\Exception $e) {

1
packages/Webkul/StripeConnect/src/Payment/Stripe.php
View File

@ -23,7 +23,6 @@ use Stripe\Error\InvalidRequest as StripeErrorInvalidRequest;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
/**
* Stripe class
*