Merge pull request PAYONE-GmbH#533 from FatchipRobert/MAG2-305-Paydirekt

MAG2-305 - Paydirekt is now Giropay
FatchipRobert · Mar 26, 2024 · ca57a22 · ca57a22
2 parents df86f21 + 8662b16
commit ca57a22
Show file tree

Hide file tree

Showing 29 changed files with 79 additions and 1,197 deletions.
diff --git a/Block/Onepage/Review.php b/Block/Onepage/Review.php
@@ -337,19 +337,6 @@ public function getFingerprintJsUrl()
         return $asset->getUrl();
     }
 
-    /**
-     * Check if paydirekt email message has to be shown
-     *
-     * @return bool
-     */
-    public function showPaydirektEmailMessage()
-    {
-        if ($this->_quote->getPayment()->getMethod() == PayoneConfig::METHOD_PAYDIREKT && $this->databaseHelper->getPaydirektOneklickOrderCount($this->_quote->getCustomerId()) == 0) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Retrieve payment method and assign additional template values
      *

diff --git a/Block/Paydirekt/OneklickButton.php b/Block/Paydirekt/OneklickButton.php
diff --git a/Controller/Paydirekt/Agreement.php b/Controller/Paydirekt/Agreement.php
diff --git a/Helper/Database.php b/Helper/Database.php
@@ -389,24 +389,4 @@ public function markUserAsRegisteredWithPaydirekt($iCustomerId)
         $where = ['entity_id = ?' => $iCustomerId];
         return $this->getDb()->update($table, $data, $where);
     }
-
-    /**
-     * Selects count of paydirekt oneclick orders from database
-     *
-     * @param  int $iCustomerId
-     * @return int
-     */
-    public function getPaydirektOneklickOrderCount($iCustomerId)
-    {
-        $oSelect = $this->getDb()
-            ->select()
-            ->from($this->databaseResource->getTableName('sales_order'), ['COUNT(entity_id)'])
-            ->where("customer_id = :customerId")
-            ->where("payone_express_type = :expressType");
-        $iCount = $this->getDb()->fetchOne($oSelect, ['customerId' => $iCustomerId, 'expressType' => PayoneConfig::METHOD_PAYDIREKT]);
-        if ($iCount === null) {
-            return 0;
-        }
-        return $iCount;
-    }
 }
diff --git a/Helper/Payment.php b/Helper/Payment.php
@@ -48,7 +48,7 @@ class Payment extends \Payone\Core\Helper\Base
         PayoneConfig::METHOD_ADVANCE_PAYMENT,
         PayoneConfig::METHOD_INVOICE,
         PayoneConfig::METHOD_OBT_SOFORTUEBERWEISUNG,
-        PayoneConfig::METHOD_OBT_GIROPAY,
+        #PayoneConfig::METHOD_OBT_GIROPAY,#Giropay has been disabled, Paydirekt is now Giropay
         PayoneConfig::METHOD_OBT_EPS,
         PayoneConfig::METHOD_OBT_POSTFINANCE_EFINANCE,
         PayoneConfig::METHOD_OBT_POSTFINANCE_CARD,