Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for disabled client portal payments

Browse Source
This commit is contained in:
David Bomba 2024-09-05 13:22:55 +10:00
parent 500f289647
commit c74fac68f4
9 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Models/Client.php
View File

@ -675,6 +675,20 @@ class Client extends BaseModel implements HasLocalePreference
} }
if (in_array($this->currency()->code, ['GBP']) && in_array(GatewayType::BACS, array_column($pms, 'gateway_type_id'))) {
// if ($this->currency()->code == 'CAD' && in_array(GatewayType::ACSS, array_column($pms, 'gateway_type_id'))) {
foreach ($pms as $pm) {
if ($pm['gateway_type_id'] == GatewayType::BACS) {
$cg = CompanyGateway::query()->find($pm['company_gateway_id']);
if ($cg && $cg->fees_and_limits->{GatewayType::BACS}->is_enabled) {
return $cg;
}
}
}
}
return null; return null;
} }

9
app/PaymentDrivers/Stripe/Bancontact.php
View File

@ -70,8 +70,8 @@ class Bancontact implements LivewireMethodInterface
/* @todo: https://github.com/invoiceninja/invoiceninja/pull/3789/files#r436175798 */ /* @todo: https://github.com/invoiceninja/invoiceninja/pull/3789/files#r436175798 */
//catch duplicate submissions. //catch duplicate submissions.
if (Payment::where('transaction_reference', $payment_intent)->exists()) { if ($payment = Payment::query()->where('transaction_reference', $payment_intent)->first()) {
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
$this->stripe->init(); $this->stripe->init();
@ -84,7 +84,7 @@ class Bancontact implements LivewireMethodInterface
'gateway_type_id' => GatewayType::BANCONTACT, 'gateway_type_id' => GatewayType::BANCONTACT,
]; ];
$this->stripe->createPayment($data, Payment::STATUS_PENDING); $payment = $this->stripe->createPayment($data, Payment::STATUS_PENDING);
SystemLogger::dispatch( SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data], ['response' => $this->stripe->payment_hash->data, 'data' => $data],
@ -95,7 +95,8 @@ class Bancontact implements LivewireMethodInterface
$this->stripe->client->company, $this->stripe->client->company,
); );
return redirect()->route('client.payments.index');
return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
public function processUnsuccessfulPayment() public function processUnsuccessfulPayment()

10
app/PaymentDrivers/Stripe/EPS.php
View File

@ -71,8 +71,9 @@ class EPS implements LivewireMethodInterface
$this->stripe->init(); $this->stripe->init();
//catch duplicate submissions. //catch duplicate submissions.
if (Payment::where('transaction_reference', $payment_intent)->exists()) { if ($payment = Payment::query()->where('transaction_reference', $payment_intent)->first()) {
return redirect()->route('client.payments.index');
return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
$data = [ $data = [
@ -83,7 +84,7 @@ class EPS implements LivewireMethodInterface
'gateway_type_id' => GatewayType::EPS, 'gateway_type_id' => GatewayType::EPS,
]; ];
$this->stripe->createPayment($data, Payment::STATUS_PENDING); $payment = $this->stripe->createPayment($data, Payment::STATUS_PENDING);
SystemLogger::dispatch( SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data], ['response' => $this->stripe->payment_hash->data, 'data' => $data],
@ -94,7 +95,8 @@ class EPS implements LivewireMethodInterface
$this->stripe->client->company, $this->stripe->client->company,
); );
return redirect()->route('client.payments.index');
return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
public function processUnsuccessfulPayment() public function processUnsuccessfulPayment()

5
app/PaymentDrivers/Stripe/FPX.php
View File

@ -79,7 +79,7 @@ class FPX implements LivewireMethodInterface
'gateway_type_id' => GatewayType::FPX, 'gateway_type_id' => GatewayType::FPX,
]; ];
$this->stripe->createPayment($data, Payment::STATUS_PENDING); $payment = $this->stripe->createPayment($data, Payment::STATUS_PENDING);
SystemLogger::dispatch( SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data], ['response' => $this->stripe->payment_hash->data, 'data' => $data],
@ -90,7 +90,8 @@ class FPX implements LivewireMethodInterface
$this->stripe->client->company, $this->stripe->client->company,
); );
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
public function processUnsuccessfulPayment() public function processUnsuccessfulPayment()

10
app/PaymentDrivers/Stripe/GIROPAY.php
View File

@ -71,8 +71,8 @@ class GIROPAY implements LivewireMethodInterface
$this->stripe->init(); $this->stripe->init();
//catch duplicate submissions. //catch duplicate submissions.
if (Payment::where('transaction_reference', $payment_intent)->exists()) { if ($payment = Payment::query()->where('transaction_reference', $payment_intent)->first()) {
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
$data = [ $data = [
@ -83,7 +83,7 @@ class GIROPAY implements LivewireMethodInterface
'gateway_type_id' => GatewayType::GIROPAY, 'gateway_type_id' => GatewayType::GIROPAY,
]; ];
$this->stripe->createPayment($data, Payment::STATUS_PENDING); $payment = $this->stripe->createPayment($data, Payment::STATUS_PENDING);
SystemLogger::dispatch( SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data], ['response' => $this->stripe->payment_hash->data, 'data' => $data],
@ -94,7 +94,7 @@ class GIROPAY implements LivewireMethodInterface
$this->stripe->client->company, $this->stripe->client->company,
); );
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
public function processUnsuccessfulPayment() public function processUnsuccessfulPayment()
@ -153,6 +153,6 @@ class GIROPAY implements LivewireMethodInterface
public function livewirePaymentView(array $data): string public function livewirePaymentView(array $data): string
{ {
return 'gateways.giropay.pay_livewire'; return 'gateways.stripe.giropay.pay_livewire';
} }
} }

