mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for ppcp
This commit is contained in:
parent
55059d1227
commit
6ca1a36ef4
@ -70,15 +70,21 @@ class PayPalPPCPPaymentDriver extends BaseDriver
|
|||||||
public function gatewayTypes(): array
|
public function gatewayTypes(): array
|
||||||
{
|
{
|
||||||
|
|
||||||
$funding_options = [];
|
// $funding_options = [];
|
||||||
|
|
||||||
foreach ($this->company_gateway->fees_and_limits as $key => $value) {
|
// foreach ($this->company_gateway->fees_and_limits as $key => $value) {
|
||||||
if ($value->is_enabled) {
|
// if ($value->is_enabled) {
|
||||||
$funding_options[] = $key;
|
// $funding_options[] = (int)$key;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
return collect($this->company_gateway->fees_and_limits)
|
||||||
|
->filter(function ($fee){
|
||||||
|
return $fee->is_enabled;
|
||||||
|
})->map(function ($fee, $key){
|
||||||
|
return (int)$key;
|
||||||
|
})->toArray();
|
||||||
|
|
||||||
return $funding_options;
|
// return $funding_options;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -209,44 +215,44 @@ class PayPalPPCPPaymentDriver extends BaseDriver
|
|||||||
public function processPaymentResponse($request)
|
public function processPaymentResponse($request)
|
||||||
{
|
{
|
||||||
|
|
||||||
// $response = json_decode($request['gateway_response'], true);
|
$response = json_decode($request['gateway_response'], true);
|
||||||
|
|
||||||
// if($response['status'] == 'COMPLETED' && isset($response['purchase_units'])) {
|
if($response['status'] == 'COMPLETED' && isset($response['purchase_units'])) {
|
||||||
|
|
||||||
// $data = [
|
$data = [
|
||||||
// 'payment_type' => PaymentType::PAYPAL,
|
'payment_type' => PaymentType::PAYPAL,
|
||||||
// 'amount' => $response['purchase_units'][0]['amount']['value'],
|
'amount' => $response['purchase_units'][0]['amount']['value'],
|
||||||
// 'transaction_reference' => $response['purchase_units'][0]['payments']['captures'][0]['id'],
|
'transaction_reference' => $response['purchase_units'][0]['payments']['captures'][0]['id'],
|
||||||
// 'gateway_type_id' => GatewayType::PAYPAL,
|
'gateway_type_id' => GatewayType::PAYPAL,
|
||||||
// ];
|
];
|
||||||
|
|
||||||
// $payment = $this->createPayment($data, \App\Models\Payment::STATUS_COMPLETED);
|
$payment = $this->createPayment($data, \App\Models\Payment::STATUS_COMPLETED);
|
||||||
|
|
||||||
// SystemLogger::dispatch(
|
SystemLogger::dispatch(
|
||||||
// ['response' => $response, 'data' => $data],
|
['response' => $response, 'data' => $data],
|
||||||
// SystemLog::CATEGORY_GATEWAY_RESPONSE,
|
SystemLog::CATEGORY_GATEWAY_RESPONSE,
|
||||||
// SystemLog::EVENT_GATEWAY_SUCCESS,
|
SystemLog::EVENT_GATEWAY_SUCCESS,
|
||||||
// SystemLog::TYPE_PAYPAL,
|
SystemLog::TYPE_PAYPAL,
|
||||||
// $this->client,
|
$this->client,
|
||||||
// $this->client->company,
|
$this->client->company,
|
||||||
// );
|
);
|
||||||
|
|
||||||
// return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
|
return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
|
||||||
|
|
||||||
// } else {
|
} else {
|
||||||
|
|
||||||
// SystemLogger::dispatch(
|
SystemLogger::dispatch(
|
||||||
// ['response' => $response],
|
['response' => $response],
|
||||||
// SystemLog::CATEGORY_GATEWAY_RESPONSE,
|
SystemLog::CATEGORY_GATEWAY_RESPONSE,
|
||||||
// SystemLog::EVENT_GATEWAY_FAILURE,
|
SystemLog::EVENT_GATEWAY_FAILURE,
|
||||||
// SystemLog::TYPE_PAYPAL,
|
SystemLog::TYPE_PAYPAL,
|
||||||
// $this->client,
|
$this->client,
|
||||||
// $this->client->company,
|
$this->client->company,
|
||||||
// );
|
);
|
||||||
|
|
||||||
|
|
||||||
// throw new PaymentFailed('Payment failed. Please try again.', 401);
|
throw new PaymentFailed('Payment failed. Please try again.', 401);
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function createOrder(array $data): string
|
private function createOrder(array $data): string
|
||||||
|
Loading…
x
Reference in New Issue
Block a user