From 86e0f3e3832130520d72462d3e516e3575578ee4 Mon Sep 17 00:00:00 2001
From: taehyunlim <taehyun.lim@gmail.com>
Date: Mon, 25 Jul 2022 21:51:56 -0700
Subject: [PATCH 01/31] supports api key sets per country (CA)

---
 Model/Adminhtml/Source/PaymentCountry.php | 50 +++++++++++++++++
 etc/adminhtml/system.xml                  | 67 ++++++++++++++++++++---
 etc/config.xml                            |  3 +
 3 files changed, 112 insertions(+), 8 deletions(-)
 create mode 100644 Model/Adminhtml/Source/PaymentCountry.php

diff --git a/Model/Adminhtml/Source/PaymentCountry.php b/Model/Adminhtml/Source/PaymentCountry.php
new file mode 100644
index 00000000..c493d1ed
--- /dev/null
+++ b/Model/Adminhtml/Source/PaymentCountry.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Astound
+ * NOTICE OF LICENSE
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to codemaster@astoundcommerce.com so we can send you a copy immediately.
+ *
+ * @category  Affirm
+ * @package   Astound_Affirm
+ * @copyright Copyright (c) 2016 Astound, Inc. (http://www.astoundcommerce.com)
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Astound\Affirm\Model\Adminhtml\Source;
+
+use Magento\Framework\Option\ArrayInterface;
+
+/**
+ * Class PaymentCountry
+ * Source model for the system configuration
+ * retrieve payment country options.
+ *
+ * @package Astound\Affirm\Model\Adminhtml\Source
+ */
+class PaymentCountry implements ArrayInterface
+{
+    /**
+     * Return array of options as value-label pairs
+     *
+     * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'US',
+                'label' => __('United States'),
+            ],
+            [
+                'value' => 'CA',
+                'label' => __('Canada'),
+            ]
+        ];
+    }
+}
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 2b226ab4..77d29aed 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -44,31 +44,82 @@
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="country" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Country</label>
+                    <source_model>Astound\Affirm\Model\Adminhtml\Source\PaymentCountry</source_model>
+                </field>
                 <field id="mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Mode</label>
                     <source_model>Astound\Affirm\Model\Adminhtml\Source\ModeAction</source_model>
                 </field>
                 <field id="public_api_key_sandbox" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Public API Key</label>
-                    <depends><field id="*/*/mode">sandbox</field></depends>
+                    <label>Public API Key (US)</label>
+                    <depends>
+                        <field id="*/*/mode">sandbox</field>
+                        <field id="*/*/country">US</field>
+                    </depends>
                 </field>
                 <field id="private_api_key_sandbox" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Private API Key</label>
+                    <label>Private API Key (US)</label>
                     <config_path>payment/affirm_gateway/private_api_key_sandbox</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <attribute type="shared">1</attribute>
-                    <depends><field id="*/*/mode">sandbox</field></depends>
+                    <depends>
+                        <field id="*/*/mode">sandbox</field>
+                        <field id="*/*/country">US</field>
+                    </depends>
                 </field>
                 <field id="public_api_key_production" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Public API Key</label>
+                    <label>Public API Key (US)</label>
                     <config_path>payment/affirm_gateway/public_api_key_production</config_path>
-                    <depends><field id="*/*/mode">production</field></depends>
+                    <depends>
+                        <field id="*/*/mode">production</field>
+                        <field id="*/*/country">US</field>
+                    </depends>
                 </field>
                 <field id="private_api_key_production" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Private API Key</label>
+                    <label>Private API Key (US)</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="*/*/mode">production</field>
+                        <field id="*/*/country">US</field>
+                    </depends>
+                </field>
+                <field id="public_api_key_sandbox_ca" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Public API Key (CA)</label>
+                    <depends>
+                        <field id="*/*/mode">sandbox</field>
+                        <field id="*/*/country">CA</field>
+                    </depends>
+                </field>
+                <field id="private_api_key_sandbox_ca" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Private API Key (CA)</label>
+                    <config_path>payment/affirm_gateway/private_api_key_sandbox_ca</config_path>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="*/*/mode">sandbox</field>
+                        <field id="*/*/country">CA</field>
+                    </depends>
+                </field>
+                <field id="public_api_key_production_ca" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Public API Key (CA)</label>
+                    <config_path>payment/affirm_gateway/public_api_key_production_ca</config_path>
+                    <depends>
+                        <field id="*/*/mode">production</field>
+                        <field id="*/*/country">CA</field>
+                    </depends>
+                </field>
+                <field id="private_api_key_production_ca" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Private API Key (CA)</label>
+                    <config_path>payment/affirm_gateway/private_api_key_production_ca</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <attribute type="shared">1</attribute>
-                    <depends><field id="*/*/mode">production</field></depends>
+                    <depends>
+                        <field id="*/*/mode">production</field>
+                        <field id="*/*/country">CA</field>
+                    </depends>
                 </field>
                 <field id="payment_action" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Payment Action</label>
diff --git a/etc/config.xml b/etc/config.xml
index 19002655..6d2f2575 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -17,9 +17,12 @@
                 <active>0</active>
                 <debug>1</debug>
                 <model>OnePicaAffirmGatewayFacade</model>
+                <country>United States</country>
                 <mode>sandbox</mode>
                 <private_api_key_sandbox backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <private_api_key_production backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <private_api_key_sandbox_ca backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <private_api_key_production_ca backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <min_order_total>0.01</min_order_total>
                 <max_order_total>50000</max_order_total>
                 <payment_action>authorize</payment_action>

From 81e01aa600b7fe2a329c20c617da6cf64a3c13a9 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Wed, 27 Jul 2022 16:42:44 -0700
Subject: [PATCH 02/31] country code header based on quote currency

---
 Gateway/Helper/Request/Action.php           |  4 ++--
 Gateway/Helper/Util.php                     |  6 +++++-
 Gateway/Http/Client/ClientService.php       |  5 +++--
 Gateway/Http/TransferFactory.php            |  6 +++++-
 Gateway/Request/AbstractDataBuilder.php     |  1 +
 Gateway/Request/AuthorizationRequest.php    |  4 +++-
 Gateway/Request/CaptureRequest.php          |  4 +++-
 Gateway/Request/PreAuthorizationRequest.php |  4 +++-
 Gateway/Request/RefundRequest.php           |  4 +++-
 Model/Checkout.php                          | 18 ++++++++++++++++++
 Model/Config.php                            |  2 ++
 11 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/Gateway/Helper/Request/Action.php b/Gateway/Helper/Request/Action.php
index b673c366..ecd93b46 100644
--- a/Gateway/Helper/Request/Action.php
+++ b/Gateway/Helper/Request/Action.php
@@ -69,8 +69,8 @@ public function __construct(
     public function getUrl($additionalPath = '', $storeId = null)
     {
         $gateway = $this->config->getValue('mode', $storeId) == 'sandbox'
-            ? \Astound\Affirm\Model\Config::API_URL_SANDBOX
-            : \Astound\Affirm\Model\Config::API_URL_PRODUCTION;
+            ? \Astound\Affirm\Model\Config::API_URL_SANDBOX_GLOBAL
+            : \Astound\Affirm\Model\Config::API_URL_PRODUCTION_GLOBAL;
 
         return trim($gateway, '/') . sprintf('%s%s', $this->action, $additionalPath);
     }
diff --git a/Gateway/Helper/Util.php b/Gateway/Helper/Util.php
index 5848d5d2..709ea9b5 100644
--- a/Gateway/Helper/Util.php
+++ b/Gateway/Helper/Util.php
@@ -33,7 +33,11 @@ class Util
     /**
      * Idempotency key
      */
-    const IDEMPOTENCY_KEY = "Idempotency-Key";
+    const IDEMPOTENCY_KEY = "Idempotency-Key";/**
+ *
+     * Country code
+     */
+    const COUNTRY_CODE = "Country-Code";
 
     /**
      * Constructor
diff --git a/Gateway/Http/Client/ClientService.php b/Gateway/Http/Client/ClientService.php
index 3fcd439d..415efcc5 100644
--- a/Gateway/Http/Client/ClientService.php
+++ b/Gateway/Http/Client/ClientService.php
@@ -123,16 +123,17 @@ public function placeRequest(TransferInterface $transferObject)
             $client = $this->httpClientFactory->create();
             $client->setUri($requestUri);
             $client->setAuth($transferObject->getAuthUsername(), $transferObject->getAuthPassword());
+            $headers = $transferObject->getHeaders();
             if (strpos($transferObject->getUri(), $this->action::API_TRANSACTIONS_PATH) !== false) {
                 $idempotencyKey = $this->util->generateIdempotencyKey();
-                $client->setHeaders([Util::IDEMPOTENCY_KEY => $idempotencyKey]);
+                $headers[Util::IDEMPOTENCY_KEY] = $idempotencyKey;
             }
+            $client->setHeaders($headers);
             if (!empty($transferObject->getBody())) {
                 $data = $transferObject->getBody();
                 $data = json_encode($data, JSON_UNESCAPED_SLASHES);
                 $client->setRawData($data, 'application/json');
             }
-
             $response = $client->request($transferObject->getMethod());
             $rawResponse = $response->getRawBody();
             $response = $this->converter->convert($rawResponse);
diff --git a/Gateway/Http/TransferFactory.php b/Gateway/Http/TransferFactory.php
index db345e19..77a03298 100644
--- a/Gateway/Http/TransferFactory.php
+++ b/Gateway/Http/TransferFactory.php
@@ -37,9 +37,13 @@ public function create(array $request)
         $method = isset($request['method']) ? $request['method'] : ClientService::POST;
         // Admin actions will include store id in the request
         $storeId = isset($request['storeId']) ? $request['storeId'] : $this->getStoreId();
+        $country_code = $request['country_code']; // TODO
         return $this->transferBuilder
             ->setMethod($method)
-            ->setHeaders(['Content-Type' => 'application/json'])
+            ->setHeaders([
+                'Content-Type' => 'application/json',
+                'Country-Code' => $country_code
+            ])
             ->setBody($request['body'])
             ->setAuthUsername($this->getPublicApiKey($storeId))
             ->setAuthPassword($this->getPrivateApiKey($storeId))
diff --git a/Gateway/Request/AbstractDataBuilder.php b/Gateway/Request/AbstractDataBuilder.php
index f3c8963e..1267fc4c 100644
--- a/Gateway/Request/AbstractDataBuilder.php
+++ b/Gateway/Request/AbstractDataBuilder.php
@@ -34,6 +34,7 @@ abstract class AbstractDataBuilder implements BuilderInterface
     const CHECKOUT_TOKEN = 'checkout_token';
     const TRANSACTION_ID = 'transaction_id';
     const CHARGE_ID = 'charge_id';
+    const COUNTRY_CODE = 'country_code';
     /**#@-*/
 
     /**
diff --git a/Gateway/Request/AuthorizationRequest.php b/Gateway/Request/AuthorizationRequest.php
index ea2cb37f..9c2ca3e1 100644
--- a/Gateway/Request/AuthorizationRequest.php
+++ b/Gateway/Request/AuthorizationRequest.php
@@ -44,11 +44,13 @@ public function build(array $buildSubject)
         $paymentDataObject = $buildSubject['payment'];
         $payment = $paymentDataObject->getPayment();
         $token = $payment->getAdditionalInformation(self::CHECKOUT_TOKEN);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE);
         return [
             'body' => [
                 self::TRANSACTION_ID => $token
             ],
-            'path' => ''
+            'path' => '',
+            'country_code' => $countryCode
         ];
     }
 }
diff --git a/Gateway/Request/CaptureRequest.php b/Gateway/Request/CaptureRequest.php
index e37aabe0..9e1efe1a 100644
--- a/Gateway/Request/CaptureRequest.php
+++ b/Gateway/Request/CaptureRequest.php
@@ -46,6 +46,7 @@ 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)?: 'USA'; // TODO
         $order = $payment->getOrder();
         $storeId = isset($order) ? $order->getStoreId() : $this->_storeManager->getStore()->getId();
         if (!$storeId) {
@@ -62,7 +63,8 @@ public function build(array $buildSubject)
         return [
             'path' => "{$transactionId}/capture",
             'storeId' => $storeId,
-            'body' => $_body
+            'body' => $_body,
+            'country_code' => $countryCode,
         ];
     }
 }
diff --git a/Gateway/Request/PreAuthorizationRequest.php b/Gateway/Request/PreAuthorizationRequest.php
index 5de7eed4..6ccea8d9 100644
--- a/Gateway/Request/PreAuthorizationRequest.php
+++ b/Gateway/Request/PreAuthorizationRequest.php
@@ -49,10 +49,12 @@ public function build(array $buildSubject)
         $paymentDataObject = $buildSubject['payment'];
         $payment = $paymentDataObject->getPayment();
         $token = $payment->getAdditionalInformation(self::CHECKOUT_TOKEN);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE);
         return [
             'body' => '',
             'path' => $token,
-            'method' => self::GET
+            'method' => self::GET,
+            'country_code' => $countryCode
         ];
     }
 }
diff --git a/Gateway/Request/RefundRequest.php b/Gateway/Request/RefundRequest.php
index 0f1a0b81..c9358758 100644
--- a/Gateway/Request/RefundRequest.php
+++ b/Gateway/Request/RefundRequest.php
@@ -46,6 +46,7 @@ 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)?: 'USA'; // TODO
         $amountInCents = Util::formatToCents($buildSubject['amount']);
         $order = $payment->getOrder();
         if($order) {
@@ -59,7 +60,8 @@ public function build(array $buildSubject)
                 'amount' => $amountInCents
             ],
             'path' => "{$transactionId}/refund",
-            'storeId' => $storeId
+            'storeId' => $storeId,
+            'country_code' => $countryCode,
         ];
     }
 }
diff --git a/Model/Checkout.php b/Model/Checkout.php
index 87b70e12..a6493c24 100644
--- a/Model/Checkout.php
+++ b/Model/Checkout.php
@@ -277,6 +277,9 @@ protected function initToken($token)
         if ($token) {
             $payment = $this->quote->getPayment();
             $payment->setAdditionalInformation('checkout_token', $token);
+            $quoteCurrencyCode = $payment->getQuote()->getCurrency()->getQuoteCurrencyCode();
+            $countryCode = $this->getCountryCodeByCurrency($quoteCurrencyCode);
+            $payment->setAdditionalInformation('country_code', $countryCode[1]); // TODO: cleanup
             $payment->save();
         }
     }
@@ -298,4 +301,19 @@ public function setCustomerWithAddressChange(
         $this->customerId = $customerData->getId();
         return $this;
     }
+
+    /**
+     * Maps currency code to country code
+     *
+     * @param string $currencyCode
+     * @return string
+     */
+    protected function getCountryCodeByCurrency($currencyCode)
+    {
+        $currency_map = array(
+            "USD" => ['US','USA'],
+            "CAD" => ['CA','CAN']
+        );
+        return $currency_map[$currencyCode];
+    }
 }
diff --git a/Model/Config.php b/Model/Config.php
index 47a68c45..6915fbf9 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -63,6 +63,8 @@ class Config implements ConfigInterface
     const KEY_SORT_ORDER = 'sort_order';
     const API_URL_SANDBOX = 'https://sandbox.affirm.com';
     const API_URL_PRODUCTION = 'https://api.affirm.com';
+    const API_URL_SANDBOX_GLOBAL = 'https://api.global-sandbox.affirm.com';
+    const API_URL_PRODUCTION_GLOBAL = 'https://api.global.affirm.com';
     const METHOD_BML = 'affirm_promo';
     const KEY_ASLOWAS = 'affirm_aslowas';
     const KEY_MFP = 'affirm_mfp';

From e9cddb6761afd178a6e13f1513e03a6c0dd57799 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Thu, 28 Jul 2022 10:52:52 -0700
Subject: [PATCH 03/31] update checkout object

---
 Model/InlineCheckout.php                |  8 ++++----
 Model/Plugin/Order/AddressSave/Edit.php |  8 ++++----
 view/frontend/web/js/model/affirm.js    | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Model/InlineCheckout.php b/Model/InlineCheckout.php
index 1fe16ac7..a708fa8e 100644
--- a/Model/InlineCheckout.php
+++ b/Model/InlineCheckout.php
@@ -161,11 +161,11 @@ private function formatAddress($address){
                     'last'  => $address->getLastName(),
                 ),
                 'address' => array(
-                    'line1'   => isset($street[0]) ? $street[0] : '',
-                    'line2'   => isset($street[1]) ? $street[1] : '',
+                    'street1'   => isset($street[0]) ? $street[0] : '',
+                    'street2'   => isset($street[1]) ? $street[1] : '',
                     'city'    => $address->getCity(),
-                    'state'   => $address->getRegion(),
-                    'zipcode' => $address->getPostcode(),
+                    'region1_code'   => $address->getRegion(),
+                    'postal_code' => $address->getPostcode(),
                     'country' => $address->getCountryId()
                 ),
                 'phone_number' => $address->getTelephone() ? $address->getTelephone() : '',
diff --git a/Model/Plugin/Order/AddressSave/Edit.php b/Model/Plugin/Order/AddressSave/Edit.php
index 1810d3f1..e4a7e882 100644
--- a/Model/Plugin/Order/AddressSave/Edit.php
+++ b/Model/Plugin/Order/AddressSave/Edit.php
@@ -123,11 +123,11 @@ public function afterExecute($controller , $method)
                         'full' => $newAddress['firstname'] . ' ' . $newAddress['lastname']
                     ),
                     'address' => array(
-                        'line1' => $street[0],
-                        'line2' => isset($street[1]) ? $street[1]: '' ,
-                        'state' => $newAddress['region'],
+                        'street1' => $street[0],
+                        'street2' => isset($street[1]) ? $street[1]: '' ,
+                        'region1_code' => $newAddress['region'],
                         'city' => $newAddress['city'],
-                        'zipcode' => $newAddress['postcode'],
+                        'postal_code' => $newAddress['postcode'],
                         'country' => $newAddress['country_id']
                     )
                 )
