fix: remove subscritpion on googlepay and fix order repository

pagarme · Sep 26, 2024 · fd6e2ca · fd6e2ca
2 parents 78b5b84 + df473ea
commit fd6e2ca
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/Block/Checkout/Payment/CreditCard.php b/src/Block/Checkout/Payment/CreditCard.php
@@ -12,6 +12,7 @@
 namespace Woocommerce\Pagarme\Block\Checkout\Payment;
 
 use Woocommerce\Pagarme\Block\Checkout\Gateway;
+use Woocommerce\Pagarme\Model\Subscription;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -33,4 +34,9 @@ public function getQtyCards()
     {
         return 1;
     }
+
+    public function hasSubscriptionProductInCart()
+    {
+        return Subscription::hasSubscriptionProductInCart();
+    }
 }
diff --git a/templates/checkout/payment/credit-card.phtml b/templates/checkout/payment/credit-card.phtml
@@ -28,17 +28,13 @@ wp_localize_script(
     ]
 );
 
-if($this->getConfig()->getEnableGooglepay()  == "yes"):
-?>
-
-
-<div id="pagarme-googlepay"></div>
-<div class="pagarme_creditcard_divider">
-    <p>
-        <?=__("Or pay with card", 'woo-pagarme-payments')?>
-    </p>
-</div>
-
+if ( $this->getConfig()->getEnableGooglepay()  == "yes" && !$this->hasSubscriptionProductInCart() ) : ?>
+    <div id="pagarme-googlepay"></div>
+    <div class="pagarme_creditcard_divider">
+        <p>
+            <?=__("Or pay with card", 'woo-pagarme-payments')?>
+        </p>
+    </div>
 <?php
 endif; // Enable or disable googlepay
 $this->createBlock(

diff --git a/vendor/pagarme/ecommerce-module-core/src/Kernel/Repositories/OrderRepository.php b/vendor/pagarme/ecommerce-module-core/src/Kernel/Repositories/OrderRepository.php
@@ -119,7 +119,7 @@ public function findByPlatformId($platformID)
         $orderTable = $this->db->getTable(AbstractDatabaseDecorator::TABLE_ORDER);
         $platformID = filter_var($platformID, FILTER_SANITIZE_SPECIAL_CHARS);
         $query = "SELECT * FROM `$orderTable` ";
-        $query .= "WHERE code = '{$platformID}';";
+        $query .= "WHERE code = '{$platformID}' ORDER BY id DESC;";
 
         $result = $this->db->fetch($query);