fixed type mismatch (#50)

Co-authored-by: Karol Wojciechowski <[email protected]>
tpay-com · Apr 16, 2024 · cf3258d · cf3258d
1 parent e15ed6f
commit cf3258d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.0.3
+2.0.4
diff --git a/Model/TpayPayment.php b/Model/TpayPayment.php
@@ -237,17 +237,15 @@ public function isAvailable(?CartInterface $quote = null)
 
     public function assignData(DataObject $data)
     {
-        $additionalData = $data->getData('additional_data');
-
         $info = $this->getInfoInstance();
-
+        $additionalData = array_merge($info->getAdditionalInformation(), $data->getData('additional_data'));
         $info->setAdditionalInformation(static::GROUP, array_key_exists(static::GROUP, $additionalData) ? $additionalData[static::GROUP] : '');
         $info->setAdditionalInformation(static::BLIK_CODE, array_key_exists(static::BLIK_CODE, $additionalData) ? $additionalData[static::BLIK_CODE] : '');
         $info->setAdditionalInformation(static::CHANNEL, $additionalData[static::CHANNEL] ?? null);
-        $info->setAdditionalInformation(static::TERMS_ACCEPT, isset($additionalData[static::TERMS_ACCEPT]) ? '1' === $additionalData[static::TERMS_ACCEPT] : false);
+        $info->setAdditionalInformation(static::TERMS_ACCEPT, isset($additionalData[static::TERMS_ACCEPT]) ? (bool) ($additionalData[static::TERMS_ACCEPT]) : false);
         $info->setAdditionalInformation(static::CARDDATA, $additionalData[static::CARDDATA] ?? '');
         $info->setAdditionalInformation(static::CARD_VENDOR, isset($additionalData[static::CARD_VENDOR]) && in_array($additionalData[static::CARD_VENDOR], $this->supportedVendors) ? $additionalData[static::CARD_VENDOR] : 'undefined');
-        $info->setAdditionalInformation(static::CARD_SAVE, isset($additionalData[static::CARD_SAVE]) ? '1' === $additionalData[static::CARD_SAVE] : false);
+        $info->setAdditionalInformation(static::CARD_SAVE, isset($additionalData[static::CARD_SAVE]) ? (bool) ($additionalData[static::CARD_SAVE]) : false);
         $info->setAdditionalInformation(static::CARD_ID, isset($additionalData[static::CARD_ID]) && is_numeric($additionalData[static::CARD_ID]) ? $additionalData[static::CARD_ID] : false);
         $info->setAdditionalInformation(static::SHORT_CODE, isset($additionalData[static::SHORT_CODE]) && is_numeric($additionalData[static::SHORT_CODE]) ? '****'.$additionalData[static::SHORT_CODE] : false);