Skip to content

Affirm Payment: Correct Country Code Handling for Canadian Transactions #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhruv-8601 wants to merge 1 commit into
base: master
Choose a base branch
from
+67 −6
Open

Affirm Payment: Correct Country Code Handling for Canadian Transactions #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Gateway/Request/AuthorizationRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@
*/
class AuthorizationRequest extends AbstractDataBuilder
{

public function getCountryCodeByCurrency($currencyCode)
{
$currency_map = array(
"USD" => 'USA',
"CAD" => 'CAN'
);
return $currency_map[$currencyCode];
}

/**
* Builds ENV request
*
Expand All @@ -43,7 +53,10 @@ public function build(array $buildSubject)
$paymentDataObject = $buildSubject['payment'];
$payment = $paymentDataObject->getPayment();
$token = $payment->getAdditionalInformation(self::CHECKOUT_TOKEN);
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
$order = $payment->getOrder();
$currencyCodeFromOrder = $order->getOrderCurrencyCode();
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: ($this->getCountryCodeByCurrency($currencyCodeFromOrder) ?? self::DEFAULT_COUNTRY_CODE);

return [
'body' => [
self::TRANSACTION_ID => $token
Expand Down
14 changes: 13 additions & 1 deletion Gateway/Request/CaptureRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@
*/
class CaptureRequest extends AbstractDataBuilder
{

public function getCountryCodeByCurrency($currencyCode)
{
$currency_map = array(
"USD" => 'USA',
"CAD" => 'CAN'
);
return $currency_map[$currencyCode];
}

/**
* Builds ENV request
*
Expand All @@ -45,8 +55,10 @@ public function build(array $buildSubject)
$payment = $paymentDataObject->getPayment();
$transactionId = $payment->getAdditionalInformation(self::TRANSACTION_ID) ?:
$payment->getAdditionalInformation(self::CHARGE_ID);
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;

$order = $payment->getOrder();
$currencyCodeFromOrder = $order->getOrderCurrencyCode();
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: ( $this->getCountryCodeByCurrency($currencyCodeFromOrder) ?? self::DEFAULT_COUNTRY_CODE );
$storeId = isset($order) ? $order->getStoreId() : $this->_storeManager->getStore()->getId();
if (!$storeId) {
$storeId = null;
Expand Down
16 changes: 15 additions & 1 deletion Gateway/Request/PreAuthorizationRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;


/**
* Class PreAuthorizationRequest
*/
Expand All @@ -30,6 +31,15 @@ class PreAuthorizationRequest extends AbstractDataBuilder
*/
const GET = 'GET';

public function getCountryCodeByCurrency($currencyCode)
{
$currency_map = array(
"USD" => 'USA',
"CAD" => 'CAN'
);
return $currency_map[$currencyCode];
}

/**
* Builds ENV request
*
Expand All @@ -47,8 +57,12 @@ public function build(array $buildSubject)

$paymentDataObject = $buildSubject['payment'];
$payment = $paymentDataObject->getPayment();
$billingAddress = $paymentDataObject->getOrder()->getBillingAddress();
$token = $payment->getAdditionalInformation(self::CHECKOUT_TOKEN);
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
$order = $payment->getOrder();
$currencyCodeFromOrder = $order->getOrderCurrencyCode();
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: ($this->getCountryCodeByCurrency($currencyCodeFromOrder) ?? self::DEFAULT_COUNTRY_CODE);

return [
'body' => '',
'path' => $token,
Expand Down
15 changes: 13 additions & 2 deletions Gateway/Request/RefundRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@
*/
class RefundRequest extends AbstractDataBuilder
{

public function getCountryCodeByCurrency($currencyCode)
{
$currency_map = array(
"USD" => 'USA',
"CAD" => 'CAN'
);
return $currency_map[$currencyCode];
}

/**
* Builds ENV request
*
Expand All @@ -46,13 +56,14 @@ public function build(array $buildSubject)
$payment = $paymentDataObject->getPayment();
$transactionId = $payment->getAdditionalInformation(self::TRANSACTION_ID) ?:
$payment->getAdditionalInformation(self::CHARGE_ID);
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
$order = $payment->getOrder();
$currencyCodeFromOrder = $order->getOrderCurrencyCode();
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: ( $this->getCountryCodeByCurrency($currencyCodeFromOrder) ?? self::DEFAULT_COUNTRY_CODE );
$creditMemoAmount = $payment->getCreditmemo()->getGrandTotal();
$payment->setAdditionalInformation(self::LAST_INVOICE_AMOUNT, $creditMemoAmount);
$random = new Random();
$util = new Util($random);
$amountInCents = $util->formatToCents($creditMemoAmount);
$order = $payment->getOrder();
$storeId = null;
if($order) {
$storeId = $order->getStoreId();
Expand Down
13 changes: 12 additions & 1 deletion Gateway/Request/VoidRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@
*/
class VoidRequest extends AbstractDataBuilder
{

public function getCountryCodeByCurrency($currencyCode)
{
$currency_map = array(
"USD" => 'USA',
"CAD" => 'CAN'
);
return $currency_map[$currencyCode];
}

/**
* Builds ENV request
*
Expand All @@ -44,8 +54,9 @@ public function build(array $buildSubject)
$payment = $paymentDataObject->getPayment();
$transactionId = $payment->getAdditionalInformation(self::TRANSACTION_ID) ?:
$payment->getAdditionalInformation(self::CHARGE_ID);
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
$order = $payment->getOrder();
$currencyCodeFromOrder = $order->getOrderCurrencyCode();
$countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: ( $this->getCountryCodeByCurrency($currencyCodeFromOrder) ?? self::DEFAULT_COUNTRY_CODE);
$storeId = null;
if($order) {
$storeId = $order->getStoreId();
Expand Down