diff --git a/view/frontend/web/js/model/affirm.js b/view/frontend/web/js/model/affirm.js
index 099f3510..5c8f6b5e 100644
--- a/view/frontend/web/js/model/affirm.js
+++ b/view/frontend/web/js/model/affirm.js
@@ -141,19 +141,19 @@ define([
                 street = this.address[type].address.line[0];
             }
             result["address"] = {
-                "line1": street,
+                "street1": street,
                 "city": address.city ? address.city : this.address[type].address.city,
-                "state": address.regionCode ? address.regionCode : this.address[type].address.state,
-                "zipcode": address.postcode ? address.postcode : this.address[type].address.postcode,
+                "region1_code": address.regionCode ? address.regionCode : this.address[type].address.state,
+                "postal_code": address.postcode ? address.postcode : this.address[type].address.postcode,
                 "country": address.countryId ? address.countryId : this.address[type].address.country
              };
             result["name"] = name;
             if (address.street !== undefined) {
                 if (address.street[1]) {
-                    result.address.line2 = address.street[1];
+                    result.address.street2 = address.street[1];
                 }
             } else if(this.address[type].address.line[1]) {
-                result.address.line2 = this.address[type].address.line[1]
+                result.address.street2 = this.address[type].address.line[1]
             }
             if (address.telephone) {
                 result.phone_number = address.telephone;

From c20a78a6e99ebb1354d57f8d64aca71278d16767 Mon Sep 17 00:00:00 2001
From: taehyunlim <taehyun.lim@gmail.com>
Date: Thu, 28 Jul 2022 15:26:03 -0700
Subject: [PATCH 04/31] updates js and api urls

---
 Model/Config.php | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/Model/Config.php b/Model/Config.php
index 47a68c45..8b2b9da6 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -63,6 +63,10 @@ class Config implements ConfigInterface
     const KEY_SORT_ORDER = 'sort_order';
     const API_URL_SANDBOX = 'https://sandbox.affirm.com';
     const API_URL_PRODUCTION = 'https://api.affirm.com';
+    const JS_URL_SANDBOX = 'https://sandbox.affirm.com/js/v2/affirm.js';
+    const JS_URL_PRODUCTION = 'https://cdn1.global.affirm.com/js/v2/affirm.js';
+    const API_URL_SANDBOX_GLOBAL = 'https://api.global-sandbox.affirm.com';
+    const API_URL_PRODUCTION_GLOBAL = 'https://api.global.affirm.com';
     const METHOD_BML = 'affirm_promo';
     const KEY_ASLOWAS = 'affirm_aslowas';
     const KEY_MFP = 'affirm_mfp';
@@ -316,21 +320,9 @@ public function getApiUrl()
      */
     public function getScript()
     {
-        $apiUrl = $this->getApiUrl();
-        $prefix = "cdn1";
-        if ($apiUrl) {
-            if ($this->getMode() == 'sandbox') {
-                $pattern = '~(http|https)://~';
-                $replacement = '-';
-            } else {
-                $pattern = '~(http|https)://api~';
-                $replacement = '';
-            }
-            $apiString = preg_replace($pattern, $replacement, $apiUrl);
-            $result = 'https://' . $prefix . $apiString . '/js/v2/affirm.js';
-            return $result;
-        }
-        return '';
+        return ($this->getMode() == 'sandbox') ?
+            self::JS_URL_SANDBOX :
+            self::JS_URL_PRODUCTION;
     }
 
     /**

From 6edf861e9f5062544a5e47a0561f4801fffe1f1a Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Thu, 28 Jul 2022 15:35:16 -0700
Subject: [PATCH 05/31] Merge remote-tracking branch 'origin/ca-api-keys' into
 ca-test

---
 Helper/Payment.php                        | 14 ++++---
 Model/Adminhtml/Source/PaymentCountry.php | 50 -----------------------
 Model/Adminhtml/Source/PaymentRegion.php  | 33 +++++++++++++++
 etc/adminhtml/system.xml                  | 22 +++++-----
 etc/config.xml                            |  4 +-
 5 files changed, 54 insertions(+), 69 deletions(-)
 delete mode 100644 Model/Adminhtml/Source/PaymentCountry.php
 create mode 100644 Model/Adminhtml/Source/PaymentRegion.php

diff --git a/Helper/Payment.php b/Helper/Payment.php
index bf920dfa..4a367ab9 100644
--- a/Helper/Payment.php
+++ b/Helper/Payment.php
@@ -38,9 +38,9 @@
 class Payment
 {
     /**
-     * Country code for address validation
+     * Region (country) code for address validation
      */
-    const VALIDATE_COUNTRY = 'US';
+    const VALID_REGIONS = array('US', 'CA');
 
     /**
      * Affirm payment facade
@@ -311,7 +311,7 @@ public function getConfigurableProductBackordersOptions(Product $product = null)
     public function validateVirtual()
     {
         if ($this->quote->getIsVirtual() && !$this->quote->getCustomerIsGuest()) {
-            $countryId = self::VALIDATE_COUNTRY;
+            $countryId = '';
             // get customer addresses list
             $addresses = $this->quote->getCustomer()->getAddresses();
             // get default shipping address for the customer
@@ -321,12 +321,14 @@ public function validateVirtual()
                 foreach ($addresses as $address) {
                     if ($address->getId() == $defaultShipping) {
                         $countryId = $address->getCountryId();
+                        if (in_array($countryId, self::VALID_REGIONS)) {
+                            return true;
+                        } else {
+                            return false;
+                        }
                         break;
                     }
                 }
-                if ($countryId != self::VALIDATE_COUNTRY) {
-                    return false;
-                }
             }
         }
         return true;
diff --git a/Model/Adminhtml/Source/PaymentCountry.php b/Model/Adminhtml/Source/PaymentCountry.php
deleted file mode 100644
index c493d1ed..00000000
--- a/Model/Adminhtml/Source/PaymentCountry.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Astound
- * NOTICE OF LICENSE
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to codemaster@astoundcommerce.com so we can send you a copy immediately.
- *
- * @category  Affirm
- * @package   Astound_Affirm
- * @copyright Copyright (c) 2016 Astound, Inc. (http://www.astoundcommerce.com)
- * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-namespace Astound\Affirm\Model\Adminhtml\Source;
-
-use Magento\Framework\Option\ArrayInterface;
-
-/**
- * Class PaymentCountry
- * Source model for the system configuration
- * retrieve payment country options.
- *
- * @package Astound\Affirm\Model\Adminhtml\Source
- */
-class PaymentCountry implements ArrayInterface
-{
-    /**
-     * Return array of options as value-label pairs
-     *
-     * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
-     */
-    public function toOptionArray()
-    {
-        return [
-            [
-                'value' => 'US',
-                'label' => __('United States'),
-            ],
-            [
-                'value' => 'CA',
-                'label' => __('Canada'),
-            ]
-        ];
-    }
-}
diff --git a/Model/Adminhtml/Source/PaymentRegion.php b/Model/Adminhtml/Source/PaymentRegion.php
new file mode 100644
index 00000000..82f302a7
--- /dev/null
+++ b/Model/Adminhtml/Source/PaymentRegion.php
@@ -0,0 +1,33 @@
+<?php
+namespace Astound\Affirm\Model\Adminhtml\Source;
+
+use Magento\Framework\Option\ArrayInterface;
+
+/**
+ * Class PaymentRegion
+ * Source model for the system configuration
+ * retrieve payment region (country) options.
+ *
+ * @package Astound\Affirm\Model\Adminhtml\Source
+ */
+class PaymentRegion implements ArrayInterface
+{
+    /**
+     * Return array of options as value-label pairs
+     *
+     * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'US',
+                'label' => __('United States'),
+            ],
+            [
+                'value' => 'CA',
+                'label' => __('Canada'),
+            ]
+        ];
+    }
+}
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 77d29aed..2fdff7e3 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -44,9 +44,9 @@
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="country" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Country</label>
-                    <source_model>Astound\Affirm\Model\Adminhtml\Source\PaymentCountry</source_model>
+                <field id="region" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Region</label>
+                    <source_model>Astound\Affirm\Model\Adminhtml\Source\PaymentRegion</source_model>
                 </field>
                 <field id="mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Mode</label>
@@ -56,7 +56,7 @@
                     <label>Public API Key (US)</label>
                     <depends>
                         <field id="*/*/mode">sandbox</field>
-                        <field id="*/*/country">US</field>
+                        <field id="*/*/region">US</field>
                     </depends>
                 </field>
                 <field id="private_api_key_sandbox" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -66,7 +66,7 @@
                     <attribute type="shared">1</attribute>
                     <depends>
                         <field id="*/*/mode">sandbox</field>
-                        <field id="*/*/country">US</field>
+                        <field id="*/*/region">US</field>
                     </depends>
                 </field>
                 <field id="public_api_key_production" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -74,7 +74,7 @@
                     <config_path>payment/affirm_gateway/public_api_key_production</config_path>
                     <depends>
                         <field id="*/*/mode">production</field>
-                        <field id="*/*/country">US</field>
+                        <field id="*/*/region">US</field>
                     </depends>
                 </field>
                 <field id="private_api_key_production" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -83,14 +83,14 @@
                     <attribute type="shared">1</attribute>
                     <depends>
                         <field id="*/*/mode">production</field>
-                        <field id="*/*/country">US</field>
+                        <field id="*/*/region">US</field>
                     </depends>
                 </field>
                 <field id="public_api_key_sandbox_ca" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Public API Key (CA)</label>
                     <depends>
                         <field id="*/*/mode">sandbox</field>
-                        <field id="*/*/country">CA</field>
+                        <field id="*/*/region">CA</field>
                     </depends>
                 </field>
                 <field id="private_api_key_sandbox_ca" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -100,7 +100,7 @@
                     <attribute type="shared">1</attribute>
                     <depends>
                         <field id="*/*/mode">sandbox</field>
-                        <field id="*/*/country">CA</field>
+                        <field id="*/*/region">CA</field>
                     </depends>
                 </field>
                 <field id="public_api_key_production_ca" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -108,7 +108,7 @@
                     <config_path>payment/affirm_gateway/public_api_key_production_ca</config_path>
                     <depends>
                         <field id="*/*/mode">production</field>
-                        <field id="*/*/country">CA</field>
+                        <field id="*/*/region">CA</field>
                     </depends>
                 </field>
                 <field id="private_api_key_production_ca" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -118,7 +118,7 @@
                     <attribute type="shared">1</attribute>
                     <depends>
                         <field id="*/*/mode">production</field>
-                        <field id="*/*/country">CA</field>
+                        <field id="*/*/region">CA</field>
                     </depends>
                 </field>
                 <field id="payment_action" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
diff --git a/etc/config.xml b/etc/config.xml
index 6d2f2575..215fd563 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -17,7 +17,7 @@
                 <active>0</active>
                 <debug>1</debug>
                 <model>OnePicaAffirmGatewayFacade</model>
-                <country>United States</country>
+                <region>United States</region>
                 <mode>sandbox</mode>
                 <private_api_key_sandbox backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <private_api_key_production backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
@@ -29,7 +29,7 @@
                 <partial_capture>0</partial_capture>
                 <disable_for_backordered_items>0</disable_for_backordered_items>
                 <allowspecific>1</allowspecific>
-                <specificcountry>US,AS,GU,MP,PR,VI</specificcountry>
+                <specificcountry>US,AS,GU,MP,PR,VI,CA</specificcountry>
                 <allowspecificcurrency>1</allowspecificcurrency>
                 <currency>USD</currency>
                 <can_authorize>1</can_authorize>

From 6fbf25f9092908763284ec4a95cc4a89d70ee36b Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Thu, 11 Aug 2022 23:07:11 -0700
Subject: [PATCH 06/31] adds currency locale and country_code

---
 Block/Promotion/AslowasAbstract.php     |  4 +-
 Block/Promotion/Banners.php             |  2 +
 Block/Promotion/CartPage/Aslowas.php    |  2 +-
 Block/Promotion/Pixel/Confirm.php       |  2 +
 Block/Promotion/ProductPage/Aslowas.php |  2 +-
 Model/AffirmCheckoutManager.php         |  2 +
 Model/Config.php                        | 63 ++++++++++++++++++++-----
 Model/Plugin/Category/ViewAbstract.php  |  4 +-
 Model/Ui/ConfigProvider.php             |  3 ++
 etc/config.xml                          |  2 +-
 10 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/Block/Promotion/AslowasAbstract.php b/Block/Promotion/AslowasAbstract.php
index f15d134a..d5738240 100644
--- a/Block/Promotion/AslowasAbstract.php
+++ b/Block/Promotion/AslowasAbstract.php
@@ -23,7 +23,7 @@ abstract class AslowasAbstract extends \Magento\Framework\View\Element\Template
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key'];
+    protected $data = ['logo', 'script', 'public_api_key', 'country_code', 'locale'];
 
     /**
      * Colors which could be set in "data-affirm-color".
@@ -208,6 +208,8 @@ public function process()
                 $config = $configProvider['payment'][ConfigProvider::CODE];
                 $this->setData('script', $config['script']);
                 $this->setData('public_api_key', $config['apiKeyPublic']);
+                $this->setData('country_code', $config['countryCode']);
+                $this->setData('locale', $config['locale']);
             }
             // Set max and min options amounts from payment configuration
             $this->setData('min_order_total', $this->getPaymentConfigValue('min_order_total'));
diff --git a/Block/Promotion/Banners.php b/Block/Promotion/Banners.php
index 57e29626..ef0caf4a 100644
--- a/Block/Promotion/Banners.php
+++ b/Block/Promotion/Banners.php
@@ -232,6 +232,8 @@ public function getOptions()
             if ($config && isset($config['script']) && isset($config['apiKeyPublic'])) {
                 $options['script'] = $config['script'];
                 $options['public_api_key'] = $config['apiKeyPublic'];
+                $options['country_code'] = $config['countryCode'];
+                $options['locale'] = $config['locale'];
             }
         }
         if ($this->isProductPage()) {
diff --git a/Block/Promotion/CartPage/Aslowas.php b/Block/Promotion/CartPage/Aslowas.php
index b897089c..f1b6ae7c 100644
--- a/Block/Promotion/CartPage/Aslowas.php
+++ b/Block/Promotion/CartPage/Aslowas.php
@@ -21,7 +21,7 @@ class Aslowas extends AslowasAbstract
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total', 'element_id'];
+    protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total', 'element_id', 'country_code', 'locale'];
 
     /**
      * Checkout session
diff --git a/Block/Promotion/Pixel/Confirm.php b/Block/Promotion/Pixel/Confirm.php
index dd362c6e..d57a6a26 100644
--- a/Block/Promotion/Pixel/Confirm.php
+++ b/Block/Promotion/Pixel/Confirm.php
@@ -149,6 +149,8 @@ public function getOptions()
             if ($config && isset($config['script']) && isset($config['apiKeyPublic'])) {
                 $options['script'] = $config['script'];
                 $options['public_api_key'] = $config['apiKeyPublic'];
+                $options['country_code'] = $config['countryCode'];
+                $options['locale'] = $config['locale'];
             }
         }
         return $options;
diff --git a/Block/Promotion/ProductPage/Aslowas.php b/Block/Promotion/ProductPage/Aslowas.php
index 4dab4ebf..60eabc46 100644
--- a/Block/Promotion/ProductPage/Aslowas.php
+++ b/Block/Promotion/ProductPage/Aslowas.php
@@ -33,7 +33,7 @@ class Aslowas extends AslowasAbstract
      * @var array
      */
     protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total',
-            'selector', 'currency_rate', 'backorders_options', 'element_id'];
+            'selector', 'currency_rate', 'backorders_options', 'element_id', 'country_code', 'locale'];
 
     /**
      * Validate block before showing on front
diff --git a/Model/AffirmCheckoutManager.php b/Model/AffirmCheckoutManager.php
index dc1f819d..98d8df66 100644
--- a/Model/AffirmCheckoutManager.php
+++ b/Model/AffirmCheckoutManager.php
@@ -225,6 +225,8 @@ public function initCheckout()
             $productType = false;
         }
 
+        $response['currency'] = $this->affirmConfig->getCurrency();
+
 
         $response['address'] = [
             'shipping' => $productType ? $this->getShippingAddress() :  $this->getBillingAddress(),
diff --git a/Model/Config.php b/Model/Config.php
index 8b2b9da6..f70a2e43 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -58,12 +58,16 @@ class Config implements ConfigInterface
     const KEY_PRIVATE_KEY_SANDBOX = 'private_api_key_sandbox';
     const KEY_PUBLIC_KEY_PRODUCTION = 'public_api_key_production';
     const KEY_PRIVATE_KEY_PRODUCTION = 'private_api_key_production';
+    const KEY_PUBLIC_KEY_SANDBOX_CA = 'public_api_key_sandbox_ca';
+    const KEY_PRIVATE_KEY_SANDBOX_CA = 'private_api_key_sandbox_ca';
+    const KEY_PUBLIC_KEY_PRODUCTION_CA = 'public_api_key_production_ca';
+    const KEY_PRIVATE_KEY_PRODUCTION_CA = 'private_api_key_production_ca';
     const KEY_MINIMUM_ORDER_TOTAL = 'minimum_order_total';
     const KEY_MAXIMUM_ORDER_TOTAL = 'maximum_order_total';
     const KEY_SORT_ORDER = 'sort_order';
     const API_URL_SANDBOX = 'https://sandbox.affirm.com';
     const API_URL_PRODUCTION = 'https://api.affirm.com';
-    const JS_URL_SANDBOX = 'https://sandbox.affirm.com/js/v2/affirm.js';
+    const JS_URL_SANDBOX = 'https://cdn1-sandbox.affirm.com/js/v2/affirm.js';
     const JS_URL_PRODUCTION = 'https://cdn1.global.affirm.com/js/v2/affirm.js';
     const API_URL_SANDBOX_GLOBAL = 'https://api.global-sandbox.affirm.com';
     const API_URL_PRODUCTION_GLOBAL = 'https://api.global.affirm.com';
@@ -137,7 +141,9 @@ class Config implements ConfigInterface
         'maximum_order_total' => true,
         'minimum_order_total' => true,
         'api_url_production' => true,
-        'api_url_sandbox' => true
+        'api_url_sandbox' => true,
+        'api_url_production_global' => true,
+        'api_url_sandbox_global' => true
     ];
 
     /**
@@ -196,9 +202,9 @@ public function isCurrencyValid()
         $currentCurrency = $this->storeManager->getStore()
             ->getBaseCurrencyCode();
         $isValid = true;
-        if ($currentCurrency != self::CURRENCY_CODE) {
-            $isValid = false;
-        }
+        // if ($currentCurrency != self::CURRENCY_CODE) {
+        //     $isValid = false;
+        // }
         return $isValid;
     }
 
@@ -293,12 +299,18 @@ public function getPrivateApiKey()
      *
      * @return mixed
      */
-    public function getPublicApiKey()
+    public function getPublicApiKey($region = 'USD')
     {
         $storeId = $this->getCurrentStoreId();
+        $currentCurrency = $this->storeManager->getStore()
+            ->getCurrentCurrencyCode();
+        $region_suffix = '';
+        if ($currentCurrency == 'CAD') {
+            $region_suffix = '_ca';
+        }
         return ($this->getMode() == 'sandbox') ?
-            $this->getValue(self::KEY_PUBLIC_KEY_SANDBOX, $storeId) :
-            $this->getValue(self::KEY_PUBLIC_KEY_PRODUCTION, $storeId);
+            $this->getValue(self::KEY_PUBLIC_KEY_SANDBOX . $region_suffix, $storeId) :
+            $this->getValue(self::KEY_PUBLIC_KEY_PRODUCTION . $region_suffix, $storeId);
     }
 
     /**
@@ -309,8 +321,8 @@ public function getPublicApiKey()
     public function getApiUrl()
     {
         return ($this->getMode() == 'sandbox') ?
-            self::API_URL_SANDBOX :
-            self::API_URL_PRODUCTION;
+            self::API_URL_SANDBOX_GLOBAL :
+            self::API_URL_PRODUCTION_GLOBAL;
     }
 
     /**
@@ -325,6 +337,32 @@ public function getScript()
             self::JS_URL_PRODUCTION;
     }
 
+    public function getCountryCode()
+    {
+        $currency = $this->getCurrency();
+        if ($currency == 'CAD') {
+            return 'CAN';
+        } else {
+            return 'USA';
+        }
+    }
+
+    public function getLocale()
+    {
+        $currency = $this->getCurrency();
+        if ($currency == 'CAD') {
+            return 'en_CA';
+        } else {
+            return 'en_US';
+        }
+    }
+
+    public function getCurrency()
+    {
+        $currentStore = $this->getCurrentStore();
+        return $currentStore->getCurrentCurrencyCode();
+    }
+
     /**
      * Get Display option from stored config
      *
@@ -618,7 +656,10 @@ public function getAllAsLowAsConfig()
             'max_order_total' => $this->getConfigData('max_order_total'),
             'currency_rate' => !$this->isCurrentStoreCurrencyUSD() ? $this->getUSDCurrencyRate() : null,
             'display_cart_subtotal_incl_tax' => (int)$this->taxConfig->displayCartSubtotalInclTax(),
-            'display_cart_subtotal_excl_tax' => (int)$this->taxConfig->displayCartSubtotalExclTax()
+            'display_cart_subtotal_excl_tax' => (int)$this->taxConfig->displayCartSubtotalExclTax(),
+            'locale' => $this->getLocale(),
+            'country_code' => $this->getCountryCode(),
+            'currency' => $this->getCurrency(),
         ];
     }
 
diff --git a/Model/Plugin/Category/ViewAbstract.php b/Model/Plugin/Category/ViewAbstract.php
index 3f700647..78f9165f 100755
--- a/Model/Plugin/Category/ViewAbstract.php
+++ b/Model/Plugin/Category/ViewAbstract.php
@@ -19,7 +19,7 @@ class ViewAbstract extends \Magento\Framework\DataObject
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key'];
+    protected $data = ['logo', 'script', 'public_api_key', 'country_code', 'locale'];
 
     /**
      * Colors which could be set in "data-affirm-color".
@@ -98,6 +98,8 @@ public function __construct(
                 $config = $configProvider['payment'][ConfigProvider::CODE];
                 $this->setData('script', $config['script']);
                 $this->setData('public_api_key', $config['apiKeyPublic']);
+                $this->setData('country_code', $config['countryCode']);
+                $this->setData('locale', $config['locale']);
             }
             // Set max and min options amounts from payment configuration
             $this->setData('min_order_total', $this->getPaymentConfigValue('min_order_total'));
diff --git a/Model/Ui/ConfigProvider.php b/Model/Ui/ConfigProvider.php
index 05432586..74ebfc5b 100644
--- a/Model/Ui/ConfigProvider.php
+++ b/Model/Ui/ConfigProvider.php
@@ -119,6 +119,9 @@ public function getConfig()
                         'financial_product_key' => null
                     ],
                     'script' => $this->affirmConfig->getScript(),
+                    'countryCode' => $this->affirmConfig->getCountryCode(),
+                    'locale' => $this->affirmConfig->getLocale(),
+                    'currency' => $this->affirmConfig->getCurrency(),
                     'redirectUrl' => $this->urlBuilder->getUrl('affirm/checkout/start', ['_secure' => true]),
                     'afterAffirmConf' => $this->config->getValue('after_affirm_conf'),
                     'logoSrc' => $this->config->getValue('icon'),
diff --git a/etc/config.xml b/etc/config.xml
index 215fd563..e73093de 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -31,7 +31,7 @@
                 <allowspecific>1</allowspecific>
                 <specificcountry>US,AS,GU,MP,PR,VI,CA</specificcountry>
                 <allowspecificcurrency>1</allowspecificcurrency>
-                <currency>USD</currency>
+                <currency>USD,CAD</currency>
                 <can_authorize>1</can_authorize>
                 <can_capture>1</can_capture>
                 <can_capture_partial>1</can_capture_partial>

From 10c6886a8dc5ff90c03cc3b2b16355623f6fc6c9 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Thu, 11 Aug 2022 23:07:57 -0700
Subject: [PATCH 07/31] csp whitelist for affirm domains

---
 etc/csp_whitelist.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 etc/csp_whitelist.xml

diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
new file mode 100644
index 00000000..5cc36a65
--- /dev/null
+++ b/etc/csp_whitelist.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="affirm_script" type="host">*.affirm.com</value>
+                <value id="affirm_script_ca" type="host">*.affirm.ca</value>
+            </values>
+        </policy>
+        <policy id="frame-src">
+            <values>
+                <value id="affirm_frame" type="host">*.affirm.com</value>
+                <value id="affirm_frame_ca" type="host">*.affirm.ca</value>
+            </values>
+        </policy>
+        <policy id="connect-src">
+            <values>
+                <value id="affirm_connect" type="host">*.affirm.com</value>
+                <value id="affirm_connect_ca" type="host">*.affirm.ca</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>

From 47f28e11f9066a1fa179b6418f19281f7d4170f0 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Mon, 15 Aug 2022 10:37:47 -0700
Subject: [PATCH 08/31] ca support for ala

---
 .../web/js/action/send-to-affirm-checkout.js  | 24 ++++---
 view/frontend/web/js/aslowasCC.js             |  8 +--
 view/frontend/web/js/aslowasMC.js             |  2 +
 view/frontend/web/js/model/affirm.js          |  8 ++-
 view/frontend/web/js/model/aslowas.js         | 72 ++++++++++---------
 view/frontend/web/js/model/global.js          | 63 ++++++++--------
 6 files changed, 98 insertions(+), 79 deletions(-)

diff --git a/view/frontend/web/js/action/send-to-affirm-checkout.js b/view/frontend/web/js/action/send-to-affirm-checkout.js
index df1fbcd5..3fa8e49a 100644
--- a/view/frontend/web/js/action/send-to-affirm-checkout.js
+++ b/view/frontend/web/js/action/send-to-affirm-checkout.js
@@ -17,11 +17,11 @@ define([
 
     var options = {
         public_api_key: window.checkoutConfig.payment['affirm_gateway'].apiKeyPublic,
-        script: window.checkoutConfig.payment['affirm_gateway'].script
+        script: window.checkoutConfig.payment['affirm_gateway'].script,
+        locale: window.checkoutConfig.payment['affirm_gateway'].locale,
+        country_code: window.checkoutConfig.payment['affirm_gateway'].countryCode,
     };
 
-    loadScript.loadScript(options);
-
     return function(response) {
         fullScreenLoader.startLoader();
         var result = JSON.parse(response),
@@ -32,21 +32,27 @@ define([
         if (giftWrapItems !== 'undefined') {
             affirmCheckout.addItems(giftWrapItems);
         }
+
+        _affirm_config = {
+            public_api_key: options.public_api_key, /* Use the PUBLIC API KEY Affirm sent you. */
+            script: options.script,
+            locale: options.locale,
+            country_code: options.country_code,
+        };
+        debugger;
+        (function(m,g,n,d,a,e,h,c){var b=m[n]||{},k=document.createElement(e),p=document.getElementsByTagName(e)[0],l=function(a,b,c){return function(){a[b]._.push([c,arguments])}};b[d]=l(b,d,"set");var f=b[d];b[a]={};b[a]._=[];f._=[];b._=[];b[a][h]=l(b,a,h);b[c]=function(){b._.push([h,arguments])};a=0;for(c="set add save post open empty reset on off trigger ready setProduct".split(" ");a<c.length;a++)f[c[a]]=l(b,d,c[a]);a=0;for(c=["get","token","url","items"];a<c.length;a++)f[c[a]]=function(){};k.async=
+        !0;k.src=g[e];p.parentNode.insertBefore(k,p);delete g[e];f(g);m[n]=b})(window,_affirm_config,"affirm","checkout","ui","script","ready","jsReady");
+
         try {
-            affirm.ui.error.on("close", function() {
-                //redirect to checkout cart in case if customer canceled or returned from error pop-up
-                $.mage.redirect(window.checkoutConfig.payment['affirm_gateway'].merchant.user_cancel_url);
-            });
             checkoutObj = affirmCheckout.getData();
             if (affirmCheckout.getFinancingProgram()) {
                 checkoutObj.financing_program = affirmCheckout.getFinancingProgram();
             }
-
             affirm.checkout(checkoutObj);
             affirm.checkout.post();
         } catch (err) {
             Messages.addErrorMessage({
-                    'message': $t('We have a problem with your affirm script loading, please verify your API URL!')}
+                'message': $t('We have a problem with your Affirm script loading, please verify your API URL!')}
             );
             fullScreenLoader.stopLoader();
         }
