From c1b8d676c2eda0fa1e6703021dec87c6ce694138 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 24 Jan 2024 07:31:06 +1100 Subject: [PATCH] Adjustments for PPCP --- app/Jobs/Mail/NinjaMailerJob.php | 2 +- app/PaymentDrivers/PayPalPPCPPaymentDriver.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index 073c3aa1d1f7..b51264af116e 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -63,7 +63,7 @@ class NinjaMailerJob implements ShouldQueue 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) { } diff --git a/app/PaymentDrivers/PayPalPPCPPaymentDriver.php b/app/PaymentDrivers/PayPalPPCPPaymentDriver.php index 510a66b10db7..fd9a5c1cf2f7 100644 --- a/app/PaymentDrivers/PayPalPPCPPaymentDriver.php +++ b/app/PaymentDrivers/PayPalPPCPPaymentDriver.php @@ -437,7 +437,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver if($shipping = $this->getShippingAddress()) { - $order['purchase_units'][0] = $shipping; + $order['purchase_units'][0]["shipping"] = $shipping; } $r = $this->gatewayRequest('/v2/checkout/orders', 'post', $order); @@ -465,8 +465,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver { return $this->company_gateway->require_shipping_address ? [ - "shipping" => [ - "address" => + "address" => [ "address_line_1" => $this->client->shipping_address1, "address_line_2" => $this->client->shipping_address2, @@ -475,8 +474,8 @@ class PayPalPPCPPaymentDriver extends BaseDriver "postal_code" => $this->client->shipping_postal_code, "country_code" => $this->client->present()->shipping_country_code(), ], - ] ] + : null; }