mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Adjustments for PPCP
This commit is contained in:
parent
728d013b92
commit
c1b8d676c2
@ -63,7 +63,7 @@ class NinjaMailerJob implements ShouldQueue
|
|||||||
protected $client_mailgun_domain = false;
|
protected $client_mailgun_domain = false;
|
||||||
|
|
||||||
|
|
||||||
public function __construct(public NinjaMailerObject $nmo, public bool $override = false)
|
public function __construct(public ?NinjaMailerObject $nmo, public bool $override = false)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -437,7 +437,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver
|
|||||||
|
|
||||||
|
|
||||||
if($shipping = $this->getShippingAddress()) {
|
if($shipping = $this->getShippingAddress()) {
|
||||||
$order['purchase_units'][0] = $shipping;
|
$order['purchase_units'][0]["shipping"] = $shipping;
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = $this->gatewayRequest('/v2/checkout/orders', 'post', $order);
|
$r = $this->gatewayRequest('/v2/checkout/orders', 'post', $order);
|
||||||
@ -465,7 +465,6 @@ class PayPalPPCPPaymentDriver extends BaseDriver
|
|||||||
{
|
{
|
||||||
return $this->company_gateway->require_shipping_address ?
|
return $this->company_gateway->require_shipping_address ?
|
||||||
[
|
[
|
||||||
"shipping" => [
|
|
||||||
"address" =>
|
"address" =>
|
||||||
[
|
[
|
||||||
"address_line_1" => $this->client->shipping_address1,
|
"address_line_1" => $this->client->shipping_address1,
|
||||||
@ -476,7 +475,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver
|
|||||||
"country_code" => $this->client->present()->shipping_country_code(),
|
"country_code" => $this->client->present()->shipping_country_code(),
|
||||||
],
|
],
|
||||||
]
|
]
|
||||||
]
|
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user