diff --git a/view/frontend/web/js/aslowasCC.js b/view/frontend/web/js/aslowasCC.js
index 6d1576f5..e2e49c3f 100644
--- a/view/frontend/web/js/aslowasCC.js
+++ b/view/frontend/web/js/aslowasCC.js
@@ -23,12 +23,8 @@ define(["jquery",
             if (newValue) {
                 price = newValue;
             }
-            if (price && price.base_grand_total) {
-                if (newValue) {
-                    result = price.base_grand_total.toString();
-                } else {
-                    result = price.base_grand_total;
-                }
+            if (price && price.grand_total) {
+                result = price.grand_total.toString();
                 aslowas.process(result, this.options);
             }
         },
diff --git a/view/frontend/web/js/aslowasMC.js b/view/frontend/web/js/aslowasMC.js
index 860e16c1..d9c0b89e 100644
--- a/view/frontend/web/js/aslowasMC.js
+++ b/view/frontend/web/js/aslowasMC.js
@@ -52,6 +52,8 @@ define(["jquery",
                 logo: (window.checkout && window.checkout.logo) ? window.checkout.logo : null,
                 script: (window.checkout && window.checkout.script) ? window.checkout.script : null,
                 public_api_key: (window.checkout && window.checkout.public_api_key) ? window.checkout.public_api_key : null,
+                country_code: (window.checkout && window.checkout.country_code) ? window.checkout.country_code : null,
+                locale: (window.checkout && window.checkout.locale) ? window.checkout.locale : null,
                 min_order_total: (window.checkout && window.checkout.min_order_total) ? window.checkout.min_order_total : null,
                 max_order_total: (window.checkout && window.checkout.max_order_total) ? window.checkout.max_order_total : null,
                 currency_rate: (window.checkout && window.checkout.currency_rate) ? window.checkout.currency_rate : null,
diff --git a/view/frontend/web/js/model/affirm.js b/view/frontend/web/js/model/affirm.js
index 5c8f6b5e..2f65e877 100644
--- a/view/frontend/web/js/model/affirm.js
+++ b/view/frontend/web/js/model/affirm.js
@@ -23,6 +23,9 @@ define([
         shippingAmount: null,
         tax_amount: null,
         total: null,
+        currency: configData.currency,
+        locale: configData.locale,
+        country_code: configData.CountryCode,
 
         /**
          * Get checkout data
@@ -45,7 +48,10 @@ define([
                 shipping: _self.prepareAddress('shipping'),
                 billing: _self.prepareAddress('billing'),
                 discounts: _self.discounts,
-                metadata: _self.metadata
+                metadata: _self.metadata,
+                currency: _self.currency,
+                locale: _self.locale,
+                country_code: _self.country_code
             }
         },
 
diff --git a/view/frontend/web/js/model/aslowas.js b/view/frontend/web/js/model/aslowas.js
index 261da998..0ffcecfb 100644
--- a/view/frontend/web/js/model/aslowas.js
+++ b/view/frontend/web/js/model/aslowas.js
@@ -9,7 +9,6 @@ define([
     "mage/translate"
 ],
     function ($, $t) {
-        'use strict';
 
         var self;
         return {
@@ -34,12 +33,7 @@ define([
                 self = this;
                 var formatted, priceInt, optionsPrice;
                 formatted = Number(price.replace(/[^0-9\.]+/g,""));
-
-                if (options.currency_rate) {
-                    formatted = formatted / options.currency_rate;
-                    formatted = formatted.toFixed(2);
-                }
-                priceInt = formatted * 100;
+                priceInt = formatted.toFixed(2) * 100;
 
                 if (options) {
                     self.options = options;
@@ -131,39 +125,47 @@ define([
              * @private
              */
             loadScript: function(options) {
-                "use strict";
                 var pubKey = options.public_api_key,
                     script = options.script,
-                    _affirm_config = {
-                        public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
-                        script: script
-                    };
-                (function(l, g, m, e, a, f, b) {
-                    var d, c = l[m] || {},
-                        h = document.createElement(f),
-                        n = document.getElementsByTagName(f)[0],
-                        k = function(a, b, c) {
-                            return function() {
-                                a[b]._.push([c, arguments])
-                            }
+                    locale = options.locale,
+                    countryCode = options.country_code
+
+                _affirm_config = {
+                    public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
+                    script: script,
+                    locale: locale,
+                    country_code: countryCode,
+                };
+                (function (m, g, n, d, a, e, h, c) {
+                    var b = m[n] || {},
+                        k = document.createElement(e),
+                        p = document.getElementsByTagName(e)[0],
+                        l = function (a, b, c) {
+                            return function () {
+                                a[b]._.push([c, arguments]);
+                            };
                         };
-                    c[e] = k(c, e, "set");
-                    d = c[e];
-                    c[a] = {};
-                    c[a]._ = [];
-                    d._ = [];
-                    c[a][b] = k(c, a, b);
+                    b[d] = l(b, d, "set");
+                    var f = b[d];
+                    b[a] = {};
+                    b[a]._ = [];
+                    f._ = [];
+                    b._ = [];
+                    b[a][h] = l(b, a, h);
+                    b[c] = function () {
+                        b._.push([h, arguments]);
+                    };
                     a = 0;
-                    for (b = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < b.length; a++) d[b[a]] = k(c, e, b[a]);
+                    for (c = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < c.length; a++) f[c[a]] = l(b, d, c[a]);
                     a = 0;
-                    for (b = ["get", "token", "url", "items"]; a < b.length; a++) d[b[a]] = function() {};
-                    h.async = !0;
-                    h.src = g[f];
-                    n.parentNode.insertBefore(h, n);
-                    delete g[f];
-                    d(g);
-                    l[m] = c
-                })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready");
+                    for (c = ["get", "token", "url", "items"]; a < c.length; a++) f[c[a]] = function () {};
+                    k.async = !0;
+                    k.src = g[e];
+                    p.parentNode.insertBefore(k, p);
+                    delete g[e];
+                    f(g);
+                    m[n] = b;
+                })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready", "jsReady");
             },
 
             /**
diff --git a/view/frontend/web/js/model/global.js b/view/frontend/web/js/model/global.js
index 20b4c612..b33e82cf 100644
--- a/view/frontend/web/js/model/global.js
+++ b/view/frontend/web/js/model/global.js
@@ -50,40 +50,47 @@ define([
              * @private
              */
             loadScript: function (options) {
-                "use strict";
                 var pubKey = options.public_api_key,
                     script = options.script,
-                    _affirm_config = {
-                        public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
-                        script: script,
-                    };
-                (function (l, g, m, e, a, f, b) {
-                    var d, c = l[m] || {},
-                        h = document.createElement(f),
-                        n = document.getElementsByTagName(f)[0],
-                        k = function (a, b, c) {
+                    locale = options.locale,
+                    countryCode = options.country_code
+                _affirm_config = {
+                    public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
+                    script: script,
+                    locale: locale,
+                    country_code: countryCode,
+                };
+                debugger;
+                (function (m, g, n, d, a, e, h, c) {
+                    var b = m[n] || {},
+                        k = document.createElement(e),
+                        p = document.getElementsByTagName(e)[0],
+                        l = function (a, b, c) {
                             return function () {
-                                a[b]._.push([c, arguments])
-                            }
+                                a[b]._.push([c, arguments]);
+                            };
                         };
-                    c[e] = k(c, e, "set");
-                    d = c[e];
-                    c[a] = {};
-                    c[a]._ = [];
-                    d._ = [];
-                    c[a][b] = k(c, a, b);
+                    b[d] = l(b, d, "set");
+                    var f = b[d];
+                    b[a] = {};
+                    b[a]._ = [];
+                    f._ = [];
+                    b._ = [];
+                    b[a][h] = l(b, a, h);
+                    b[c] = function () {
+                        b._.push([h, arguments]);
+                    };
                     a = 0;
-                    for (b = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < b.length; a++) d[b[a]] = k(c, e, b[a]);
+                    for (c = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < c.length; a++) f[c[a]] = l(b, d, c[a]);
                     a = 0;
-                    for (b = ["get", "token", "url", "items"]; a < b.length; a++) d[b[a]] = function () {
-                    };
-                    h.async = !0;
-                    h.src = g[f];
-                    n.parentNode.insertBefore(h, n);
-                    delete g[f];
-                    d(g);
-                    l[m] = c
-                })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready");
+                    for (c = ["get", "token", "url", "items"]; a < c.length; a++) f[c[a]] = function () {};
+                    k.async = !0;
+                    k.src = g[e];
+                    p.parentNode.insertBefore(k, p);
+                    delete g[e];
+                    f(g);
+                    m[n] = b;
+                })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready", "jsReady");
             }
         }
     });

From f01ba2567006eeb218ba7c7144f970e861016118 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Mon, 15 Aug 2022 16:44:53 -0700
Subject: [PATCH 09/31] remove debugger

---
 view/frontend/web/js/action/send-to-affirm-checkout.js | 1 -
 view/frontend/web/js/model/global.js                   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/view/frontend/web/js/action/send-to-affirm-checkout.js b/view/frontend/web/js/action/send-to-affirm-checkout.js
index 3fa8e49a..d76954f5 100644
--- a/view/frontend/web/js/action/send-to-affirm-checkout.js
+++ b/view/frontend/web/js/action/send-to-affirm-checkout.js
@@ -39,7 +39,6 @@ define([
             locale: options.locale,
             country_code: options.country_code,
         };
-        debugger;
         (function(m,g,n,d,a,e,h,c){var b=m[n]||{},k=document.createElement(e),p=document.getElementsByTagName(e)[0],l=function(a,b,c){return function(){a[b]._.push([c,arguments])}};b[d]=l(b,d,"set");var f=b[d];b[a]={};b[a]._=[];f._=[];b._=[];b[a][h]=l(b,a,h);b[c]=function(){b._.push([h,arguments])};a=0;for(c="set add save post open empty reset on off trigger ready setProduct".split(" ");a<c.length;a++)f[c[a]]=l(b,d,c[a]);a=0;for(c=["get","token","url","items"];a<c.length;a++)f[c[a]]=function(){};k.async=
         !0;k.src=g[e];p.parentNode.insertBefore(k,p);delete g[e];f(g);m[n]=b})(window,_affirm_config,"affirm","checkout","ui","script","ready","jsReady");
 
diff --git a/view/frontend/web/js/model/global.js b/view/frontend/web/js/model/global.js
index b33e82cf..0efcdcca 100644
--- a/view/frontend/web/js/model/global.js
+++ b/view/frontend/web/js/model/global.js
@@ -60,7 +60,6 @@ define([
                     locale: locale,
                     country_code: countryCode,
                 };
-                debugger;
                 (function (m, g, n, d, a, e, h, c) {
                     var b = m[n] || {},
                         k = document.createElement(e),

From f5a7bcb0898c726f824760d41850cbb6c7ca028c Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Mon, 15 Aug 2022 22:34:24 -0700
Subject: [PATCH 10/31] config keys for ca credentials

---
 Gateway/Http/AbstractTransferFactory.php | 53 +++++++++++++++++-------
 Gateway/Http/TransferFactory.php         |  4 +-
 Model/Config.php                         | 14 ++-----
 3 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/Gateway/Http/AbstractTransferFactory.php b/Gateway/Http/AbstractTransferFactory.php
index a241feb8..88514100 100644
--- a/Gateway/Http/AbstractTransferFactory.php
+++ b/Gateway/Http/AbstractTransferFactory.php
@@ -29,6 +29,16 @@
  */
 abstract class AbstractTransferFactory implements TransferFactoryInterface
 {
+    /**
+     * Constants
+     */
+    const MODE = 'mode';
+    const SANDBOX = 'sandbox';
+    const PRODUCTION = 'production';
+    const SUFFIX_CANADA = '_ca'; // Config API key suffix for Canada
+    /**
+
+
     /**
      * Config
      *
@@ -82,16 +92,17 @@ public function __construct(
      * @param int $storeId
      * @return string
      */
-    protected function getPublicApiKey($storeId)
+    protected function getPublicApiKey($storeId, $country_code)
     {
+        $country_suffix = $this->getApiKeyNameByCountry($country_code);
         if(!empty($storeId)){
-            return $this->config->getValue('mode', $storeId) == 'sandbox'
-                ? $this->config->getValue('public_api_key_sandbox', $storeId)
-                : $this->config->getValue('public_api_key_production', $storeId);
+            return $this->config->getValue(self::MODE, $storeId) == self::SANDBOX
+                ? $this->config->getValue('public_api_key_sandbox' . $country_suffix, $storeId)
+                : $this->config->getValue('public_api_key_production' . $country_suffix, $storeId);
         } else {
-            return $this->config->getValue('mode') == 'sandbox'
-                ? $this->config->getValue('public_api_key_sandbox')
-                : $this->config->getValue('public_api_key_production');
+            return $this->config->getValue('mode') == self::SANDBOX
+                ? $this->config->getValue('public_api_key_sandbox' . $country_suffix)
+                : $this->config->getValue('public_api_key_production' . $country_suffix);
         }
 
     }
@@ -102,16 +113,17 @@ protected function getPublicApiKey($storeId)
      * @param int $storeId
      * @return string
      */
-    protected function getPrivateApiKey($storeId)
+    protected function getPrivateApiKey($storeId, $country_code)
     {
+        $country_suffix = $this->getApiKeyNameByCountry($country_code);
         if(!empty($storeId)){
-            return $this->config->getValue('mode', $storeId) == 'sandbox'
-                ? $this->config->getValue('private_api_key_sandbox', $storeId)
-                : $this->config->getValue('private_api_key_production', $storeId);
+            return $this->config->getValue('mode', $storeId) == self::SANDBOX
+                ? $this->config->getValue('private_api_key_sandbox' . $country_suffix, $storeId)
+                : $this->config->getValue('private_api_key_production' . $country_suffix, $storeId);
         } else {
-            return $this->config->getValue('mode') == 'sandbox'
-                ? $this->config->getValue('private_api_key_sandbox')
-                : $this->config->getValue('private_api_key_production');
+            return $this->config->getValue('mode') == self::SANDBOX
+                ? $this->config->getValue('private_api_key_sandbox' . $country_suffix)
+                : $this->config->getValue('private_api_key_production' . $country_suffix);
         }
     }
 
@@ -124,4 +136,17 @@ protected function getStoreId()
     {
         return $this->_storeManager->getStore()->getId();
     }
+
+    /**
+     * Map country code to API key config name
+     *
+     * @return string
+     */
+    protected function getApiKeyNameByCountry($country_code)
+    {
+        if ($country_code == 'CAN') {
+            return self::SUFFIX_CANADA;
+        }
+        return '';
+    }
 }
diff --git a/Gateway/Http/TransferFactory.php b/Gateway/Http/TransferFactory.php
index 77a03298..aa2bf8bc 100644
--- a/Gateway/Http/TransferFactory.php
+++ b/Gateway/Http/TransferFactory.php
@@ -45,8 +45,8 @@ public function create(array $request)
                 'Country-Code' => $country_code
             ])
             ->setBody($request['body'])
-            ->setAuthUsername($this->getPublicApiKey($storeId))
-            ->setAuthPassword($this->getPrivateApiKey($storeId))
+            ->setAuthUsername($this->getPublicApiKey($storeId, $country_code))
+            ->setAuthPassword($this->getPrivateApiKey($storeId, $country_code))
             ->setUri($this->getApiUrl($request['path'], $storeId))
             ->build();
     }
diff --git a/Model/Config.php b/Model/Config.php
index f70a2e43..a9566571 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -74,7 +74,7 @@ class Config implements ConfigInterface
     const METHOD_BML = 'affirm_promo';
     const KEY_ASLOWAS = 'affirm_aslowas';
     const KEY_MFP = 'affirm_mfp';
-    const CURRENCY_CODE = 'USD';
+    const VALID_CURRENCIES = array('USD', 'CAD');
     const KEY_ASLOWAS_DEVELOPER = 'affirm_aslowas_developer';
     const KEY_PIXEL = 'affirm_pixel';
     /**#@-*/
@@ -201,11 +201,7 @@ public function isCurrencyValid()
     {
         $currentCurrency = $this->storeManager->getStore()
             ->getBaseCurrencyCode();
-        $isValid = true;
-        // if ($currentCurrency != self::CURRENCY_CODE) {
-        //     $isValid = false;
-        // }
-        return $isValid;
+        return in_array($currentCurrency, self::VALID_CURRENCIES);
     }
 
     /**
@@ -217,11 +213,7 @@ public function isCurrentStoreCurrencyUSD()
     {
         $currentCurrency = $this->storeManager->getStore()
             ->getCurrentCurrencyCode();
-        $isUSD = true;
-        if ($currentCurrency != self::CURRENCY_CODE) {
-            $isUSD = false;
-        }
-        return $isUSD;
+        return $currentCurrency == 'USD';
     }
 
     /**

From 5bcb49a75c9eaacd64e1c3021503899110289773 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Tue, 16 Aug 2022 21:54:13 -0700
Subject: [PATCH 11/31] use order currency instead of base currency

---
 Gateway/Http/TransferFactory.php                 |  2 +-
 Gateway/Request/CaptureRequest.php               |  2 +-
 Gateway/Request/RefundRequest.php                |  5 +++--
 Gateway/Request/VoidRequest.php                  |  4 +++-
 .../Validator/Client/PaymentActionsValidator.php | 16 ++++++++++++++++
 Model/Checkout.php                               |  2 +-
 view/frontend/web/js/model/affirm.js             |  6 +++---
 7 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Gateway/Http/TransferFactory.php b/Gateway/Http/TransferFactory.php
index aa2bf8bc..5cbbbd1e 100644
--- a/Gateway/Http/TransferFactory.php
+++ b/Gateway/Http/TransferFactory.php
@@ -37,7 +37,7 @@ public function create(array $request)
         $method = isset($request['method']) ? $request['method'] : ClientService::POST;
         // Admin actions will include store id in the request
         $storeId = isset($request['storeId']) ? $request['storeId'] : $this->getStoreId();
-        $country_code = $request['country_code']; // TODO
+        $country_code = $request['country_code'] ?: 'USA';
         return $this->transferBuilder
             ->setMethod($method)
             ->setHeaders([
diff --git a/Gateway/Request/CaptureRequest.php b/Gateway/Request/CaptureRequest.php
index 9e1efe1a..c302c253 100644
--- a/Gateway/Request/CaptureRequest.php
+++ b/Gateway/Request/CaptureRequest.php
@@ -46,7 +46,7 @@ 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)?: 'USA'; // TODO
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE)?: 'USA';
         $order = $payment->getOrder();
         $storeId = isset($order) ? $order->getStoreId() : $this->_storeManager->getStore()->getId();
         if (!$storeId) {
diff --git a/Gateway/Request/RefundRequest.php b/Gateway/Request/RefundRequest.php
index c9358758..3c061e52 100644
--- a/Gateway/Request/RefundRequest.php
+++ b/Gateway/Request/RefundRequest.php
@@ -46,8 +46,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)?: 'USA'; // TODO
-        $amountInCents = Util::formatToCents($buildSubject['amount']);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: 'USA';
+        $creditMemoAmount = $payment->getCreditmemo()->getGrandTotal();
+        $amountInCents = Util::formatToCents($creditMemoAmount);
         $order = $payment->getOrder();
         if($order) {
             $storeId = $order->getStoreId();
diff --git a/Gateway/Request/VoidRequest.php b/Gateway/Request/VoidRequest.php
index 67ea249b..07c5004d 100644
--- a/Gateway/Request/VoidRequest.php
+++ b/Gateway/Request/VoidRequest.php
@@ -45,6 +45,7 @@ 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) ?: 'USA';
         $order = $payment->getOrder();
         if($order) {
             $storeId = $order->getStoreId();
@@ -55,7 +56,8 @@ public function build(array $buildSubject)
         return [
             'body' => [],
             'path' => "{$transactionId}/void",
-            'storeId' => $storeId
+            'storeId' => $storeId,
+            'country_code' => $countryCode,
         ];
     }
 }
diff --git a/Gateway/Validator/Client/PaymentActionsValidator.php b/Gateway/Validator/Client/PaymentActionsValidator.php
index c14c495d..d938e4d2 100644
--- a/Gateway/Validator/Client/PaymentActionsValidator.php
+++ b/Gateway/Validator/Client/PaymentActionsValidator.php
@@ -33,6 +33,22 @@ public function validate(array $validationSubject)
     {
         $response = SubjectReader::readResponse($validationSubject);
         $amount = SubjectReader::readAmount($validationSubject);
+
+        if ( (isset($response['checkout_status']) && $response['checkout_status'] == 'confirmed')
+            || (isset($response['status']) && $response['status'] == 'authorized')
+            || (isset($response['type']) && $response['type'] == 'capture'))
+        {
+            // Pre-Auth/Auth/Capture
+            $_payment = $validationSubject['payment']->getPayment();
+            $payment_data = $_payment->getData();
+            $amount = $payment_data['amount_ordered'];
+        } elseif ( (isset($response['type']) && $response['type'] == 'refund') ) {
+            // Refund (including partial)
+            $_payment = $validationSubject['payment']->getPayment();
+            $_creditMemo = $_payment->getData()['creditmemo'];
+            $amount = $_creditMemo->getGrandTotal();
+        }
+
         $amountInCents = Util::formatToCents($amount);
 
         $errorMessages = [];
diff --git a/Model/Checkout.php b/Model/Checkout.php
index a6493c24..9dd5af93 100644
--- a/Model/Checkout.php
+++ b/Model/Checkout.php
@@ -279,7 +279,7 @@ protected function initToken($token)
             $payment->setAdditionalInformation('checkout_token', $token);
             $quoteCurrencyCode = $payment->getQuote()->getCurrency()->getQuoteCurrencyCode();
             $countryCode = $this->getCountryCodeByCurrency($quoteCurrencyCode);
-            $payment->setAdditionalInformation('country_code', $countryCode[1]); // TODO: cleanup
+            $payment->setAdditionalInformation('country_code', $countryCode[1]);
             $payment->save();
         }
     }
diff --git a/view/frontend/web/js/model/affirm.js b/view/frontend/web/js/model/affirm.js
index 2f65e877..03e7606f 100644
--- a/view/frontend/web/js/model/affirm.js
+++ b/view/frontend/web/js/model/affirm.js
@@ -99,9 +99,9 @@ define([
          */
         prepareTotals: function() {
             var totals = quote.getTotals()();
-            this.shippingAmount = this.convertPriceToCents(totals.base_shipping_amount);
-            this.total = this.convertPriceToCents(totals.base_grand_total);
-            this.tax_amount = this.convertPriceToCents(totals.base_tax_amount);
+            this.shippingAmount = this.convertPriceToCents(totals.shipping_amount);
+            this.total = this.convertPriceToCents(totals.grand_total);
+            this.tax_amount = this.convertPriceToCents(totals.tax_amount);
         },
 
         /**

From 56f33391a6d7215779ed66a278d90fc291b8b240 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Tue, 16 Aug 2022 21:54:25 -0700
Subject: [PATCH 12/31] csp policy for assets

---
 etc/csp_whitelist.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
index 5cc36a65..31908adf 100644
--- a/etc/csp_whitelist.xml
+++ b/etc/csp_whitelist.xml
@@ -26,5 +26,11 @@
                 <value id="affirm_connect_ca" type="host">*.affirm.ca</value>
             </values>
         </policy>
+        <policy id="img-src">
+            <values>
+                <value id="affirm_assets" type="host">*.affirm.com</value>
+                <value id="affirm_assets_ca" type="host">*.affirm.ca</value>
+            </values>
+        </policy>
     </policies>
 </csp_whitelist>

From 0b8c9489336166b54809d8d0cea7f44452ba4f3e Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Tue, 16 Aug 2022 23:02:20 -0700
Subject: [PATCH 13/31] restrict split capture to US only

---
 Gateway/Request/CaptureRequest.php         | 2 +-
 Model/Plugin/Payment/CanCapturePartial.php | 3 ++-
 etc/adminhtml/system.xml                   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gateway/Request/CaptureRequest.php b/Gateway/Request/CaptureRequest.php
index c302c253..2f82c743 100644
--- a/Gateway/Request/CaptureRequest.php
+++ b/Gateway/Request/CaptureRequest.php
@@ -52,7 +52,7 @@ public function build(array $buildSubject)
         if (!$storeId) {
             $storeId = null;
         }
-        if ($this->affirmPaymentConfig->getPartialCapture()) {
+        if ($this->affirmPaymentConfig->getPartialCapture($countryCode)) {
             $_amount = $buildSubject['amount'] ? Util::formatToCents($buildSubject['amount']) : null;
             $_body = [
                 'amount' => $_amount
diff --git a/Model/Plugin/Payment/CanCapturePartial.php b/Model/Plugin/Payment/CanCapturePartial.php
index d1ac3dac..fbfbdb29 100644
--- a/Model/Plugin/Payment/CanCapturePartial.php
+++ b/Model/Plugin/Payment/CanCapturePartial.php
@@ -40,7 +40,8 @@ public function __construct(
    */
   public function afterCanCapturePartial(Payment $subject, $result)
   {
-    if (!$this->affirmPaymentConfig->getPartialCapture()) {
+    $countryCode = $subject->getData()['additional_information']['country_code'] ?: 'USA';
+    if (!$this->affirmPaymentConfig->getPartialCapture() || $countryCode != 'USA') {
       return false;
     }
     return $result;
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 2fdff7e3..e61c88a2 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -126,7 +126,7 @@
                     <source_model>Astound\Affirm\Model\Adminhtml\Source\PaymentAction</source_model>
                 </field>
                 <field id="partial_capture" translate="label" type="select" sortOrder="71" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Enable Partial Capture</label>
+                    <label>Enable Partial Capture (US only)</label>
                     <depends><field id="payment_action">authorize</field></depends>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>

From 4553aec40a56a88322c038a5ae9bb0b025595830 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Tue, 16 Aug 2022 23:20:10 -0700
Subject: [PATCH 14/31] us only split capture

---
 Model/Config.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Model/Config.php b/Model/Config.php
index a9566571..7082aa46 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -679,12 +679,12 @@ public function getCheckoutFlowType()
     }
 
     /**
-     * Get partial capture
+     * Get partial capture (US only)
      *
      * @return bool
      */
-    public function getPartialCapture()
+    public function getPartialCapture($countryCode = 'USA')
     {
-        return $this->getConfigData('partial_capture');
+        return $this->getConfigData('partial_capture') && $countryCode == 'USA';
     }
 }

From 1dd82117874686144b9a34a3763c657be9e712f0 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Tue, 16 Aug 2022 23:23:59 -0700
Subject: [PATCH 15/31] update locale based on config

---
 Model/Config.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Model/Config.php b/Model/Config.php
index 7082aa46..f68c12c8 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -39,6 +39,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Locale\Resolver;
 use Magento\Directory\Model\Currency;
 use Magento\Tax\Model\Config as TaxConfig;
 
@@ -75,6 +76,7 @@ class Config implements ConfigInterface
     const KEY_ASLOWAS = 'affirm_aslowas';
     const KEY_MFP = 'affirm_mfp';
     const VALID_CURRENCIES = array('USD', 'CAD');
+    const ACCEPTED_LOCALES = array('en_CA', 'fr_CA', 'en_US');
     const KEY_ASLOWAS_DEVELOPER = 'affirm_aslowas_developer';
     const KEY_PIXEL = 'affirm_pixel';
     /**#@-*/
@@ -114,6 +116,13 @@ class Config implements ConfigInterface
      */
     protected $storeManager;
 
+    /**
+     * Store locale resolver
+     *
+     * @var \Magento\Framework\Locale\Resolver
+     */
+    protected $_store;
+
     /**
      * Path pattern
      *
@@ -158,18 +167,21 @@ class Config implements ConfigInterface
      *
      * @param ScopeConfigInterface  $scopeConfig
      * @param StoreManagerInterface $storeManager
+     * @param Resolver              $store
      * @param Currency              $currency
      * @param TaxConfig             $taxConfig
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         StoreManagerInterface $storeManager,
+        Resolver $store,
         Currency $currency,
         TaxConfig $taxConfig
     )
     {
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
+        $this->_store = $store;
         $this->currency = $currency;
         $this->taxConfig = $taxConfig;
     }
@@ -343,6 +355,10 @@ public function getLocale()
     {
         $currency = $this->getCurrency();
         if ($currency == 'CAD') {
+            $currentLocale = $this->_store->getLocale();
+            if (in_array($currentLocale, self::ACCEPTED_LOCALES)) {
+                return $currentLocale;
+            }
             return 'en_CA';
         } else {
             return 'en_US';

From af1ff8d4fbb881fef82e73749fc27d38bee3834c Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Tue, 16 Aug 2022 23:30:47 -0700
Subject: [PATCH 16/31] replace api urls

---
 Gateway/Helper/Request/Action.php |  4 ++--
 Model/Config.php                  | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Gateway/Helper/Request/Action.php b/Gateway/Helper/Request/Action.php
index ecd93b46..b673c366 100644
--- a/Gateway/Helper/Request/Action.php
+++ b/Gateway/Helper/Request/Action.php
@@ -69,8 +69,8 @@ public function __construct(
     public function getUrl($additionalPath = '', $storeId = null)
     {
         $gateway = $this->config->getValue('mode', $storeId) == 'sandbox'
-            ? \Astound\Affirm\Model\Config::API_URL_SANDBOX_GLOBAL
-            : \Astound\Affirm\Model\Config::API_URL_PRODUCTION_GLOBAL;
+            ? \Astound\Affirm\Model\Config::API_URL_SANDBOX
+            : \Astound\Affirm\Model\Config::API_URL_PRODUCTION;
 
         return trim($gateway, '/') . sprintf('%s%s', $this->action, $additionalPath);
     }
diff --git a/Model/Config.php b/Model/Config.php
index f68c12c8..9432420d 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -66,12 +66,10 @@ class Config implements ConfigInterface
     const KEY_MINIMUM_ORDER_TOTAL = 'minimum_order_total';
     const KEY_MAXIMUM_ORDER_TOTAL = 'maximum_order_total';
     const KEY_SORT_ORDER = 'sort_order';
-    const API_URL_SANDBOX = 'https://sandbox.affirm.com';
-    const API_URL_PRODUCTION = 'https://api.affirm.com';
+    const API_URL_SANDBOX = 'https://api.global-sandbox.affirm.com';
+    const API_URL_PRODUCTION = 'https://api.global.affirm.com';
     const JS_URL_SANDBOX = 'https://cdn1-sandbox.affirm.com/js/v2/affirm.js';
     const JS_URL_PRODUCTION = 'https://cdn1.global.affirm.com/js/v2/affirm.js';
-    const API_URL_SANDBOX_GLOBAL = 'https://api.global-sandbox.affirm.com';
-    const API_URL_PRODUCTION_GLOBAL = 'https://api.global.affirm.com';
     const METHOD_BML = 'affirm_promo';
     const KEY_ASLOWAS = 'affirm_aslowas';
     const KEY_MFP = 'affirm_mfp';
@@ -150,9 +148,7 @@ class Config implements ConfigInterface
         'maximum_order_total' => true,
         'minimum_order_total' => true,
         'api_url_production' => true,
-        'api_url_sandbox' => true,
-        'api_url_production_global' => true,
-        'api_url_sandbox_global' => true
+        'api_url_sandbox' => true
     ];
 
     /**
@@ -325,8 +321,8 @@ public function getPublicApiKey($region = 'USD')
     public function getApiUrl()
     {
         return ($this->getMode() == 'sandbox') ?
-            self::API_URL_SANDBOX_GLOBAL :
-            self::API_URL_PRODUCTION_GLOBAL;
+            self::API_URL_SANDBOX :
+            self::API_URL_PRODUCTION;
     }
 
     /**

From b254745bcf2b7602b968e265d18d527910a24a4a Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Wed, 17 Aug 2022 00:11:04 -0700
Subject: [PATCH 17/31] clean up

---
 Gateway/Helper/Util.php                       |  5 +--
 .../web/js/action/send-to-affirm-checkout.js  | 32 +++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Gateway/Helper/Util.php b/Gateway/Helper/Util.php
index 709ea9b5..e1e389ea 100644
--- a/Gateway/Helper/Util.php
+++ b/Gateway/Helper/Util.php
@@ -33,8 +33,9 @@ class Util
     /**
      * Idempotency key
      */
-    const IDEMPOTENCY_KEY = "Idempotency-Key";/**
- *
+    const IDEMPOTENCY_KEY = "Idempotency-Key";
+
+    /**
      * Country code
      */
     const COUNTRY_CODE = "Country-Code";
diff --git a/view/frontend/web/js/action/send-to-affirm-checkout.js b/view/frontend/web/js/action/send-to-affirm-checkout.js
index d76954f5..e5492ff4 100644
--- a/view/frontend/web/js/action/send-to-affirm-checkout.js
+++ b/view/frontend/web/js/action/send-to-affirm-checkout.js
@@ -39,8 +39,36 @@ define([
             locale: options.locale,
             country_code: options.country_code,
         };
-        (function(m,g,n,d,a,e,h,c){var b=m[n]||{},k=document.createElement(e),p=document.getElementsByTagName(e)[0],l=function(a,b,c){return function(){a[b]._.push([c,arguments])}};b[d]=l(b,d,"set");var f=b[d];b[a]={};b[a]._=[];f._=[];b._=[];b[a][h]=l(b,a,h);b[c]=function(){b._.push([h,arguments])};a=0;for(c="set add save post open empty reset on off trigger ready setProduct".split(" ");a<c.length;a++)f[c[a]]=l(b,d,c[a]);a=0;for(c=["get","token","url","items"];a<c.length;a++)f[c[a]]=function(){};k.async=
-        !0;k.src=g[e];p.parentNode.insertBefore(k,p);delete g[e];f(g);m[n]=b})(window,_affirm_config,"affirm","checkout","ui","script","ready","jsReady");
+        (function (m, g, n, d, a, e, h, c) {
+            var b = m[n] || {},
+                k = document.createElement(e),
+                p = document.getElementsByTagName(e)[0],
+                l = function (a, b, c) {
+                    return function () {
+                        a[b]._.push([c, arguments]);
+                    };
+                };
+            b[d] = l(b, d, "set");
+            var f = b[d];
+            b[a] = {};
+            b[a]._ = [];
+            f._ = [];
+            b._ = [];
+            b[a][h] = l(b, a, h);
+            b[c] = function () {
+                b._.push([h, arguments]);
+            };
+            a = 0;
+            for (c = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < c.length; a++) f[c[a]] = l(b, d, c[a]);
+            a = 0;
+            for (c = ["get", "token", "url", "items"]; a < c.length; a++) f[c[a]] = function () {};
+            k.async = !0;
+            k.src = g[e];
+            p.parentNode.insertBefore(k, p);
+            delete g[e];
+            f(g);
+            m[n] = b;
+        })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready", "jsReady");
 
         try {
             checkoutObj = affirmCheckout.getData();

From f28087385bb819d7b36c2824134167f71dacd6da Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Wed, 17 Aug 2022 15:54:45 -0700
Subject: [PATCH 18/31] regex to get CA locales

---
 Model/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Model/Config.php b/Model/Config.php
index 9432420d..87b90c7c 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -352,7 +352,7 @@ public function getLocale()
         $currency = $this->getCurrency();
         if ($currency == 'CAD') {
             $currentLocale = $this->_store->getLocale();
-            if (in_array($currentLocale, self::ACCEPTED_LOCALES)) {
+            if (in_array($currentLocale, preg_grep('/(_CA)$/', self::ACCEPTED_LOCALES))) {
                 return $currentLocale;
             }
             return 'en_CA';

From cfd9edbc2cfe10764f282d20e3084923fa1cb991 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Wed, 17 Aug 2022 20:53:28 -0700
Subject: [PATCH 19/31] handle intl format (#.#,00 $)

---
 view/frontend/web/js/model/aslowas.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/view/frontend/web/js/model/aslowas.js b/view/frontend/web/js/model/aslowas.js
index 0ffcecfb..bbd94289 100644
--- a/view/frontend/web/js/model/aslowas.js
+++ b/view/frontend/web/js/model/aslowas.js
@@ -31,8 +31,14 @@ define([
              */
             process: function(price, options) {
                 self = this;
-                var formatted, priceInt, optionsPrice;
-                formatted = Number(price.replace(/[^0-9\.]+/g,""));
+                var formatted, priceInt, optionsPrice, priceStr;
+
+                priceStr = price.replace(/^(-)|[^0-9.,]+/g, '$1').trim();
+                var result = priceStr.replace(/[^0-9]/g, '');
+                if (/[,\.]\d{2}$/.test(priceStr)) {
+                    result = result.replace(/(\d{2})$/, '.$1'); // restore decimal point
+                }
+                formatted = parseFloat(result);
                 priceInt = formatted.toFixed(2) * 100;
 
                 if (options) {

From a96388076f2987bcb91cf856fbea2228545b9b82 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Wed, 17 Aug 2022 21:03:05 -0700
Subject: [PATCH 20/31] else readAmount

---
 Gateway/Validator/Client/PaymentActionsValidator.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gateway/Validator/Client/PaymentActionsValidator.php b/Gateway/Validator/Client/PaymentActionsValidator.php
index d938e4d2..7656c0ae 100644
--- a/Gateway/Validator/Client/PaymentActionsValidator.php
+++ b/Gateway/Validator/Client/PaymentActionsValidator.php
@@ -32,7 +32,7 @@ class PaymentActionsValidator extends AbstractResponseValidator
     public function validate(array $validationSubject)
     {
         $response = SubjectReader::readResponse($validationSubject);
-        $amount = SubjectReader::readAmount($validationSubject);
+        $amount = '';
 
         if ( (isset($response['checkout_status']) && $response['checkout_status'] == 'confirmed')
             || (isset($response['status']) && $response['status'] == 'authorized')
@@ -47,6 +47,9 @@ public function validate(array $validationSubject)
             $_payment = $validationSubject['payment']->getPayment();
             $_creditMemo = $_payment->getData()['creditmemo'];
             $amount = $_creditMemo->getGrandTotal();
+        } else {
+            // Partial capture (US only)
+            $amount = SubjectReader::readAmount($validationSubject);
         }
 
         $amountInCents = Util::formatToCents($amount);

From f83cba0a439dee0f193763d5bec53378a8eccbde Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Thu, 18 Aug 2022 14:27:38 -0700
Subject: [PATCH 21/31] update api key suffix lookup with hashmap

---
 Gateway/Http/AbstractTransferFactory.php | 18 +++++++++----
 Model/Config.php                         | 34 +++++++++++++++++++-----
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/Gateway/Http/AbstractTransferFactory.php b/Gateway/Http/AbstractTransferFactory.php
index 88514100..1a8ea75b 100644
--- a/Gateway/Http/AbstractTransferFactory.php
+++ b/Gateway/Http/AbstractTransferFactory.php
@@ -35,7 +35,9 @@ abstract class AbstractTransferFactory implements TransferFactoryInterface
     const MODE = 'mode';
     const SANDBOX = 'sandbox';
     const PRODUCTION = 'production';
-    const SUFFIX_CANADA = '_ca'; // Config API key suffix for Canada
+    const COUNTRY_CODE_USA = 'USA';
+    const COUNTRY_CODE_CAN = 'CAN';
+    const SUFFIX_CANADA = '_ca';
     /**
 
 
@@ -138,15 +140,21 @@ protected function getStoreId()
     }
 
     /**
-     * Map country code to API key config name
+     * Map country code to API key config suffix name
      *
      * @return string
      */
     protected function getApiKeyNameByCountry($country_code)
     {
-        if ($country_code == 'CAN') {
-            return self::SUFFIX_CANADA;
+        $_suffix = '';
+        $countryCodeToSuffix = array(
+            'CAN' => self::SUFFIX_CANADA,
+            'USA' => '',
+        );
+
+        if (isset($country_code)) {
+            $_suffix = $countryCodeToSuffix[$country_code] ?: '';
         }
-        return '';
+        return $_suffix;
     }
 }
diff --git a/Model/Config.php b/Model/Config.php
index 87b90c7c..86d0230a 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -75,6 +75,7 @@ class Config implements ConfigInterface
     const KEY_MFP = 'affirm_mfp';
     const VALID_CURRENCIES = array('USD', 'CAD');
     const ACCEPTED_LOCALES = array('en_CA', 'fr_CA', 'en_US');
+    const SUFFIX_CANADA = '_ca';
     const KEY_ASLOWAS_DEVELOPER = 'affirm_aslowas_developer';
     const KEY_PIXEL = 'affirm_pixel';
     /**#@-*/
@@ -289,9 +290,12 @@ public function getMode()
     public function getPrivateApiKey()
     {
         $storeId = $this->getCurrentStoreId();
+        $currentCurrency = $this->storeManager->getStore()
+            ->getCurrentCurrencyCode();
+        $region_suffix = $this->getApiKeyNameByCurrency($currentCurrency);
         return ($this->getMode() == 'sandbox') ?
-            $this->getValue(self::KEY_PRIVATE_KEY_SANDBOX, $storeId) :
-            $this->getValue(self::KEY_PRIVATE_KEY_PRODUCTION, $storeId);
+            $this->getValue(self::KEY_PRIVATE_KEY_SANDBOX . $region_suffix, $storeId) :
+            $this->getValue(self::KEY_PRIVATE_KEY_PRODUCTION . $region_suffix, $storeId);
     }
 
     /**
@@ -299,15 +303,12 @@ public function getPrivateApiKey()
      *
      * @return mixed
      */
-    public function getPublicApiKey($region = 'USD')
+    public function getPublicApiKey()
     {
         $storeId = $this->getCurrentStoreId();
         $currentCurrency = $this->storeManager->getStore()
             ->getCurrentCurrencyCode();
-        $region_suffix = '';
-        if ($currentCurrency == 'CAD') {
-            $region_suffix = '_ca';
-        }
+        $region_suffix = $this->getApiKeyNameByCurrency($currentCurrency);
         return ($this->getMode() == 'sandbox') ?
             $this->getValue(self::KEY_PUBLIC_KEY_SANDBOX . $region_suffix, $storeId) :
             $this->getValue(self::KEY_PUBLIC_KEY_PRODUCTION . $region_suffix, $storeId);
@@ -699,4 +700,23 @@ public function getPartialCapture($countryCode = 'USA')
     {
         return $this->getConfigData('partial_capture') && $countryCode == 'USA';
     }
+
+    /**
+     * Map currency to API key config suffix name
+     *
+     * @return string
+     */
+    protected function getApiKeyNameByCurrency($currency_code)
+    {
+        $_suffix = '';
+        $currencyCodeToSuffix = array(
+            'CAD' => self::SUFFIX_CANADA,
+            'USD' => '',
+        );
+
+        if (isset($currency_code)) {
+            $_suffix = $currencyCodeToSuffix[$currency_code] ?: '';
+        }
+        return $_suffix;
+    }
 }

From f6c5e3f5f8ebdf196ef8e15fe5962774277021fe Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Thu, 18 Aug 2022 14:31:58 -0700
Subject: [PATCH 22/31] params in docblock

---
 Gateway/Http/AbstractTransferFactory.php | 3 +++
 Model/Config.php                         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Gateway/Http/AbstractTransferFactory.php b/Gateway/Http/AbstractTransferFactory.php
index 1a8ea75b..7ca75139 100644
--- a/Gateway/Http/AbstractTransferFactory.php
+++ b/Gateway/Http/AbstractTransferFactory.php
@@ -92,6 +92,7 @@ public function __construct(
      * Get public API key
      *
      * @param int $storeId
+     * @param string $country_code
      * @return string
      */
     protected function getPublicApiKey($storeId, $country_code)
@@ -113,6 +114,7 @@ protected function getPublicApiKey($storeId, $country_code)
      * Get private API key
      *
      * @param int $storeId
+     * @param string $country_code
      * @return string
      */
     protected function getPrivateApiKey($storeId, $country_code)
@@ -142,6 +144,7 @@ protected function getStoreId()
     /**
      * Map country code to API key config suffix name
      *
+     * @param string $country_code
      * @return string
      */
     protected function getApiKeyNameByCountry($country_code)
diff --git a/Model/Config.php b/Model/Config.php
index 86d0230a..4526c509 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -704,6 +704,7 @@ public function getPartialCapture($countryCode = 'USA')
     /**
      * Map currency to API key config suffix name
      *
+     * @param string $currency_code
      * @return string
      */
     protected function getApiKeyNameByCurrency($currency_code)

From 3f1fc371d06f4024710470af42d79d6ff299e09d Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Sun, 21 Aug 2022 23:05:59 -0700
Subject: [PATCH 23/31] disable inline checkout edu modal

---
 Model/Config.php            | 11 +++++++++++
 Model/Ui/ConfigProvider.php |  2 +-
 etc/adminhtml/system.xml    |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Model/Config.php b/Model/Config.php
index 4526c509..8ced97d5 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -338,6 +338,16 @@ public function getScript()
             self::JS_URL_PRODUCTION;
     }
 
+    /**
+     * Get inline checkout edu modal (US only)
+     *
+     * @return bool
+     */
+    public function getEdu()
+    {
+        return ($this->getConfigData('edu') && $this->getCountryCode() == 'USA');
+    }
+
     public function getCountryCode()
     {
         $currency = $this->getCurrency();
@@ -662,6 +672,7 @@ public function getAllAsLowAsConfig()
             'currency_rate' => !$this->isCurrentStoreCurrencyUSD() ? $this->getUSDCurrencyRate() : null,
             'display_cart_subtotal_incl_tax' => (int)$this->taxConfig->displayCartSubtotalInclTax(),
             'display_cart_subtotal_excl_tax' => (int)$this->taxConfig->displayCartSubtotalExclTax(),
+            'edu' => $this->getEdu(),
             'locale' => $this->getLocale(),
             'country_code' => $this->getCountryCode(),
             'currency' => $this->getCurrency(),
diff --git a/Model/Ui/ConfigProvider.php b/Model/Ui/ConfigProvider.php
index 74ebfc5b..d33a12da 100644
--- a/Model/Ui/ConfigProvider.php
+++ b/Model/Ui/ConfigProvider.php
@@ -127,7 +127,7 @@ public function getConfig()
                     'logoSrc' => $this->config->getValue('icon'),
                     'info' => $this->config->getValue('info'),
                     'visibleType' => $this->config->getValue('control') ? true: false,
-                    'edu' => $this->config->getValue('edu') ? true : false
+                    'edu' => $this->affirmConfig->getEdu() ? true : false
                 ]
             ]
         ];
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index e61c88a2..cf30b003 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -183,7 +183,7 @@
                 <field id="edu" translate="label" type="select" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Inline Checkout Messaging</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Enable/Disable Inline checkout value props on the checkout page when Affirm is selected as a payment method</comment>
+                    <comment>Enable/Disable Inline checkout value props on the checkout page when Affirm is selected as a payment method (US only)</comment>
                 </field>
                 <group id="notification" translate="label" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Notification</label>

From 2e3e2b193768ae7ffad90e807a5e4187b1c25635 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Sun, 21 Aug 2022 23:07:55 -0700
Subject: [PATCH 24/31] adds desc for partial capture

---
 etc/adminhtml/system.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index cf30b003..8af84a33 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -126,9 +126,10 @@
                     <source_model>Astound\Affirm\Model\Adminhtml\Source\PaymentAction</source_model>
                 </field>
                 <field id="partial_capture" translate="label" type="select" sortOrder="71" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Enable Partial Capture (US only)</label>
+                    <label>Enable Partial Capture</label>
                     <depends><field id="payment_action">authorize</field></depends>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable/Disable partial capture in order invoices interface (requires auhorize only payment action; US only)</comment>
                 </field>
                 <field id="disable_for_backordered_items" translate="label" type="select" sortOrder="72" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Disable for backordered items</label>

From 525bf5ec3ca5387b81cca74f1fbe06d50ccc2dce Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Sun, 21 Aug 2022 23:39:08 -0700
Subject: [PATCH 25/31] replace hardcoded values with contants

---
 Model/Config.php | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/Model/Config.php b/Model/Config.php
index 8ced97d5..d64c5b2d 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -75,6 +75,13 @@ class Config implements ConfigInterface
     const KEY_MFP = 'affirm_mfp';
     const VALID_CURRENCIES = array('USD', 'CAD');
     const ACCEPTED_LOCALES = array('en_CA', 'fr_CA', 'en_US');
+    const COUNTRY_CODE_USA = 'USA';
+    const COUNTRY_CODE_CAN = 'CAN';
+    const CURRENCY_CODE_USD = 'USD';
+    const CURRENCY_CODE_CAD = 'CAD';
+    const LOCALE_EN_CA = 'en_CA';
+    const LOCALE_FR_CA = 'fr_CA';
+    const LOCALE_EN_US = 'en_US';
     const SUFFIX_CANADA = '_ca';
     const KEY_ASLOWAS_DEVELOPER = 'affirm_aslowas_developer';
     const KEY_PIXEL = 'affirm_pixel';
@@ -222,7 +229,7 @@ public function isCurrentStoreCurrencyUSD()
     {
         $currentCurrency = $this->storeManager->getStore()
             ->getCurrentCurrencyCode();
-        return $currentCurrency == 'USD';
+        return $currentCurrency == self::CURRENCY_CODE_USD;
     }
 
     /**
@@ -234,7 +241,7 @@ public function getUSDCurrencyRate()
     {
         $currentStore = $this->getCurrentStore();
         $currencyCode = $currentStore->getCurrentCurrencyCode();
-        $rate = $this->currency->getCurrencyRates('USD', $currencyCode);
+        $rate = $this->currency->getCurrencyRates(self::CURRENCY_CODE_USD, $currencyCode);
         return isset($rate[$currencyCode]) ? $rate[$currencyCode] : false;
     }
 
@@ -345,30 +352,30 @@ public function getScript()
      */
     public function getEdu()
     {
-        return ($this->getConfigData('edu') && $this->getCountryCode() == 'USA');
+        return ($this->getConfigData('edu') && $this->getCountryCode() == self::COUNTRY_CODE_USA);
     }
 
     public function getCountryCode()
     {
         $currency = $this->getCurrency();
-        if ($currency == 'CAD') {
-            return 'CAN';
+        if ($currency == self::CURRENCY_CODE_CAD) {
+            return self::COUNTRY_CODE_CAN;
         } else {
-            return 'USA';
+            return self::COUNTRY_CODE_USA;
         }
     }
 
     public function getLocale()
     {
         $currency = $this->getCurrency();
-        if ($currency == 'CAD') {
+        if ($currency == self::CURRENCY_CODE_CAD) {
             $currentLocale = $this->_store->getLocale();
             if (in_array($currentLocale, preg_grep('/(_CA)$/', self::ACCEPTED_LOCALES))) {
                 return $currentLocale;
             }
-            return 'en_CA';
+            return self::LOCALE_EN_CA;
         } else {
-            return 'en_US';
+            return self::LOCALE_EN_US;
         }
     }
 
@@ -707,9 +714,9 @@ public function getCheckoutFlowType()
      *
      * @return bool
      */
-    public function getPartialCapture($countryCode = 'USA')
+    public function getPartialCapture($countryCode = self::COUNTRY_CODE_USA)
     {
-        return $this->getConfigData('partial_capture') && $countryCode == 'USA';
+        return $this->getConfigData('partial_capture') && $countryCode == self::COUNTRY_CODE_USA;
     }
 
     /**
@@ -722,8 +729,8 @@ protected function getApiKeyNameByCurrency($currency_code)
     {
         $_suffix = '';
         $currencyCodeToSuffix = array(
-            'CAD' => self::SUFFIX_CANADA,
-            'USD' => '',
+            self::CURRENCY_CODE_CAD => self::SUFFIX_CANADA,
+            self::CURRENCY_CODE_USD => '',
         );
 
         if (isset($currency_code)) {

From 453a54882f025a4fc8bbc7e9c6da2a750f84c801 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Sun, 21 Aug 2022 23:40:55 -0700
Subject: [PATCH 26/31] use enum/constants

---
 Gateway/Http/AbstractTransferFactory.php    | 4 ++--
 Gateway/Request/AbstractDataBuilder.php     | 1 +
 Gateway/Request/AuthorizationRequest.php    | 2 +-
 Gateway/Request/CaptureRequest.php          | 2 +-
 Gateway/Request/PreAuthorizationRequest.php | 2 +-
 Gateway/Request/RefundRequest.php           | 2 +-
 Gateway/Request/VoidRequest.php             | 2 +-
 Helper/Payment.php                          | 3 ++-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Gateway/Http/AbstractTransferFactory.php b/Gateway/Http/AbstractTransferFactory.php
index 7ca75139..dde4795a 100644
--- a/Gateway/Http/AbstractTransferFactory.php
+++ b/Gateway/Http/AbstractTransferFactory.php
@@ -151,8 +151,8 @@ protected function getApiKeyNameByCountry($country_code)
     {
         $_suffix = '';
         $countryCodeToSuffix = array(
-            'CAN' => self::SUFFIX_CANADA,
-            'USA' => '',
+            self::COUNTRY_CODE_CAN => self::SUFFIX_CANADA,
+            self::COUNTRY_CODE_USA => '',
         );
 
         if (isset($country_code)) {
diff --git a/Gateway/Request/AbstractDataBuilder.php b/Gateway/Request/AbstractDataBuilder.php
index 1267fc4c..2a09002f 100644
--- a/Gateway/Request/AbstractDataBuilder.php
+++ b/Gateway/Request/AbstractDataBuilder.php
@@ -35,6 +35,7 @@ abstract class AbstractDataBuilder implements BuilderInterface
     const TRANSACTION_ID = 'transaction_id';
     const CHARGE_ID = 'charge_id';
     const COUNTRY_CODE = 'country_code';
+    const DEFAULT_COUNTRY_CODE = 'USA';
     /**#@-*/
 
     /**
diff --git a/Gateway/Request/AuthorizationRequest.php b/Gateway/Request/AuthorizationRequest.php
index 9c2ca3e1..ce927a53 100644
--- a/Gateway/Request/AuthorizationRequest.php
+++ b/Gateway/Request/AuthorizationRequest.php
@@ -44,7 +44,7 @@ public function build(array $buildSubject)
         $paymentDataObject = $buildSubject['payment'];
         $payment = $paymentDataObject->getPayment();
         $token = $payment->getAdditionalInformation(self::CHECKOUT_TOKEN);
-        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         return [
             'body' => [
                 self::TRANSACTION_ID => $token
diff --git a/Gateway/Request/CaptureRequest.php b/Gateway/Request/CaptureRequest.php
index 2f82c743..f37766c3 100644
--- a/Gateway/Request/CaptureRequest.php
+++ b/Gateway/Request/CaptureRequest.php
@@ -46,7 +46,7 @@ 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)?: 'USA';
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         $order = $payment->getOrder();
         $storeId = isset($order) ? $order->getStoreId() : $this->_storeManager->getStore()->getId();
         if (!$storeId) {
diff --git a/Gateway/Request/PreAuthorizationRequest.php b/Gateway/Request/PreAuthorizationRequest.php
index 6ccea8d9..a7fa8b89 100644
--- a/Gateway/Request/PreAuthorizationRequest.php
+++ b/Gateway/Request/PreAuthorizationRequest.php
@@ -49,7 +49,7 @@ public function build(array $buildSubject)
         $paymentDataObject = $buildSubject['payment'];
         $payment = $paymentDataObject->getPayment();
         $token = $payment->getAdditionalInformation(self::CHECKOUT_TOKEN);
-        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         return [
             'body' => '',
             'path' => $token,
diff --git a/Gateway/Request/RefundRequest.php b/Gateway/Request/RefundRequest.php
index 3c061e52..fbf05fdc 100644
--- a/Gateway/Request/RefundRequest.php
+++ b/Gateway/Request/RefundRequest.php
@@ -46,7 +46,7 @@ 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) ?: 'USA';
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         $creditMemoAmount = $payment->getCreditmemo()->getGrandTotal();
         $amountInCents = Util::formatToCents($creditMemoAmount);
         $order = $payment->getOrder();
diff --git a/Gateway/Request/VoidRequest.php b/Gateway/Request/VoidRequest.php
index 07c5004d..50e1aed3 100644
--- a/Gateway/Request/VoidRequest.php
+++ b/Gateway/Request/VoidRequest.php
@@ -45,7 +45,7 @@ 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) ?: 'USA';
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         $order = $payment->getOrder();
         if($order) {
             $storeId = $order->getStoreId();
diff --git a/Helper/Payment.php b/Helper/Payment.php
index 4a367ab9..0a217105 100644
--- a/Helper/Payment.php
+++ b/Helper/Payment.php
@@ -41,6 +41,7 @@ class Payment
      * Region (country) code for address validation
      */
     const VALID_REGIONS = array('US', 'CA');
+    const DEFAULT_REGION = 'US';
 
     /**
      * Affirm payment facade
@@ -311,7 +312,7 @@ public function getConfigurableProductBackordersOptions(Product $product = null)
     public function validateVirtual()
     {
         if ($this->quote->getIsVirtual() && !$this->quote->getCustomerIsGuest()) {
-            $countryId = '';
+            $countryId = self::DEFAULT_REGION;
             // get customer addresses list
             $addresses = $this->quote->getCustomer()->getAddresses();
             // get default shipping address for the customer

From e5154df3ea11e58ae0636a3dd7f4e410abb19529 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Sun, 21 Aug 2022 23:41:18 -0700
Subject: [PATCH 27/31] doc/comments

---
 Gateway/Validator/Client/PaymentActionsValidator.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Gateway/Validator/Client/PaymentActionsValidator.php b/Gateway/Validator/Client/PaymentActionsValidator.php
index 7656c0ae..260f5e2d 100644
--- a/Gateway/Validator/Client/PaymentActionsValidator.php
+++ b/Gateway/Validator/Client/PaymentActionsValidator.php
@@ -27,7 +27,10 @@
 class PaymentActionsValidator extends AbstractResponseValidator
 {
     /**
-     * @inheritdoc
+     * Validate response
+     *
+     * @param array $validationSubject
+     * @return \Magento\Payment\Gateway\Validator\ResultInterface
      */
     public function validate(array $validationSubject)
     {
@@ -38,17 +41,17 @@ public function validate(array $validationSubject)
             || (isset($response['status']) && $response['status'] == 'authorized')
             || (isset($response['type']) && $response['type'] == 'capture'))
         {
-            // Pre-Auth/Auth/Capture
+            // Pre-Auth/Auth/Capture uses amount_ordered from payment
             $_payment = $validationSubject['payment']->getPayment();
             $payment_data = $_payment->getData();
             $amount = $payment_data['amount_ordered'];
         } elseif ( (isset($response['type']) && $response['type'] == 'refund') ) {
-            // Refund (including partial)
+            // Refund (including partial) uses grand_total from creditmemo (credit memo invoice)
             $_payment = $validationSubject['payment']->getPayment();
             $_creditMemo = $_payment->getData()['creditmemo'];
             $amount = $_creditMemo->getGrandTotal();
         } else {
-            // Partial capture (US only)
+            // Partial capture (US only) uses validationSubject
             $amount = SubjectReader::readAmount($validationSubject);
         }
 

From 4b80b2555afb3d2f4a1b1c72c3a4195c65eb729a Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Mon, 22 Aug 2022 00:11:49 -0700
Subject: [PATCH 28/31] format helper to include currency param

---
 Block/Promotion/AslowasAbstract.php     |  3 +-
 Block/Promotion/CartPage/Aslowas.php    |  2 +-
 Block/Promotion/ProductPage/Aslowas.php |  2 +-
 Gateway/Helper/Util.php                 |  7 +++-
 Model/Plugin/Category/ViewAbstract.php  |  1 +
 view/frontend/web/js/aslowasMC.js       |  1 +
 view/frontend/web/js/model/aslowas.js   | 43 +++++++++++++++++--------
 7 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/Block/Promotion/AslowasAbstract.php b/Block/Promotion/AslowasAbstract.php
index d5738240..1d337d34 100644
--- a/Block/Promotion/AslowasAbstract.php
+++ b/Block/Promotion/AslowasAbstract.php
@@ -23,7 +23,7 @@ abstract class AslowasAbstract extends \Magento\Framework\View\Element\Template
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key', 'country_code', 'locale'];
+    protected $data = ['logo', 'script', 'public_api_key', 'country_code', 'locale', 'currency'];
 
     /**
      * Colors which could be set in "data-affirm-color".
@@ -210,6 +210,7 @@ public function process()
                 $this->setData('public_api_key', $config['apiKeyPublic']);
                 $this->setData('country_code', $config['countryCode']);
                 $this->setData('locale', $config['locale']);
+                $this->setData('currency', $config['currency']);
             }
             // Set max and min options amounts from payment configuration
             $this->setData('min_order_total', $this->getPaymentConfigValue('min_order_total'));
diff --git a/Block/Promotion/CartPage/Aslowas.php b/Block/Promotion/CartPage/Aslowas.php
index f1b6ae7c..36237a43 100644
--- a/Block/Promotion/CartPage/Aslowas.php
+++ b/Block/Promotion/CartPage/Aslowas.php
@@ -21,7 +21,7 @@ class Aslowas extends AslowasAbstract
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total', 'element_id', 'country_code', 'locale'];
+    protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total', 'element_id', 'country_code', 'locale', 'currency'];
 
     /**
      * Checkout session
diff --git a/Block/Promotion/ProductPage/Aslowas.php b/Block/Promotion/ProductPage/Aslowas.php
index 60eabc46..f47c3763 100644
--- a/Block/Promotion/ProductPage/Aslowas.php
+++ b/Block/Promotion/ProductPage/Aslowas.php
@@ -33,7 +33,7 @@ class Aslowas extends AslowasAbstract
      * @var array
      */
     protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total',
-            'selector', 'currency_rate', 'backorders_options', 'element_id', 'country_code', 'locale'];
+            'selector', 'currency_rate', 'backorders_options', 'element_id', 'country_code', 'locale', 'currency'];
 
     /**
      * Validate block before showing on front
diff --git a/Gateway/Helper/Util.php b/Gateway/Helper/Util.php
index e1e389ea..fa6cf3d0 100644
--- a/Gateway/Helper/Util.php
+++ b/Gateway/Helper/Util.php
@@ -40,6 +40,11 @@ class Util
      */
     const COUNTRY_CODE = "Country-Code";
 
+    /**
+     * USD currency code
+     */
+    const CURRENCY_CODE_USD = "USD";
+
     /**
      * Constructor
      *
@@ -57,7 +62,7 @@ public function __construct(
      * @param int $amount
      * @return int
      */
-    public static function formatToCents($amount = 0)
+    public static function formatToCents($amount = 0, $currencyCode = self::CURRENCY_CODE_USD)
     {
         $negative = false;
         $str = self::formatMoney($amount);
diff --git a/Model/Plugin/Category/ViewAbstract.php b/Model/Plugin/Category/ViewAbstract.php
index 78f9165f..064a2955 100755
--- a/Model/Plugin/Category/ViewAbstract.php
+++ b/Model/Plugin/Category/ViewAbstract.php
@@ -100,6 +100,7 @@ public function __construct(
                 $this->setData('public_api_key', $config['apiKeyPublic']);
                 $this->setData('country_code', $config['countryCode']);
                 $this->setData('locale', $config['locale']);
+                $this->setData('currency', $config['currency']);
             }
             // Set max and min options amounts from payment configuration
             $this->setData('min_order_total', $this->getPaymentConfigValue('min_order_total'));
diff --git a/view/frontend/web/js/aslowasMC.js b/view/frontend/web/js/aslowasMC.js
index d9c0b89e..d75a86e4 100644
--- a/view/frontend/web/js/aslowasMC.js
+++ b/view/frontend/web/js/aslowasMC.js
@@ -54,6 +54,7 @@ define(["jquery",
                 public_api_key: (window.checkout && window.checkout.public_api_key) ? window.checkout.public_api_key : null,
                 country_code: (window.checkout && window.checkout.country_code) ? window.checkout.country_code : null,
                 locale: (window.checkout && window.checkout.locale) ? window.checkout.locale : null,
+                currency: (window.checkout && window.checkout.currency) ? window.checkout.currency : null,
                 min_order_total: (window.checkout && window.checkout.min_order_total) ? window.checkout.min_order_total : null,
                 max_order_total: (window.checkout && window.checkout.max_order_total) ? window.checkout.max_order_total : null,
                 currency_rate: (window.checkout && window.checkout.currency_rate) ? window.checkout.currency_rate : null,
diff --git a/view/frontend/web/js/model/aslowas.js b/view/frontend/web/js/model/aslowas.js
index bbd94289..ac4cd5ea 100644
--- a/view/frontend/web/js/model/aslowas.js
+++ b/view/frontend/web/js/model/aslowas.js
@@ -31,25 +31,24 @@ define([
              */
             process: function(price, options) {
                 self = this;
-                var formatted, priceInt, optionsPrice, priceStr;
-
-                priceStr = price.replace(/^(-)|[^0-9.,]+/g, '$1').trim();
-                var result = priceStr.replace(/[^0-9]/g, '');
-                if (/[,\.]\d{2}$/.test(priceStr)) {
-                    result = result.replace(/(\d{2})$/, '.$1'); // restore decimal point
-                }
-                formatted = parseFloat(result);
-                priceInt = formatted.toFixed(2) * 100;
-
-                if (options) {
-                    self.options = options;
-                }
-
+                var priceInt, optionsPrice, currency;
+                
+                priceInt = this.formatToPriceInt(price);
+                
                 /**
                  * Specify options
                  *
                  * @type {{apr: (*|apr), months: (*|months|c.months|.step.months|gc.months|._data.months), amount: number}}
                  */
+                if (options) {
+                    self.options = options;
+                }
+
+                if (options && typeof options.currency !== 'undefined') {
+                    currency = options.currency
+                }
+                priceInt = this.formatToPriceInt(price, currency);
+
                 optionsPrice = {
                     element_id: (options.element_id ? options.element_id : ''),
                     color_id: (options.color_id ? options.color_id : ''),
@@ -63,6 +62,22 @@ define([
                 }
             },
 
+            /**
+             * Helper function to format price to amount integer
+             */
+            formatToPriceInt: function (price, currency) {
+                var formatted, priceStr;
+
+                priceStr = price.replace(/^(-)|[^0-9.,]+/g, '$1').trim();
+                var result = priceStr.replace(/[^0-9]/g, '');
+                if (/[,\.]\d{2}$/.test(priceStr)) {
+                    result = result.replace(/(\d{2})$/, '.$1'); // restore decimal point
+                }
+                formatted = parseFloat(result);
+                return formatted.toFixed(2) * 100;
+            },
+
+
             /**
              * Hide As Low As
              */

From 629ff9ca7dba11e88d22e5d7423fcea7f0eb988f Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Mon, 22 Aug 2022 12:03:57 -0700
Subject: [PATCH 29/31] Revert "format helper to include currency param"

This reverts commit 4b80b2555afb3d2f4a1b1c72c3a4195c65eb729a.
---
 Block/Promotion/AslowasAbstract.php     |  3 +-
 Block/Promotion/CartPage/Aslowas.php    |  2 +-
 Block/Promotion/ProductPage/Aslowas.php |  2 +-
 Gateway/Helper/Util.php                 |  7 +---
 Model/Plugin/Category/ViewAbstract.php  |  1 -
 view/frontend/web/js/aslowasMC.js       |  1 -
 view/frontend/web/js/model/aslowas.js   | 43 ++++++++-----------------
 7 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/Block/Promotion/AslowasAbstract.php b/Block/Promotion/AslowasAbstract.php
index 1d337d34..d5738240 100644
--- a/Block/Promotion/AslowasAbstract.php
+++ b/Block/Promotion/AslowasAbstract.php
@@ -23,7 +23,7 @@ abstract class AslowasAbstract extends \Magento\Framework\View\Element\Template
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key', 'country_code', 'locale', 'currency'];
+    protected $data = ['logo', 'script', 'public_api_key', 'country_code', 'locale'];
 
     /**
      * Colors which could be set in "data-affirm-color".
@@ -210,7 +210,6 @@ public function process()
                 $this->setData('public_api_key', $config['apiKeyPublic']);
                 $this->setData('country_code', $config['countryCode']);
                 $this->setData('locale', $config['locale']);
-                $this->setData('currency', $config['currency']);
             }
             // Set max and min options amounts from payment configuration
             $this->setData('min_order_total', $this->getPaymentConfigValue('min_order_total'));
diff --git a/Block/Promotion/CartPage/Aslowas.php b/Block/Promotion/CartPage/Aslowas.php
index 36237a43..f1b6ae7c 100644
--- a/Block/Promotion/CartPage/Aslowas.php
+++ b/Block/Promotion/CartPage/Aslowas.php
@@ -21,7 +21,7 @@ class Aslowas extends AslowasAbstract
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total', 'element_id', 'country_code', 'locale', 'currency'];
+    protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total', 'element_id', 'country_code', 'locale'];
 
     /**
      * Checkout session
diff --git a/Block/Promotion/ProductPage/Aslowas.php b/Block/Promotion/ProductPage/Aslowas.php
index f47c3763..60eabc46 100644
--- a/Block/Promotion/ProductPage/Aslowas.php
+++ b/Block/Promotion/ProductPage/Aslowas.php
@@ -33,7 +33,7 @@ class Aslowas extends AslowasAbstract
      * @var array
      */
     protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total',
-            'selector', 'currency_rate', 'backorders_options', 'element_id', 'country_code', 'locale', 'currency'];
+            'selector', 'currency_rate', 'backorders_options', 'element_id', 'country_code', 'locale'];
 
     /**
      * Validate block before showing on front
diff --git a/Gateway/Helper/Util.php b/Gateway/Helper/Util.php
index fa6cf3d0..e1e389ea 100644
--- a/Gateway/Helper/Util.php
+++ b/Gateway/Helper/Util.php
@@ -40,11 +40,6 @@ class Util
      */
     const COUNTRY_CODE = "Country-Code";
 
-    /**
-     * USD currency code
-     */
-    const CURRENCY_CODE_USD = "USD";
-
     /**
      * Constructor
      *
@@ -62,7 +57,7 @@ public function __construct(
      * @param int $amount
      * @return int
      */
-    public static function formatToCents($amount = 0, $currencyCode = self::CURRENCY_CODE_USD)
+    public static function formatToCents($amount = 0)
     {
         $negative = false;
         $str = self::formatMoney($amount);
diff --git a/Model/Plugin/Category/ViewAbstract.php b/Model/Plugin/Category/ViewAbstract.php
index 064a2955..78f9165f 100755
--- a/Model/Plugin/Category/ViewAbstract.php
+++ b/Model/Plugin/Category/ViewAbstract.php
@@ -100,7 +100,6 @@ public function __construct(
                 $this->setData('public_api_key', $config['apiKeyPublic']);
                 $this->setData('country_code', $config['countryCode']);
                 $this->setData('locale', $config['locale']);
-                $this->setData('currency', $config['currency']);
             }
             // Set max and min options amounts from payment configuration
             $this->setData('min_order_total', $this->getPaymentConfigValue('min_order_total'));
diff --git a/view/frontend/web/js/aslowasMC.js b/view/frontend/web/js/aslowasMC.js
index d75a86e4..d9c0b89e 100644
--- a/view/frontend/web/js/aslowasMC.js
+++ b/view/frontend/web/js/aslowasMC.js
@@ -54,7 +54,6 @@ define(["jquery",
                 public_api_key: (window.checkout && window.checkout.public_api_key) ? window.checkout.public_api_key : null,
                 country_code: (window.checkout && window.checkout.country_code) ? window.checkout.country_code : null,
                 locale: (window.checkout && window.checkout.locale) ? window.checkout.locale : null,
-                currency: (window.checkout && window.checkout.currency) ? window.checkout.currency : null,
                 min_order_total: (window.checkout && window.checkout.min_order_total) ? window.checkout.min_order_total : null,
                 max_order_total: (window.checkout && window.checkout.max_order_total) ? window.checkout.max_order_total : null,
                 currency_rate: (window.checkout && window.checkout.currency_rate) ? window.checkout.currency_rate : null,
diff --git a/view/frontend/web/js/model/aslowas.js b/view/frontend/web/js/model/aslowas.js
index ac4cd5ea..bbd94289 100644
--- a/view/frontend/web/js/model/aslowas.js
+++ b/view/frontend/web/js/model/aslowas.js
@@ -31,24 +31,25 @@ define([
              */
             process: function(price, options) {
                 self = this;
-                var priceInt, optionsPrice, currency;
-                
-                priceInt = this.formatToPriceInt(price);
-                
+                var formatted, priceInt, optionsPrice, priceStr;
+
+                priceStr = price.replace(/^(-)|[^0-9.,]+/g, '$1').trim();
+                var result = priceStr.replace(/[^0-9]/g, '');
+                if (/[,\.]\d{2}$/.test(priceStr)) {
+                    result = result.replace(/(\d{2})$/, '.$1'); // restore decimal point
+                }
+                formatted = parseFloat(result);
+                priceInt = formatted.toFixed(2) * 100;
+
+                if (options) {
+                    self.options = options;
+                }
+
                 /**
                  * Specify options
                  *
                  * @type {{apr: (*|apr), months: (*|months|c.months|.step.months|gc.months|._data.months), amount: number}}
                  */
-                if (options) {
-                    self.options = options;
-                }
-
-                if (options && typeof options.currency !== 'undefined') {
-                    currency = options.currency
-                }
-                priceInt = this.formatToPriceInt(price, currency);
-
                 optionsPrice = {
                     element_id: (options.element_id ? options.element_id : ''),
                     color_id: (options.color_id ? options.color_id : ''),
@@ -62,22 +63,6 @@ define([
                 }
             },
 
-            /**
-             * Helper function to format price to amount integer
-             */
-            formatToPriceInt: function (price, currency) {
-                var formatted, priceStr;
-
-                priceStr = price.replace(/^(-)|[^0-9.,]+/g, '$1').trim();
-                var result = priceStr.replace(/[^0-9]/g, '');
-                if (/[,\.]\d{2}$/.test(priceStr)) {
-                    result = result.replace(/(\d{2})$/, '.$1'); // restore decimal point
-                }
-                formatted = parseFloat(result);
-                return formatted.toFixed(2) * 100;
-            },
-
-
             /**
              * Hide As Low As
              */

From 0bc865efefe765dc8d7f0cc784a62f6c8bc1318c Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Mon, 22 Aug 2022 13:30:18 -0700
Subject: [PATCH 30/31] helper to format price

---
 view/frontend/web/js/model/aslowas.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/view/frontend/web/js/model/aslowas.js b/view/frontend/web/js/model/aslowas.js
index bbd94289..c084524d 100644
--- a/view/frontend/web/js/model/aslowas.js
+++ b/view/frontend/web/js/model/aslowas.js
@@ -31,15 +31,10 @@ define([
              */
             process: function(price, options) {
                 self = this;
-                var formatted, priceInt, optionsPrice, priceStr;
+                var priceInt, optionsPrice;
 
-                priceStr = price.replace(/^(-)|[^0-9.,]+/g, '$1').trim();
-                var result = priceStr.replace(/[^0-9]/g, '');
-                if (/[,\.]\d{2}$/.test(priceStr)) {
-                    result = result.replace(/(\d{2})$/, '.$1'); // restore decimal point
-                }
-                formatted = parseFloat(result);
-                priceInt = formatted.toFixed(2) * 100;
+                // Format price to cents
+                priceInt = this.formatToPriceInt(price);
 
                 if (options) {
                     self.options = options;
@@ -63,6 +58,21 @@ define([
                 }
             },
 
+            /**
+             * Helper function to format price to amount integer
+             */
+             formatToPriceInt: function (price) {
+                var formatted, priceStr;
+
+                priceStr = price.replace(/^(-)|[^0-9.,]+/g, '$1').trim();
+                var result = priceStr.replace(/[^0-9]/g, '');
+                if (/[,\.]\d{2}$/.test(priceStr)) {
+                    result = result.replace(/(\d{2})$/, '.$1'); // restore decimal point
+                }
+                formatted = parseFloat(result);
+                return formatted.toFixed(2) * 100;
+            },
+
             /**
              * Hide As Low As
              */

From a436a2eaa24d175d57dd03e73410b7e103712bc2 Mon Sep 17 00:00:00 2001
From: taehyunlim <tae.lim@affirm.com>
Date: Mon, 22 Aug 2022 14:06:14 -0700
Subject: [PATCH 31/31] version bump 3.2.0

---
 composer.json  | 2 +-
 etc/module.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index f60f413f..e7bfd78b 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "affirm/magento2",
     "description": "Affirm's extension for the Magento 2 https://www.affirm.com/",
     "type": "magento2-module",
-    "version": "3.1.3",
+    "version": "3.2.0",
     "license": [
         "BSD-3-Clause"
     ],
diff --git a/etc/module.xml b/etc/module.xml
index 747f9103..7f881d46 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -10,7 +10,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Astound_Affirm" setup_version="3.1.3">
+    <module name="Astound_Affirm" setup_version="3.2.0">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>