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 PPCP

Browse Source
This commit is contained in:
David Bomba 2023-11-06 23:31:48 +11:00
parent 9212b71b8a
commit a09b8619d5
1 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
app/PaymentDrivers/PayPalPPCPPaymentDriver.php
View File

@ -196,7 +196,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver
private function checkPaymentsReceivable(): self private function checkPaymentsReceivable(): self
{ {
if($this->company_gateway->getConfigField('status') != 'active'){ if($this->company_gateway->getConfigField('status') != 'activated'){
if (class_exists(\Modules\Admin\Services\PayPal\PayPalService::class)) { if (class_exists(\Modules\Admin\Services\PayPal\PayPalService::class)) {
$pp = new \Modules\Admin\Services\PayPal\PayPalService($this->company_gateway->company, $this->company_gateway->user); $pp = new \Modules\Admin\Services\PayPal\PayPalService($this->company_gateway->company, $this->company_gateway->user);
@ -205,7 +205,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver
$this->company_gateway = $this->company_gateway->fresh(); $this->company_gateway = $this->company_gateway->fresh();
$config = $this->company_gateway->getConfig(); $config = $this->company_gateway->getConfig();
if($config->status == 'active') if($config->status == 'activated')
return $this; return $this;
} }
@ -232,6 +232,8 @@ class PayPalPPCPPaymentDriver extends BaseDriver
$data['gateway_type_id'] = $this->gateway_type_id; $data['gateway_type_id'] = $this->gateway_type_id;
$data['merchantId'] = $this->company_gateway->getConfigField('merchantId'); $data['merchantId'] = $this->company_gateway->getConfigField('merchantId');
// nlog($data['merchantId']);
return render('gateways.paypal.ppcp.pay', $data); return render('gateways.paypal.ppcp.pay', $data);
} }
@ -313,59 +315,59 @@ class PayPalPPCPPaymentDriver extends BaseDriver
})->implode("\n"); })->implode("\n");
$order = [ $order = [
"intent" => "CAPTURE",
"payer" => [ "intent" => "CAPTURE",
"name" => [ "payer" => [
"given_name" => $this->client->present()->first_name(), "name" => [
"surname" => $this->client->present()->last_name(), "given_name" => $this->client->present()->first_name(),
], "surname" => $this->client->present()->last_name(),
"email_address" => $this->client->present()->email(),
"address" => [
"address_line_1" => $this->client->address1,
"address_line_2" => $this->client->address2,
"admin_area_2" => $this->client->city,
"admin_area_1" => $this->client->state,
"postal_code" => $this->client->postal_code,
"country_code" => $this->client->country->iso_3166_2,
]
],
"purchase_units" => [
[
"description" =>ctrans('texts.invoice_number').'# '.$invoice->number,
"invoice_id" => $invoice->number,
"amount" => [
"value" => (string)$data['amount_with_fee'],
"currency_code"=> $this->client->currency()->code,
"breakdown" => [
"item_total" => [
"currency_code" => $this->client->currency()->code,
"value" => (string)$data['amount_with_fee']
]
]
],
"items"=> [
[
"name" => ctrans('texts.invoice_number').'# '.$invoice->number,
"description" => substr($description, 0, 127),
"quantity" => "1",
"unit_amount" => [
"currency_code" => $this->client->currency()->code,
"value" => (string)$data['amount_with_fee']
], ],
"email_address" => $this->client->present()->email(),
"address" => [
"address_line_1" => $this->client->address1,
"address_line_2" => $this->client->address2,
"admin_area_2" => $this->client->city,
"admin_area_1" => $this->client->state,
"postal_code" => $this->client->postal_code,
"country_code" => $this->client->country->iso_3166_2,
]
], ],
], "purchase_units" => [
] [
] "description" =>ctrans('texts.invoice_number').'# '.$invoice->number,
]; "invoice_id" => $invoice->number,
"payee" => [
$data['payee'] = [ "merchant_id" => $this->company_gateway->getConfigField('merchantId'),
"merchant_id" => $this->company_gateway->getConfigField('merchantId'), ],
[
"payment_instruction" => [ "payment_instruction" => [
"disbursement_mode" => "INSTANT", "disbursement_mode" => "INSTANT",
], ],
"amount" => [
"value" => (string)$data['amount_with_fee'],
"currency_code"=> $this->client->currency()->code,
"breakdown" => [
"item_total" => [
"currency_code" => $this->client->currency()->code,
"value" => (string)$data['amount_with_fee']
]
]
],
"items"=> [
[
"name" => ctrans('texts.invoice_number').'# '.$invoice->number,
"description" => substr($description, 0, 127),
"quantity" => "1",
"unit_amount" => [
"currency_code" => $this->client->currency()->code,
"value" => (string)$data['amount_with_fee']
],
],
],
], ],
]; ]
];
nlog($order);
$r = $this->gatewayRequest('/v2/checkout/orders', 'post', $order); $r = $this->gatewayRequest('/v2/checkout/orders', 'post', $order);