10
app/PaymentDrivers/Stripe/Klarna.php
View File

@ -69,8 +69,10 @@ class Klarna implements LivewireMethodInterface
$this->stripe->init(); $this->stripe->init();
//catch duplicate submissions. //catch duplicate submissions.
if (Payment::where('transaction_reference', $payment_intent)->exists()) { if ($pay_exists = Payment::query()->where('transaction_reference', $payment_intent)->first()) {
return redirect()->route('client.payments.index');
return redirect()->route('client.payments.show', ['payment' => $pay_exists->hashed_id]);
} }
$data = [ $data = [
@ -81,7 +83,7 @@ class Klarna implements LivewireMethodInterface
'gateway_type_id' => GatewayType::KLARNA, 'gateway_type_id' => GatewayType::KLARNA,
]; ];
$this->stripe->createPayment($data, Payment::STATUS_PENDING); $payment = $this->stripe->createPayment($data, Payment::STATUS_PENDING);
SystemLogger::dispatch( SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data], ['response' => $this->stripe->payment_hash->data, 'data' => $data],
@ -92,7 +94,7 @@ class Klarna implements LivewireMethodInterface
$this->stripe->client->company, $this->stripe->client->company,
); );
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
public function processUnsuccessfulPayment() public function processUnsuccessfulPayment()

9
app/PaymentDrivers/Stripe/PRZELEWY24.php
View File

@ -71,8 +71,8 @@ class PRZELEWY24 implements LivewireMethodInterface
$this->stripe->init(); $this->stripe->init();
//catch duplicate submissions. //catch duplicate submissions.
if (Payment::where('transaction_reference', $payment_intent)->exists()) { if ($pay_exists = Payment::query()->where('transaction_reference', $payment_intent)->first()) {
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $pay_exists->hashed_id]);
} }
$data = [ $data = [
@ -83,7 +83,7 @@ class PRZELEWY24 implements LivewireMethodInterface
'gateway_type_id' => GatewayType::PRZELEWY24, 'gateway_type_id' => GatewayType::PRZELEWY24,
]; ];
$this->stripe->createPayment($data, Payment::STATUS_PENDING); $payment = $this->stripe->createPayment($data, Payment::STATUS_PENDING);
SystemLogger::dispatch( SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data], ['response' => $this->stripe->payment_hash->data, 'data' => $data],
@ -94,7 +94,8 @@ class PRZELEWY24 implements LivewireMethodInterface
$this->stripe->client->company, $this->stripe->client->company,
); );
return redirect()->route('client.payments.index');
return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
public function processUnsuccessfulPayment() public function processUnsuccessfulPayment()

4
app/PaymentDrivers/Stripe/SOFORT.php
View File

@ -79,7 +79,7 @@ class SOFORT implements LivewireMethodInterface
'gateway_type_id' => GatewayType::SOFORT, 'gateway_type_id' => GatewayType::SOFORT,
]; ];
$this->stripe->createPayment($data, Payment::STATUS_PENDING); $payment = $this->stripe->createPayment($data, Payment::STATUS_PENDING);
SystemLogger::dispatch( SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data], ['response' => $this->stripe->payment_hash->data, 'data' => $data],
@ -90,7 +90,7 @@ class SOFORT implements LivewireMethodInterface
$this->stripe->client->company, $this->stripe->client->company,
); );
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
public function processUnsuccessfulPayment() public function processUnsuccessfulPayment()

8
app/PaymentDrivers/Stripe/iDeal.php
View File

@ -71,8 +71,8 @@ class iDeal implements LivewireMethodInterface
$this->stripe->init(); $this->stripe->init();
//catch duplicate submissions. //catch duplicate submissions.
if (Payment::where('transaction_reference', $payment_intent)->exists()) { if ($pay_exists = Payment::query()->where('transaction_reference', $payment_intent)->first()) {
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $pay_exists->hashed_id]);
} }
$data = [ $data = [
@ -83,7 +83,7 @@ class iDeal implements LivewireMethodInterface
'gateway_type_id' => GatewayType::IDEAL, 'gateway_type_id' => GatewayType::IDEAL,
]; ];
$this->stripe->createPayment($data, Payment::STATUS_COMPLETED); $payment = $this->stripe->createPayment($data, Payment::STATUS_COMPLETED);
SystemLogger::dispatch( SystemLogger::dispatch(
['response' => $this->stripe->payment_hash->data, 'data' => $data], ['response' => $this->stripe->payment_hash->data, 'data' => $data],
@ -94,7 +94,7 @@ class iDeal implements LivewireMethodInterface
$this->stripe->client->company, $this->stripe->client->company,
); );
return redirect()->route('client.payments.index'); return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
} }
public function processUnsuccessfulPayment() public function processUnsuccessfulPayment()