From 7483767d42bdbe6201083724f98e999aec59ca55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Mon, 27 Jan 2025 12:03:00 +0100 Subject: [PATCH] MAG2-333 - Removed Paydirekt --- Block/Onepage/Review.php | 13 --- Controller/Onepage/Review.php | 1 - Helper/Database.php | 15 --- Helper/Payment.php | 2 - Model/Api/Request/Authorization.php | 2 +- Model/Methods/Paydirekt.php | 104 ------------------ Model/Methods/PayoneMethod.php | 1 - Model/PayoneConfig.php | 1 - Setup/UpgradeData.php | 19 ---- Setup/UpgradeSchema.php | 14 --- Test/Unit/Block/Onepage/ReviewTest.php | 16 +-- Test/Unit/Helper/DatabaseTest.php | 10 -- Test/Unit/Model/ConfigProviderTest.php | 2 - Test/Unit/Model/Methods/BaseMethodTest.php | 17 ++- Test/Unit/Model/Methods/PaydirektTest.php | 88 --------------- Test/Unit/Model/Methods/PayoneMethodTest.php | 10 +- etc/adminhtml/system.xml | 6 - etc/adminhtml/system/payone_paydirekt.xml | 75 ------------- etc/config.xml | 15 --- etc/payment.xml | 3 - i18n/de_DE.csv | 2 - view/frontend/layout/checkout_index_index.xml | 3 - view/frontend/templates/onepage/review.phtml | 18 --- view/frontend/web/images/paydirekt.png | Bin 6318 -> 0 bytes .../method-renderer/paydirekt-method.js | 43 -------- .../web/js/view/payment/payone-payments.js | 4 - .../web/template/payment/paydirekt.html | 89 --------------- 27 files changed, 15 insertions(+), 558 deletions(-) delete mode 100644 Model/Methods/Paydirekt.php delete mode 100644 Test/Unit/Model/Methods/PaydirektTest.php delete mode 100644 etc/adminhtml/system/payone_paydirekt.xml delete mode 100644 view/frontend/web/images/paydirekt.png delete mode 100644 view/frontend/web/js/view/payment/method-renderer/paydirekt-method.js delete mode 100644 view/frontend/web/template/payment/paydirekt.html diff --git a/Block/Onepage/Review.php b/Block/Onepage/Review.php index 77dc17f4..6f10c431 100644 --- a/Block/Onepage/Review.php +++ b/Block/Onepage/Review.php @@ -309,19 +309,6 @@ public function isPayPalExpress() return false; } - /** - * Check if paypal express is used - * - * @return bool - */ - public function isPaydirekt() - { - if ($this->_quote->getPayment()->getMethod() == PayoneConfig::METHOD_PAYDIREKT) { - return true; - } - return false; - } - /** * Generate URL to the fingerprint.js Javascript file * diff --git a/Controller/Onepage/Review.php b/Controller/Onepage/Review.php index 494bf149..406963b0 100644 --- a/Controller/Onepage/Review.php +++ b/Controller/Onepage/Review.php @@ -70,7 +70,6 @@ class Review extends \Magento\Framework\App\Action\Action protected $availableReviewMethods = [ PayoneConfig::METHOD_PAYPAL, PayoneConfig::METHOD_PAYPALV2, - PayoneConfig::METHOD_PAYDIREKT, PayoneConfig::METHOD_AMAZONPAYV2, ]; diff --git a/Helper/Database.php b/Helper/Database.php index 7d97c550..22618f66 100644 --- a/Helper/Database.php +++ b/Helper/Database.php @@ -374,19 +374,4 @@ public function getSubstituteOrderIncrementId($sIncrementId) ->where("payone_cancel_substitute_increment_id = :incrementId"); return $this->getDb()->fetchOne($oSelect, ['incrementId' => $sIncrementId]); } - - /** - * Writes the registered flag to the customer entity - * I'm sure there is a way to do this correctly with the entity object, but Mage2 did everything to prevent this - * - * @param int $iCustomerId - * @return int - */ - public function markUserAsRegisteredWithPaydirekt($iCustomerId) - { - $table = $this->databaseResource->getTableName('customer_entity'); - $data = ['payone_paydirekt_registered' => 1]; - $where = ['entity_id = ?' => $iCustomerId]; - return $this->getDb()->update($table, $data, $where); - } } diff --git a/Helper/Payment.php b/Helper/Payment.php index e19dcb71..94747a2f 100644 --- a/Helper/Payment.php +++ b/Helper/Payment.php @@ -54,7 +54,6 @@ class Payment extends \Payone\Core\Helper\Base PayoneConfig::METHOD_OBT_POSTFINANCE_CARD, PayoneConfig::METHOD_OBT_IDEAL, PayoneConfig::METHOD_OBT_PRZELEWY, - PayoneConfig::METHOD_PAYDIREKT, PayoneConfig::METHOD_SAFE_INVOICE, PayoneConfig::METHOD_PAYOLUTION_INVOICE, PayoneConfig::METHOD_PAYOLUTION_DEBIT, @@ -94,7 +93,6 @@ class Payment extends \Payone\Core\Helper\Base PayoneConfig::METHOD_OBT_PRZELEWY => 'sb', PayoneConfig::METHOD_PAYPAL => 'wlt', PayoneConfig::METHOD_PAYPALV2 => 'wlt', - PayoneConfig::METHOD_PAYDIREKT => 'wlt', PayoneConfig::METHOD_SAFE_INVOICE => 'rec', PayoneConfig::METHOD_PAYOLUTION_INVOICE => 'fnc', PayoneConfig::METHOD_PAYOLUTION_DEBIT => 'fnc', diff --git a/Model/Api/Request/Authorization.php b/Model/Api/Request/Authorization.php index f8b423d1..a48ce33d 100644 --- a/Model/Api/Request/Authorization.php +++ b/Model/Api/Request/Authorization.php @@ -133,7 +133,7 @@ protected function setUserParameters(PayoneMethod $oPayment, Order $oOrder) $oShipping = $oOrder->getShippingAddress(); // get shipping address from order if ($oShipping) {// shipping address existing? $this->addAddress($oShipping, true); // add regular shipping address - } elseif ($oPayment->getCode() == PayoneConfig::METHOD_PAYDIREKT || ($oPayment->getCode() == PayoneConfig::METHOD_PAYPAL && $this->shopHelper->getConfigParam('bill_as_del_address', PayoneConfig::METHOD_PAYPAL, 'payone_payment', $this->storeCode))) { + } elseif ($oPayment->getCode() == PayoneConfig::METHOD_PAYPAL && $this->shopHelper->getConfigParam('bill_as_del_address', PayoneConfig::METHOD_PAYPAL, 'payone_payment', $this->storeCode)) { $this->addAddress($oOrder->getBillingAddress(), true); // add billing address as shipping address } } diff --git a/Model/Methods/Paydirekt.php b/Model/Methods/Paydirekt.php deleted file mode 100644 index efbab193..00000000 --- a/Model/Methods/Paydirekt.php +++ /dev/null @@ -1,104 +0,0 @@ -. - * - * PHP version 5 - * - * @category Payone - * @package Payone_Magento2_Plugin - * @author FATCHIP GmbH - * @copyright 2003 - 2016 Payone GmbH - * @license GNU Lesser General Public License - * @link http://www.payone.de - */ - -namespace Payone\Core\Model\Methods; - -use Payone\Core\Model\PayoneConfig; -use Magento\Sales\Model\Order; - -/** - * Model for Paydirekt payment method - */ -class Paydirekt extends PayoneMethod -{ - /** - * Payment method code - * - * @var string - */ - protected $_code = PayoneConfig::METHOD_PAYDIREKT; - - /** - * Clearingtype for PAYONE authorization request - * - * @var string - */ - protected $sClearingtype = 'wlt'; - - /** - * Wallettype for PAYONE requests - * - * @var string|bool - */ - protected $sWallettype = 'PDT'; - - /** - * Determines if the redirect-parameters have to be added - * to the authorization-request - * - * @var bool - */ - protected $blNeedsRedirectUrls = true; - - /** - * Max length for narrative text parameter - * - * @var int - */ - protected $iNarrativeTextMax = 37; - - /** - * Return parameters specific to this payment type - * - * @param Order $oOrder - * @return array - */ - public function getPaymentSpecificParameters(Order $oOrder) - { - $aParams = ['wallettype' => $this->getWallettype()]; - - $blSecuredOrder = (bool)$this->getCustomConfigParam('order_secured'); - if ($blSecuredOrder === true && $this->getAuthorizationMode() == PayoneConfig::REQUEST_TYPE_PREAUTHORIZATION) { // params only available with preauth - $aParams['add_paydata[order_secured]'] = 'yes'; - $aParams['add_paydata[preauthorization_validity]'] = (int)$this->getCustomConfigParam('preauthorization_validity'); - } - - return $aParams; - } - - /** - * Formats the reference number if needed for this payment method - * The request will fail if there is an underscore in the reference number - * - * @param string $sRefNr - * @return string - */ - public function formatReferenceNumber($sRefNr) - { - $sRefNr = str_replace('_', '-', $sRefNr); - return $sRefNr; - } -} diff --git a/Model/Methods/PayoneMethod.php b/Model/Methods/PayoneMethod.php index c09cfca7..e4e24269 100644 --- a/Model/Methods/PayoneMethod.php +++ b/Model/Methods/PayoneMethod.php @@ -436,7 +436,6 @@ public function getSubTypeSpecificParameters(Order $oOrder) /** * Formats the reference number if needed for this payment method - * Needed for Paydirekt * * @param string $sRefNr * @return string diff --git a/Model/PayoneConfig.php b/Model/PayoneConfig.php index 16dc8874..a58d8acf 100644 --- a/Model/PayoneConfig.php +++ b/Model/PayoneConfig.php @@ -76,7 +76,6 @@ abstract class PayoneConfig const METHOD_OBT_IDEAL = 'payone_obt_ideal'; const METHOD_OBT_PRZELEWY = 'payone_obt_przelewy'; const METHOD_KLARNA = 'payone_klarna'; // method was deleted but constant is still useful for unit tests - const METHOD_PAYDIREKT = 'payone_paydirekt'; const METHOD_SAFE_INVOICE = 'payone_safe_invoice'; const METHOD_PAYOLUTION_INVOICE = 'payone_payolution_invoice'; const METHOD_PAYOLUTION_DEBIT = 'payone_payolution_debit'; diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index 08eddfdc..7a6190be 100644 --- a/Setup/UpgradeData.php +++ b/Setup/UpgradeData.php @@ -253,25 +253,6 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface ); } - $customerInstaller = $this->customerSetupFactory->create(['setup' => $setup]); - if (!$customerInstaller->getAttribute(\Magento\Customer\Model\Customer::ENTITY, 'payone_paydirekt_registered', 'attribute_id')) { - $customerInstaller->addAttribute( - 'customer', - 'payone_paydirekt_registered', - [ - 'type' => 'int', - 'label' => 'Payone paydirekt OneClick is registered', - 'input' => 'text', - 'required' => false, - 'visible' => false, - 'user_defined' => true, - 'sort_order' => 999, - 'position' => 999, - 'system' => 0, - ] - ); - } - if (!$setup->getConnection()->tableColumnExists($setup->getTable('sales_order'), 'payone_ratepay_shop_id')) { $salesInstaller = $this->salesSetupFactory->create(['resourceName' => 'sales_setup', 'setup' => $setup]); $salesInstaller->addAttribute( diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php index 119ff2b8..dbc7d399 100644 --- a/Setup/UpgradeSchema.php +++ b/Setup/UpgradeSchema.php @@ -104,20 +104,6 @@ protected function addNewColumns(SchemaSetupInterface $setup, ModuleContextInter ); } - if (!$setup->getConnection()->tableColumnExists($setup->getTable('customer_entity'), 'payone_paydirekt_registered')) { - $setup->getConnection()->addColumn( - $setup->getTable('customer_entity'), - 'payone_paydirekt_registered', - [ - 'type' => Table::TYPE_INTEGER, - 'length' => 1, - 'nullable' => false, - 'default' => 0, - 'comment' => 'Payone paydirekt OneClick is registered' - ] - ); - } - if (!$setup->getConnection()->tableColumnExists($setup->getTable(CheckedAddresses::TABLE_CHECKED_ADDRESSES), 'score')) { $setup->getConnection()->addColumn( $setup->getTable(CheckedAddresses::TABLE_CHECKED_ADDRESSES), diff --git a/Test/Unit/Block/Onepage/ReviewTest.php b/Test/Unit/Block/Onepage/ReviewTest.php index 60069ce0..8859de94 100644 --- a/Test/Unit/Block/Onepage/ReviewTest.php +++ b/Test/Unit/Block/Onepage/ReviewTest.php @@ -324,25 +324,11 @@ public function testIsPayPalExpressTrue() public function testIsPayPalExpressFalse() { - $this->payment->method('getMethod')->willReturn(PayoneConfig::METHOD_PAYDIREKT); + $this->payment->method('getMethod')->willReturn(PayoneConfig::METHOD_DEBIT); $result = $this->classToTest->isPayPalExpress(); $this->assertFalse($result); } - public function testIsPaydirektTrue() - { - $this->payment->method('getMethod')->willReturn(PayoneConfig::METHOD_PAYDIREKT); - $result = $this->classToTest->isPaydirekt(); - $this->assertTrue($result); - } - - public function testIsPaydirektFalse() - { - $this->payment->method('getMethod')->willReturn(PayoneConfig::METHOD_PAYPAL); - $result = $this->classToTest->isPaydirekt(); - $this->assertFalse($result); - } - public function testGetFingerprintJsUrl() { $expected = 'expected'; diff --git a/Test/Unit/Helper/DatabaseTest.php b/Test/Unit/Helper/DatabaseTest.php index 114ae209..ac592dd7 100644 --- a/Test/Unit/Helper/DatabaseTest.php +++ b/Test/Unit/Helper/DatabaseTest.php @@ -311,14 +311,4 @@ public function testGetSubstituteOrderIncrementId() $result = $this->database->getSubstituteOrderIncrementId('12345'); $this->assertEquals($expected, $result); } - - public function testMarkUserAsRegisteredWithPaydirekt() - { - $expected = 1; - - $this->connection->method('update')->willReturn($expected); - - $result = $this->database->markUserAsRegisteredWithPaydirekt(12345); - $this->assertEquals($expected, $result); - } } diff --git a/Test/Unit/Model/ConfigProviderTest.php b/Test/Unit/Model/ConfigProviderTest.php index 08079355..a8356810 100644 --- a/Test/Unit/Model/ConfigProviderTest.php +++ b/Test/Unit/Model/ConfigProviderTest.php @@ -125,9 +125,7 @@ protected function setUp(): void $customer = $this->getMockBuilder(CustomerModel::class) ->disableOriginalConstructor() - ->setMethods(['getPayonePaydirektRegistered']) ->getMock(); - $customer->method('getPayonePaydirektRegistered')->willReturn('0'); $this->customerSession = $this->getMockBuilder(CustomerSession::class)->disableOriginalConstructor()->getMock(); $this->customerSession->method('getCustomer')->willReturn($customer); diff --git a/Test/Unit/Model/Methods/BaseMethodTest.php b/Test/Unit/Model/Methods/BaseMethodTest.php index 3c464adf..f3a65db7 100644 --- a/Test/Unit/Model/Methods/BaseMethodTest.php +++ b/Test/Unit/Model/Methods/BaseMethodTest.php @@ -30,11 +30,10 @@ use Magento\Payment\Model\Method\AbstractMethod; use Magento\Sales\Model\Order; use Magento\Store\Model\Store; -use Payone\Core\Model\Methods\Paydirekt as ClassToTest; +use Payone\Core\Model\Methods\Paypal as ClassToTest; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Payone\Core\Helper\Shop; use Magento\Framework\App\Config\ScopeConfigInterface; -use Payone\Core\Model\Methods\Paydirekt; use Payone\Core\Model\PayoneConfig; use Magento\Payment\Model\Info; use Payone\Core\Model\Api\Request\Authorization; @@ -163,7 +162,7 @@ public function testAuthorize() $this->authorizationRequest->method('sendRequest')->willReturn($aResponse); $result = $this->classToTest->authorize($paymentInfo, 100); - $this->assertInstanceOf(Paydirekt::class, $result); + $this->assertInstanceOf(ClassToTest::class, $result); } public function testAuthorizeError() @@ -225,7 +224,7 @@ public function testRefund() $this->debitRequest->method('sendRequest')->willReturn($aResponse); $result = $this->classToTest->refund($paymentInfo, 100); - $this->assertInstanceOf(Paydirekt::class, $result); + $this->assertInstanceOf(ClassToTest::class, $result); } public function testRefundError() @@ -292,7 +291,7 @@ public function testCapture() $this->captureRequest->method('sendRequest')->willReturn($aResponse); $result = $this->classToTest->capture($paymentInfo, 100); - $this->assertInstanceOf(Paydirekt::class, $result); + $this->assertInstanceOf(ClassToTest::class, $result); } public function testCaptureError() @@ -361,7 +360,7 @@ public function testCaptureAuth() $this->authorizationRequest->method('sendRequest')->willReturn($aResponse); $result = $this->classToTest->capture($paymentInfo, 100); - $this->assertInstanceOf(Paydirekt::class, $result); + $this->assertInstanceOf(ClassToTest::class, $result); } public function testCanUseForCountryFalse() @@ -372,9 +371,9 @@ public function testCanUseForCountryFalse() [ ['allowspecific', 'global', 'payone_general', null, 0], ['specificcountry', 'global', 'payone_general', null, 'DE,AT'], - ['use_global', PayoneConfig::METHOD_PAYDIREKT, 'payone_payment', null, '0'], - ['allowspecific', PayoneConfig::METHOD_PAYDIREKT, 'payone_payment', null, '1'], - ['specificcountry', PayoneConfig::METHOD_PAYDIREKT, 'payone_payment', null, 'NL,AT'], + ['use_global', PayoneConfig::METHOD_PAYPAL, 'payone_payment', null, '0'], + ['allowspecific', PayoneConfig::METHOD_PAYPAL, 'payone_payment', null, '1'], + ['specificcountry', PayoneConfig::METHOD_PAYPAL, 'payone_payment', null, 'NL,AT'], ] ); $result = $this->classToTest->canUseForCountry('DE'); diff --git a/Test/Unit/Model/Methods/PaydirektTest.php b/Test/Unit/Model/Methods/PaydirektTest.php deleted file mode 100644 index 08b9db48..00000000 --- a/Test/Unit/Model/Methods/PaydirektTest.php +++ /dev/null @@ -1,88 +0,0 @@ -. - * - * PHP version 5 - * - * @category Payone - * @package Payone_Magento2_Plugin - * @author FATCHIP GmbH - * @copyright 2003 - 2017 Payone GmbH - * @license GNU Lesser General Public License - * @link http://www.payone.de - */ - -namespace Payone\Core\Test\Unit\Model\Methods; - -use Payone\Core\Model\Methods\Paydirekt as ClassToTest; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Sales\Model\Order; -use Payone\Core\Model\PayoneConfig; -use Payone\Core\Test\Unit\BaseTestCase; -use Payone\Core\Test\Unit\PayoneObjectManager; -use Magento\Checkout\Model\Session; -use Payone\Core\Helper\Shop; - -class PaydirektTest extends BaseTestCase -{ - /** - * @var ClassToTest - */ - private $classToTest; - - /** - * @var ObjectManager|PayoneObjectManager - */ - private $objectManager; - - protected function setUp(): void - { - $this->objectManager = $this->getObjectManager(); - - $checkoutSession = $this->getMockBuilder(Session::class) - ->disableOriginalConstructor() - ->setMethods([ - 'getPayoneExpressType', - 'getPayoneDeviceFingerprint', - 'getPayoneUserAgent' - ]) - ->getMock(); - $checkoutSession->method('getPayoneExpressType')->willReturn(PayoneConfig::METHOD_PAYDIREKT); - - $shopHelper = $this->getMockBuilder(Shop::class)->disableOriginalConstructor()->getMock(); - $shopHelper->method('getConfigParam')->willReturn('test'); - - $this->classToTest = $this->objectManager->getObject(ClassToTest::class, [ - 'checkoutSession' => $checkoutSession, - 'shopHelper' => $shopHelper, - ]); - } - - public function testGetPaymentSpecificParameters() - { - $order = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock(); - - $result = $this->classToTest->getPaymentSpecificParameters($order); - $expected = 'PDT'; - $this->assertEquals($expected, $result['wallettype']); - } - - public function testFormatReferenceNumber() - { - $result = $this->classToTest->formatReferenceNumber('prefix_000012345'); - $expected = 'prefix-000012345'; - $this->assertEquals($expected, $result); - } -} diff --git a/Test/Unit/Model/Methods/PayoneMethodTest.php b/Test/Unit/Model/Methods/PayoneMethodTest.php index 72f846f1..5c94392b 100644 --- a/Test/Unit/Model/Methods/PayoneMethodTest.php +++ b/Test/Unit/Model/Methods/PayoneMethodTest.php @@ -26,7 +26,7 @@ namespace Payone\Core\Test\Unit\Model\Methods; -use Payone\Core\Model\Methods\Paydirekt as ClassToTest; +use Payone\Core\Model\Methods\Paypal as ClassToTest; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Payone\Core\Helper\Shop; use Payone\Core\Model\PayoneConfig; @@ -81,8 +81,8 @@ public function testGetAuthorizationMode() ->willReturnMap( [ ['request_type', 'global', 'payone_general', null, 'global_request_type'], - ['use_global', PayoneConfig::METHOD_PAYDIREKT, 'payone_payment', null, '0'], - ['request_type', PayoneConfig::METHOD_PAYDIREKT, 'payone_payment', null, $expected] + ['use_global', PayoneConfig::METHOD_PAYPAL, 'payone_payment', null, '0'], + ['request_type', PayoneConfig::METHOD_PAYPAL, 'payone_payment', null, $expected] ] ); $result = $this->classToTest->getAuthorizationMode(); @@ -106,7 +106,7 @@ public function testNeedsRedirectUrls() public function testNeedsTransactionParam() { $result = $this->classToTest->needsTransactionParam(); - $this->assertFalse($result); + $this->assertTrue($result); } public function testNeedsProductInfo() @@ -143,7 +143,7 @@ public function testGetGroupName() public function testGetNarrativeTextMaxLength() { $result = $this->classToTest->getNarrativeTextMaxLength(); - $expected = 37; + $expected = 81; $this->assertEquals($expected, $result); } diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 168bc1b1..4f5b1397 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -171,11 +171,6 @@ Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping Payone\Core\Model\Config\Backend\SerializedOrJson - - - Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping - Payone\Core\Model\Config\Backend\SerializedOrJson - Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping @@ -307,7 +302,6 @@ - diff --git a/etc/adminhtml/system/payone_paydirekt.xml b/etc/adminhtml/system/payone_paydirekt.xml deleted file mode 100644 index 7980d102..00000000 --- a/etc/adminhtml/system/payone_paydirekt.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - Magento\Config\Model\Config\Source\Yesno - payment/payone_paydirekt/active - - - - payment/payone_paydirekt/title - - - - In the case of a secured pre-order, the retailer is granted a payment guarantee for the selected period (maximum 15 calendar days). Captures (partial payments) must always be executed within the guarantee period. Only available in preauthorization mode. - Magento\Config\Model\Config\Source\Yesno - - - - - 1 - - Desired guarantee time period (max. 15 running days) für a secured ore-order. - Payone\Core\Model\Source\GuaranteeTime - - - - Magento\Sales\Model\Config\Source\Order\Status\NewStatus - payment/payone_paydirekt/order_status - - - - payment/payone_paydirekt/instructions - - - - payment/payone_paydirekt/min_order_total - - - - payment/payone_paydirekt/max_order_total - - - - payment/payone_paydirekt/sort_order - - - - diff --git a/etc/config.xml b/etc/config.xml index 51e7b080..36ea2a0b 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -146,15 +146,6 @@ 0 payone - - 1 - Authorization - Payone\Core\Model\Methods\Paydirekt - pending - PAYONE Paydirekt - 0 - payone - 1 Authorization @@ -374,7 +365,6 @@ {"_1343137411652_552":{"txaction":"appointed","state_status":"processing"}} {"_1343137411652_752":{"txaction":"appointed","state_status":"processing"}} {"_1343137411652_852":{"txaction":"appointed","state_status":"processing"}} - {"_1343118466182_183":{"txaction":"appointed","state_status":"processing"}} {"_payone_status_invoice":{"txaction":"appointed","state_status":"processing"}} {"_payone_status_mapping7":{"txaction":"appointed","state_status":"processing"}} {"_payone_status_mapping8":{"txaction":"appointed","state_status":"processing"}} @@ -494,11 +484,6 @@ 1 - - 1 - 0 - 15 - 1 0 diff --git a/etc/payment.xml b/etc/payment.xml index 4bc1a8f8..a0047a57 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -70,9 +70,6 @@ 0 - - 0 - 0 diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv index 76e9a21b..ef63e983 100644 --- a/i18n/de_DE.csv +++ b/i18n/de_DE.csv @@ -1147,8 +1147,6 @@ "Payment method is not available anymore","Zahlart steht nicht mehr zur Verfügung" -"Please check your email account for the paydirekt registration email before continuing.","Bitte prüfen Sie Ihr Email-Konto bzgl. der Registrierungs-Email von paydirekt bevor Sie fortfahren." - "ratepay_legal_text_snippet_1","Mit Klicken auf" "ratepay_legal_text_snippet_2","erklären Sie sich mit den" "ratepay_legal_text_snippet_3","Ratepay Zahlungsbedingungen" diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index 8b80b1a3..d7fda8b8 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -91,9 +91,6 @@ true - - true - true diff --git a/view/frontend/templates/onepage/review.phtml b/view/frontend/templates/onepage/review.phtml index d9746dc7..70fb17b9 100644 --- a/view/frontend/templates/onepage/review.phtml +++ b/view/frontend/templates/onepage/review.phtml @@ -112,24 +112,6 @@ escapeHtml(__('Submitting order information...')); ?> - isPaydirekt()): ?> - - - - diff --git a/view/frontend/web/images/paydirekt.png b/view/frontend/web/images/paydirekt.png deleted file mode 100644 index e23ccaaef0e63120ff8dd11b9cc2868600e3de14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6318 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 kh+2. - * - * PHP version 5 - * - * @category Payone - * @package Payone_Magento2_Plugin - * @author FATCHIP GmbH - * @copyright 2003 - 2016 Payone GmbH - * @license GNU Lesser General Public License - * @link http://www.payone.de - */ -define( - [ - 'Payone_Core/js/view/payment/method-renderer/base', - 'Magento_Customer/js/model/customer', - 'mage/url' - ], - function (Component, customer, url) { - 'use strict'; - return Component.extend({ - defaults: { - template: 'Payone_Core/payment/paydirekt' - }, - - /** Returns payment method instructions */ - getInstructions: function () { - return window.checkoutConfig.payment.instructions[this.item.method]; - }, - }); - } -); diff --git a/view/frontend/web/js/view/payment/payone-payments.js b/view/frontend/web/js/view/payment/payone-payments.js index 3cce9860..35425a20 100644 --- a/view/frontend/web/js/view/payment/payone-payments.js +++ b/view/frontend/web/js/view/payment/payone-payments.js @@ -84,10 +84,6 @@ define( type: 'payone_obt_przelewy', component: 'Payone_Core/js/view/payment/method-renderer/obt_przelewy-method' }, - { - type: 'payone_paydirekt', - component: 'Payone_Core/js/view/payment/method-renderer/paydirekt-method' - }, { type: 'payone_safe_invoice', component: 'Payone_Core/js/view/payment/method-renderer/safe_invoice-method' diff --git a/view/frontend/web/template/payment/paydirekt.html b/view/frontend/web/template/payment/paydirekt.html deleted file mode 100644 index 5f2c1aba..00000000 --- a/view/frontend/web/template/payment/paydirekt.html +++ /dev/null @@ -1,89 +0,0 @@ - -
-
- - -
- -
- - - -
- - - -
-

-
- - - -
-
-
- - -
- -
- - -
- - -
- - -
-
-
-
- -
-
-
-