Merge pull request #88 from Affirm/bugfix_PT-4099

Refactor accessing country code data from payment attribute
Affirm · Oct 6, 2022 · 78b777f · 78b777f
2 parents ac76b3f + 5d377de
commit 78b777f
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/Model/Plugin/Payment/CanCapturePartial.php b/Model/Plugin/Payment/CanCapturePartial.php
@@ -19,6 +19,11 @@
  */
 class CanCapturePartial
 {
+  /**
+   * Define constants
+   */
+  const DEFAULT_COUNTRY_CODE = 'USA';
+
   /**
    * Constructor
    *
@@ -40,8 +45,12 @@ public function __construct(
    */
   public function afterCanCapturePartial(Payment $subject, $result)
   {
-    $countryCode = $subject->getData()['additional_information']['country_code'] ?: 'USA';
-    if (!$this->affirmPaymentConfig->getPartialCapture() || $countryCode != 'USA') {
+    $countryCode = self::DEFAULT_COUNTRY_CODE;
+    if (isset($subject->getData()['additional_information']['country_code'])) {
+      $countryCode = $subject->getData()['additional_information']['country_code'];
+    }
+
+    if (!$this->affirmPaymentConfig->getPartialCapture() || $countryCode != self::DEFAULT_COUNTRY_CODE) {
       return false;
     }
     return $result;