Merge pull request #517 from pagarme/fix-bugs-address-and-checkoutblocks

fix: bugs address and checkoutblocks
pagarme · Nov 19, 2024 · 016ca1c · 016ca1c
2 parents e11d22e + caaa8b2
commit 016ca1c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/src/Action/CustomerFieldsActions.php b/src/Action/CustomerFieldsActions.php
@@ -91,8 +91,8 @@ public function addDocumentField(array $fields): array
     public function addDocumentFieldOnCheckoutBlocks()
     {
         if (
-            Utils::isCheckoutBlocksActive() &&
-            ($this->customerFields->hasCheckoutBlocksDocumentField()
+            !Utils::isCheckoutBlocksActive()
+            && ($this->customerFields->hasCheckoutBlocksDocumentField()
             || !function_exists('woocommerce_register_additional_checkout_field'))
         ) {
             return;

diff --git a/src/Service/CustomerService.php b/src/Service/CustomerService.php
@@ -119,7 +119,7 @@ public function getCustomerDocumentByOrder($wcOrder)
         if (empty($document)) {
             throw new \InvalidArgumentException(__("Please, enter a valid document number.", 'woo-pagarme-payments'), 1);
         }
-        return $document;    
+        return $document;
     }
 
     public function saveOnPlatform($customer)

diff --git a/vendor/pagarme/ecommerce-module-core/src/Kernel/Services/APIService.php b/vendor/pagarme/ecommerce-module-core/src/Kernel/Services/APIService.php
@@ -172,8 +172,10 @@ private function getRequestMetaData($orderRequest)
         $metadata->moduleVersion = $versionService->getModuleVersion();
         $metadata->coreVersion = $versionService->getCoreVersion();
         $metadata->platformVersion = $versionService->getPlatformVersion();
-        $metadata->checkoutBlocks = CartCheckoutUtils::is_checkout_block_default();
-        if($this->hasCreditCardInPayments($orderRequest->payments) && !empty(MPSetup::getInstallmentType())){
+        $metadata->checkoutBlocks = class_exists("\Automattic\WooCommerce\Blocks\Utils\CartCheckoutUtils")
+            && CartCheckoutUtils::is_checkout_block_default();
+
+        if ($this->hasCreditCardInPayments($orderRequest->payments) && !empty(MPSetup::getInstallmentType())) {
             $metadata->interestType = MPSetup::getInstallmentType();
         }
         return $metadata;
@@ -182,7 +184,7 @@ private function getRequestMetaData($orderRequest)
     private function hasCreditCardInPayments($payments)
     {
         foreach ($payments as $payment) {
-            if($payment->paymentMethod === TransactionType::CREDIT_CARD) {
+            if ($payment->paymentMethod === TransactionType::CREDIT_CARD) {
                 return true;
             }
         }

diff --git a/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Address.php b/vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Address.php
@@ -78,16 +78,6 @@ public function setNumber($number)
 
         $this->number = substr($numberWithoutLineBreaks, 0, 15);
 
-        if (empty(trim($this->number))) {
-            $inputName = $this->i18n->getDashboard('number');
-            $message = $this->i18n->getDashboard(
-                "The %s should not be empty!",
-                $inputName
-            );
-
-            throw new \Exception($message, 400);
-        }
-
         return $this;
     }