From 6b5c2bb769c9c58b9e40c8ef8f53154acd92a22b Mon Sep 17 00:00:00 2001 From: Simon Gabriel Date: Thu, 25 Jan 2018 17:48:08 +0100 Subject: [PATCH 1/3] [change] Added magento shop edition to SHOP.TYPE parameter. (MAGE2-43) --- PaymentMethods/HeidelpayAbstractPaymentMethod.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 PaymentMethods/HeidelpayAbstractPaymentMethod.php diff --git a/PaymentMethods/HeidelpayAbstractPaymentMethod.php b/PaymentMethods/HeidelpayAbstractPaymentMethod.php old mode 100644 new mode 100755 index 47917c5c3d8..b1ae9b037a2 --- a/PaymentMethods/HeidelpayAbstractPaymentMethod.php +++ b/PaymentMethods/HeidelpayAbstractPaymentMethod.php @@ -504,7 +504,8 @@ public function getHeidelpayUrl($quote) // add the Magento Version to the heidelpay request $this->_heidelpayPaymentMethod->getRequest()->getCriterion()->set( 'SHOP.TYPE', - $this->productMetadata->getName() . ' ' . $this->productMetadata->getVersion() + $this->productMetadata->getName() . ' ' . $this->productMetadata->getVersion() . '-' . + $this->productMetadata->getEdition() ); // add the module version to the heidelpay request From e56408c461327c799b3dac375162a9dba22d2160 Mon Sep 17 00:00:00 2001 From: Simon Gabriel Date: Wed, 28 Feb 2018 11:08:11 +0100 Subject: [PATCH 2/3] [change] (MAGE-35) Rename 'Heidelberger Payment GmbH' to 'heidelpay GmbH'. --- Api/Data/PaymentInformationInterface.php | 2 +- Api/Payment.php | 2 +- Api/PaymentInterface.php | 2 +- Block/Checkout/Success.php | 2 +- Block/Hgw.php | 2 +- Block/Info/AbstractBlock.php | 2 +- Block/Info/Invoice.php | 2 +- Block/Info/InvoiceSecured.php | 2 +- Block/Info/Prepayment.php | 2 +- Block/Payment/HgwAbstract.php | 2 +- Controller/Adminhtml/Order/Shipment/Save.php | 2 +- Controller/HgwAbstract.php | 2 +- Controller/Index/Index.php | 2 +- Controller/Index/Push.php | 2 +- Controller/Index/Redirect.php | 2 +- Controller/Index/Response.php | 2 +- Helper/Payment.php | 2 +- LICENSE.txt | 4 ++-- Model/Config/Source/BookingMode.php | 2 +- Model/Config/Source/Recognition.php | 2 +- Model/Order/Payment/State/AuthorizeCommand.php | 2 +- Model/Order/Payment/State/CaptureCommand.php | 2 +- Model/PaymentInformation.php | 2 +- Model/ResourceModel/PaymentInformation.php | 2 +- Model/ResourceModel/PaymentInformation/Collection.php | 2 +- Model/ResourceModel/Transaction/Collection.php | 2 +- Model/Transaction.php | 2 +- Model/TransactionRepository.php | 2 +- PaymentMethods/HeidelpayAbstractPaymentMethod.php | 2 +- PaymentMethods/HeidelpayCreditCardPaymentMethod.php | 2 +- PaymentMethods/HeidelpayDebitCardPaymentMethod.php | 2 +- PaymentMethods/HeidelpayDirectDebitPaymentMethod.php | 2 +- PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php | 2 +- PaymentMethods/HeidelpayGiropayPaymentMethod.php | 2 +- PaymentMethods/HeidelpayInvoicePaymentMethod.php | 2 +- PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php | 2 +- PaymentMethods/HeidelpayPayPalPaymentMethod.php | 2 +- PaymentMethods/HeidelpayPrepaymentPaymentMethod.php | 2 +- PaymentMethods/HeidelpaySofortPaymentMethod.php | 2 +- Setup/InstallSchema.php | 2 +- Setup/UpgradeSchema.php | 2 +- i18n/de_DE.csv | 2 +- i18n/en_US.csv | 2 +- registration.php | 2 +- view/adminhtml/templates/info/invoice.phtml | 2 +- view/adminhtml/templates/info/invoice_secured.phtml | 2 +- view/adminhtml/templates/info/pdf/invoice.phtml | 2 +- view/adminhtml/templates/info/pdf/invoice_secured.phtml | 2 +- view/adminhtml/templates/info/pdf/prepayment.phtml | 2 +- view/adminhtml/templates/info/prepayment.phtml | 2 +- view/frontend/templates/heidelpay-success.phtml | 2 +- view/frontend/templates/hgw.phtml | 2 +- view/frontend/templates/info/invoice.phtml | 2 +- view/frontend/templates/info/invoice_secured.phtml | 2 +- view/frontend/templates/info/prepayment.phtml | 2 +- 55 files changed, 56 insertions(+), 56 deletions(-) mode change 100644 => 100755 Api/Data/PaymentInformationInterface.php mode change 100644 => 100755 Api/Payment.php mode change 100644 => 100755 Api/PaymentInterface.php mode change 100644 => 100755 Block/Checkout/Success.php mode change 100644 => 100755 Block/Hgw.php mode change 100644 => 100755 Block/Info/AbstractBlock.php mode change 100644 => 100755 Block/Info/Invoice.php mode change 100644 => 100755 Block/Info/InvoiceSecured.php mode change 100644 => 100755 Block/Info/Prepayment.php mode change 100644 => 100755 Block/Payment/HgwAbstract.php mode change 100644 => 100755 Controller/Adminhtml/Order/Shipment/Save.php mode change 100644 => 100755 Controller/HgwAbstract.php mode change 100644 => 100755 Controller/Index/Index.php mode change 100644 => 100755 Controller/Index/Redirect.php mode change 100644 => 100755 Controller/Index/Response.php mode change 100644 => 100755 Helper/Payment.php mode change 100644 => 100755 LICENSE.txt mode change 100644 => 100755 Model/Config/Source/BookingMode.php mode change 100644 => 100755 Model/Config/Source/Recognition.php mode change 100644 => 100755 Model/Order/Payment/State/AuthorizeCommand.php mode change 100644 => 100755 Model/Order/Payment/State/CaptureCommand.php mode change 100644 => 100755 Model/PaymentInformation.php mode change 100644 => 100755 Model/ResourceModel/PaymentInformation.php mode change 100644 => 100755 Model/ResourceModel/PaymentInformation/Collection.php mode change 100644 => 100755 Model/ResourceModel/Transaction/Collection.php mode change 100644 => 100755 Model/Transaction.php mode change 100644 => 100755 Model/TransactionRepository.php mode change 100644 => 100755 PaymentMethods/HeidelpayCreditCardPaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpayDebitCardPaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpayDirectDebitPaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpayGiropayPaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpayInvoicePaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpayPayPalPaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpayPrepaymentPaymentMethod.php mode change 100644 => 100755 PaymentMethods/HeidelpaySofortPaymentMethod.php mode change 100644 => 100755 Setup/InstallSchema.php mode change 100644 => 100755 Setup/UpgradeSchema.php mode change 100644 => 100755 i18n/de_DE.csv mode change 100644 => 100755 i18n/en_US.csv mode change 100644 => 100755 registration.php mode change 100644 => 100755 view/adminhtml/templates/info/invoice.phtml mode change 100644 => 100755 view/adminhtml/templates/info/invoice_secured.phtml mode change 100644 => 100755 view/adminhtml/templates/info/pdf/invoice.phtml mode change 100644 => 100755 view/adminhtml/templates/info/pdf/invoice_secured.phtml mode change 100644 => 100755 view/adminhtml/templates/info/pdf/prepayment.phtml mode change 100644 => 100755 view/adminhtml/templates/info/prepayment.phtml mode change 100644 => 100755 view/frontend/templates/heidelpay-success.phtml mode change 100644 => 100755 view/frontend/templates/hgw.phtml mode change 100644 => 100755 view/frontend/templates/info/invoice.phtml mode change 100644 => 100755 view/frontend/templates/info/invoice_secured.phtml mode change 100644 => 100755 view/frontend/templates/info/prepayment.phtml diff --git a/Api/Data/PaymentInformationInterface.php b/Api/Data/PaymentInformationInterface.php old mode 100644 new mode 100755 index 767b3f0d212..dd6fee6b3b5 --- a/Api/Data/PaymentInformationInterface.php +++ b/Api/Data/PaymentInformationInterface.php @@ -6,7 +6,7 @@ * Model for heidelpay Payment Information * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Api/Payment.php b/Api/Payment.php old mode 100644 new mode 100755 index eb1a7d24606..dd85fd13413 --- a/Api/Payment.php +++ b/Api/Payment.php @@ -11,7 +11,7 @@ * This is the controller where API REST requests to the heidelpay module are being processed. * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Api/PaymentInterface.php b/Api/PaymentInterface.php old mode 100644 new mode 100755 index 57c140cfdc1..1eea2ddffb2 --- a/Api/PaymentInterface.php +++ b/Api/PaymentInterface.php @@ -9,7 +9,7 @@ * in a seperate data set to avoid mixing up Magento 2 and heidelpay data. * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Block/Checkout/Success.php b/Block/Checkout/Success.php old mode 100644 new mode 100755 index 161f452fcb8..855bcafe177 --- a/Block/Checkout/Success.php +++ b/Block/Checkout/Success.php @@ -6,7 +6,7 @@ * Add payment information to the checkout success block * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/Block/Hgw.php b/Block/Hgw.php old mode 100644 new mode 100755 index 1f120027b59..36a43a38005 --- a/Block/Hgw.php +++ b/Block/Hgw.php @@ -6,7 +6,7 @@ * * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/Block/Info/AbstractBlock.php b/Block/Info/AbstractBlock.php old mode 100644 new mode 100755 index 750674741c3..1da5c726c49 --- a/Block/Info/AbstractBlock.php +++ b/Block/Info/AbstractBlock.php @@ -12,7 +12,7 @@ * Abstract class for Info Blocks * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Block/Info/Invoice.php b/Block/Info/Invoice.php old mode 100644 new mode 100755 index 7e622b2bd49..ec37ca6b479 --- a/Block/Info/Invoice.php +++ b/Block/Info/Invoice.php @@ -6,7 +6,7 @@ * Heidelpay Invoice Info Block * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * @author Stephano Vogel diff --git a/Block/Info/InvoiceSecured.php b/Block/Info/InvoiceSecured.php old mode 100644 new mode 100755 index 7e8500c491b..64370ad8189 --- a/Block/Info/InvoiceSecured.php +++ b/Block/Info/InvoiceSecured.php @@ -6,7 +6,7 @@ * Heidelpay InvoiceSecured Info Block Class * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * @author Stephano Vogel diff --git a/Block/Info/Prepayment.php b/Block/Info/Prepayment.php old mode 100644 new mode 100755 index ce0bf151b98..28c75c9dbc8 --- a/Block/Info/Prepayment.php +++ b/Block/Info/Prepayment.php @@ -6,7 +6,7 @@ * Heidelpay Prepayment Info Block * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Block/Payment/HgwAbstract.php b/Block/Payment/HgwAbstract.php old mode 100644 new mode 100755 index d38498c91e8..80a8d9feb1a --- a/Block/Payment/HgwAbstract.php +++ b/Block/Payment/HgwAbstract.php @@ -5,7 +5,7 @@ *Abstract payment block * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/Controller/Adminhtml/Order/Shipment/Save.php b/Controller/Adminhtml/Order/Shipment/Save.php old mode 100644 new mode 100755 index 189a053f003..ccb65502d5c --- a/Controller/Adminhtml/Order/Shipment/Save.php +++ b/Controller/Adminhtml/Order/Shipment/Save.php @@ -12,7 +12,7 @@ * Manages the creating of shipment (overwrites the Magento 2 default Shipment Save Controller) * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Controller/HgwAbstract.php b/Controller/HgwAbstract.php old mode 100644 new mode 100755 index 441b4ede63c..fa21d145dd3 --- a/Controller/HgwAbstract.php +++ b/Controller/HgwAbstract.php @@ -10,7 +10,7 @@ /** * Abstract controller class * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * @package Heidelpay diff --git a/Controller/Index/Index.php b/Controller/Index/Index.php old mode 100644 new mode 100755 index 23b051f6e2a..5f32ba8e93a --- a/Controller/Index/Index.php +++ b/Controller/Index/Index.php @@ -12,7 +12,7 @@ * Customer redirect to heidelpay payment or used to display the payment frontend to the customer * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/Controller/Index/Push.php b/Controller/Index/Push.php index a8685fd12e3..24a51fe2421 100755 --- a/Controller/Index/Push.php +++ b/Controller/Index/Push.php @@ -16,7 +16,7 @@ * Receives XML Push requests from the heidelpay Payment API and processes them. * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento2 * * @author Stephano Vogel diff --git a/Controller/Index/Redirect.php b/Controller/Index/Redirect.php old mode 100644 new mode 100755 index 04f990b9654..a89675cbbcf --- a/Controller/Index/Redirect.php +++ b/Controller/Index/Redirect.php @@ -16,7 +16,7 @@ * or success page. * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/Controller/Index/Response.php b/Controller/Index/Response.php old mode 100644 new mode 100755 index 52ad3dffb62..ad53ac97a98 --- a/Controller/Index/Response.php +++ b/Controller/Index/Response.php @@ -21,7 +21,7 @@ * so please make sure that you use https for the checkout process. * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/Helper/Payment.php b/Helper/Payment.php old mode 100644 new mode 100755 index 1f60564f395..896bdad3ff4 --- a/Helper/Payment.php +++ b/Helper/Payment.php @@ -14,7 +14,7 @@ * The payment helper is a collection of function to prepare an send * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/LICENSE.txt b/LICENSE.txt old mode 100644 new mode 100755 index 0cb3f8adfb9..fbda3164dcd --- a/LICENSE.txt +++ b/LICENSE.txt @@ -5,7 +5,7 @@ Lizenzvereinbarung Plug-in I. Präambel - Diese Lizenzvereinbarung Plug-in (nachfolgend – „Vereinbarung“) bildet einen Vertrag zwischen dem Nutzer des Plug-ins und der Heidelberger Payment GmbH (nachfolgend „heidelpay“). + Diese Lizenzvereinbarung Plug-in (nachfolgend – „Vereinbarung“) bildet einen Vertrag zwischen dem Nutzer des Plug-ins und der heidelpay GmbH (nachfolgend „heidelpay“). Das Plug-in von heidelpay ist ein Software-Programm, welches die Schnittstelle zum Payment-System von heidelpay mit einer Anwendung (zum Beispiel: Shopsystem, Warenwirtschaft, Debitorenmanagement etc.) verbindet. Das Plug-in dient dem Datenaustausch zwischen dem Payment-System von heidelpay und der Anwendung. Das Plug-in erweitert den Funktionsumfang der Anwendung hinsichtlich der mit heidelpay gesondert vertraglich vereinbarten Leistungen. @@ -90,7 +90,7 @@ Plug-in Licence Agreement I. Introduction - This Plug-in Licence Agreement (hereinafter 'Agreement') constitutes a contract between the plug-in user and Heidelberger Payment GmbH (hereinafter 'heidelpay'). + This Plug-in Licence Agreement (hereinafter 'Agreement') constitutes a contract between the plug-in user and heidelpay GmbH (hereinafter 'heidelpay'). The plug-in from heidelpay is a software programme which links the heidelpay payment system interface to an application (for example, shop system, merchandise management, debtor management etc.). The plug-in is used to exchange data between the heidelpay payment system and the application. The plug-in expands the range of features in the application with regard to the services agreed separately with heidelpay. diff --git a/Model/Config/Source/BookingMode.php b/Model/Config/Source/BookingMode.php old mode 100644 new mode 100755 index 8f304e3ac8b..aa9d788074b --- a/Model/Config/Source/BookingMode.php +++ b/Model/Config/Source/BookingMode.php @@ -8,7 +8,7 @@ * Configuration Model for the Booking Mode of certain payment methods * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Model/Config/Source/Recognition.php b/Model/Config/Source/Recognition.php old mode 100644 new mode 100755 index fd356ff4963..0e84a0bdb5a --- a/Model/Config/Source/Recognition.php +++ b/Model/Config/Source/Recognition.php @@ -8,7 +8,7 @@ * Config Model for customer recognition settings * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Model/Order/Payment/State/AuthorizeCommand.php b/Model/Order/Payment/State/AuthorizeCommand.php old mode 100644 new mode 100755 index aa822258679..d9c858a0a51 --- a/Model/Order/Payment/State/AuthorizeCommand.php +++ b/Model/Order/Payment/State/AuthorizeCommand.php @@ -5,7 +5,7 @@ * Override authorize command * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/Model/Order/Payment/State/CaptureCommand.php b/Model/Order/Payment/State/CaptureCommand.php old mode 100644 new mode 100755 index 7f2521a7af0..5bfd5f44ee0 --- a/Model/Order/Payment/State/CaptureCommand.php +++ b/Model/Order/Payment/State/CaptureCommand.php @@ -5,7 +5,7 @@ * Override capture command * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/Model/PaymentInformation.php b/Model/PaymentInformation.php old mode 100644 new mode 100755 index 5ee89722ce7..a43730d9274 --- a/Model/PaymentInformation.php +++ b/Model/PaymentInformation.php @@ -11,7 +11,7 @@ * The heidelpay payment information model. * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Model/ResourceModel/PaymentInformation.php b/Model/ResourceModel/PaymentInformation.php old mode 100644 new mode 100755 index 178f0b0f2ff..162ac860f3f --- a/Model/ResourceModel/PaymentInformation.php +++ b/Model/ResourceModel/PaymentInformation.php @@ -8,7 +8,7 @@ * The resource model for the heidelpay payment information table. * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Model/ResourceModel/PaymentInformation/Collection.php b/Model/ResourceModel/PaymentInformation/Collection.php old mode 100644 new mode 100755 index b4778a541d7..f487b09af6e --- a/Model/ResourceModel/PaymentInformation/Collection.php +++ b/Model/ResourceModel/PaymentInformation/Collection.php @@ -10,7 +10,7 @@ * The Collection class for the Payment Information * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Model/ResourceModel/Transaction/Collection.php b/Model/ResourceModel/Transaction/Collection.php old mode 100644 new mode 100755 index ad89d161a25..40178f2ca54 --- a/Model/ResourceModel/Transaction/Collection.php +++ b/Model/ResourceModel/Transaction/Collection.php @@ -6,7 +6,7 @@ * Collection class for the Transactions * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/Model/Transaction.php b/Model/Transaction.php old mode 100644 new mode 100755 index 43fe0d75d3a..dea6b63d559 --- a/Model/Transaction.php +++ b/Model/Transaction.php @@ -6,7 +6,7 @@ * Transaction resource model * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/Model/TransactionRepository.php b/Model/TransactionRepository.php old mode 100644 new mode 100755 index d3ecf44a3b9..60e6ef62fb1 --- a/Model/TransactionRepository.php +++ b/Model/TransactionRepository.php @@ -13,7 +13,7 @@ * Transaction Repository * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento2 * diff --git a/PaymentMethods/HeidelpayAbstractPaymentMethod.php b/PaymentMethods/HeidelpayAbstractPaymentMethod.php index b1ae9b037a2..571d61088e1 100755 --- a/PaymentMethods/HeidelpayAbstractPaymentMethod.php +++ b/PaymentMethods/HeidelpayAbstractPaymentMethod.php @@ -17,7 +17,7 @@ * All Heidelpay payment methods will extend this abstract payment method * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/PaymentMethods/HeidelpayCreditCardPaymentMethod.php b/PaymentMethods/HeidelpayCreditCardPaymentMethod.php old mode 100644 new mode 100755 index bd6813f95da..654f8bf481a --- a/PaymentMethods/HeidelpayCreditCardPaymentMethod.php +++ b/PaymentMethods/HeidelpayCreditCardPaymentMethod.php @@ -12,7 +12,7 @@ * This is the payment class for heidelpay credit card * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/PaymentMethods/HeidelpayDebitCardPaymentMethod.php b/PaymentMethods/HeidelpayDebitCardPaymentMethod.php old mode 100644 new mode 100755 index 20a4b937057..b2844081a8d --- a/PaymentMethods/HeidelpayDebitCardPaymentMethod.php +++ b/PaymentMethods/HeidelpayDebitCardPaymentMethod.php @@ -12,7 +12,7 @@ * This is the payment class for heidelpay debit card * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/PaymentMethods/HeidelpayDirectDebitPaymentMethod.php b/PaymentMethods/HeidelpayDirectDebitPaymentMethod.php old mode 100644 new mode 100755 index 59b39896329..860eb13c6b9 --- a/PaymentMethods/HeidelpayDirectDebitPaymentMethod.php +++ b/PaymentMethods/HeidelpayDirectDebitPaymentMethod.php @@ -11,7 +11,7 @@ * The heidelpay Direct Debit payment method. * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento2 * * @author Stephano Vogel diff --git a/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php b/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php old mode 100644 new mode 100755 index f1c0fb67e3b..b1632c0cf47 --- a/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php +++ b/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php @@ -11,7 +11,7 @@ * The heidelpay Direct Debit payment method. * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento2 * * @author Stephano Vogel diff --git a/PaymentMethods/HeidelpayGiropayPaymentMethod.php b/PaymentMethods/HeidelpayGiropayPaymentMethod.php old mode 100644 new mode 100755 index db35f737c0f..b0731b0142f --- a/PaymentMethods/HeidelpayGiropayPaymentMethod.php +++ b/PaymentMethods/HeidelpayGiropayPaymentMethod.php @@ -11,7 +11,7 @@ * heidelpay Payment Method for giropay. * * @license Use of this software requires acceptance of the License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento2 * @author Stephano Vogel * diff --git a/PaymentMethods/HeidelpayInvoicePaymentMethod.php b/PaymentMethods/HeidelpayInvoicePaymentMethod.php old mode 100644 new mode 100755 index 0e765ff706c..c94c3e0b5b0 --- a/PaymentMethods/HeidelpayInvoicePaymentMethod.php +++ b/PaymentMethods/HeidelpayInvoicePaymentMethod.php @@ -12,7 +12,7 @@ * This is the payment class for heidelpay prepayment * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php b/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php old mode 100644 new mode 100755 index 1e81e3bdd91..3934e946de5 --- a/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php +++ b/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php @@ -11,7 +11,7 @@ * This is the payment class for heidelpay prepayment * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/PaymentMethods/HeidelpayPayPalPaymentMethod.php b/PaymentMethods/HeidelpayPayPalPaymentMethod.php old mode 100644 new mode 100755 index d9e4b829693..dcb33c9f085 --- a/PaymentMethods/HeidelpayPayPalPaymentMethod.php +++ b/PaymentMethods/HeidelpayPayPalPaymentMethod.php @@ -12,7 +12,7 @@ * This is the payment class for heidelpay PayPal * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/PaymentMethods/HeidelpayPrepaymentPaymentMethod.php b/PaymentMethods/HeidelpayPrepaymentPaymentMethod.php old mode 100644 new mode 100755 index eab7e842c81..92ef1463601 --- a/PaymentMethods/HeidelpayPrepaymentPaymentMethod.php +++ b/PaymentMethods/HeidelpayPrepaymentPaymentMethod.php @@ -11,7 +11,7 @@ * This is the payment class for heidelpay prepayment * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/PaymentMethods/HeidelpaySofortPaymentMethod.php b/PaymentMethods/HeidelpaySofortPaymentMethod.php old mode 100644 new mode 100755 index 1a641742c12..6399388ef23 --- a/PaymentMethods/HeidelpaySofortPaymentMethod.php +++ b/PaymentMethods/HeidelpaySofortPaymentMethod.php @@ -11,7 +11,7 @@ * This is the payment class for heidelpay sofort * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php old mode 100644 new mode 100755 index ac32d0c3251..9edc4ae1796 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -12,7 +12,7 @@ * This method will create two table in your magento database * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Jens Richter * diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php old mode 100644 new mode 100755 index 0b8c1d727b0..ac289b48f93 --- a/Setup/UpgradeSchema.php +++ b/Setup/UpgradeSchema.php @@ -11,7 +11,7 @@ * This class provides upgrade schema for table additions and/or changes. * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * @link https://dev.heidelpay.de/magento * @author Stephano Vogel * diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv old mode 100644 new mode 100755 index ae527717133..38188e74e79 --- a/i18n/de_DE.csv +++ b/i18n/de_DE.csv @@ -11,7 +11,7 @@ "HGWIV","Rechnungskauf" "HGWIVS","Gesicherter Rechnungskauf (B2C)" -"HGW_ABOUT_US","Die Heidelberger Payment GmbH, kurz: heidelpay, ist ein führendes, von der BaFin zugelassenes und beaufsichtigtes Zahlungsinstitut für Online-Paymentverfahren, welches das komplette Leistungsspektrum in Sachen elektronische Zahlungsabwicklung abdeckt: vom Processing der Transaktionen über die Vergabe der Akzeptanzstellenverträge bis hin zum Monitoring und Risk Management.

Mehr Informationen finden Sie auf www.heidelpay.de" +"HGW_ABOUT_US","Die heidelpay GmbH, kurz: heidelpay, ist ein führendes, von der BaFin zugelassenes und beaufsichtigtes Zahlungsinstitut für Online-Paymentverfahren, welches das komplette Leistungsspektrum in Sachen elektronische Zahlungsabwicklung abdeckt: vom Processing der Transaktionen über die Vergabe der Akzeptanzstellenverträge bis hin zum Monitoring und Risk Management.

Mehr Informationen finden Sie auf www.heidelpay.de" "Security Sender","Sender-ID" "User Login","Login" diff --git a/i18n/en_US.csv b/i18n/en_US.csv old mode 100644 new mode 100755 index 84b0ce842f8..4cd5cd5172f --- a/i18n/en_US.csv +++ b/i18n/en_US.csv @@ -11,7 +11,7 @@ "HGWIV","Invoice" "HGWIVS","Invoice Secured (B2C)" -"HGW_ABOUT_US","Heidelberger Payment GmbH, shortly: heidelpay, is a leading payment institution for online payment methods authorized and regulated by BaFin, which offers the full range of services for an electronic payment processing from one single source: from processing of transactions and providing of acceptance contracts to monitoring and risk management.

For more information please visit www.heidelpay.de" +"HGW_ABOUT_US","heidelpay GmbH, shortly: heidelpay, is a leading payment institution for online payment methods authorized and regulated by BaFin, which offers the full range of services for an electronic payment processing from one single source: from processing of transactions and providing of acceptance contracts to monitoring and risk management.

For more information please visit www.heidelpay.de" "If this is enabled the heidelpay sandbox will be used. Otherwise the real payment system will be used.","If this is enabled the heidelpay sandbox will be used. Otherwise the real payment system will be used." "An unexpected error occurred. Please contact us to get further information.","An unexpected error occurred. Please contact us to get further information." diff --git a/registration.php b/registration.php old mode 100644 new mode 100755 index 3a0a150ea88..cf2fef2aa93 --- a/registration.php +++ b/registration.php @@ -3,7 +3,7 @@ * heidelpay registrar for this magento2 extension * * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. - * @copyright Copyright © 2016-present Heidelberger Payment GmbH. All rights reserved. + * @copyright Copyright © 2016-present heidelpay GmbH. All rights reserved. * * @link https://dev.heidelpay.de/magento * diff --git a/view/adminhtml/templates/info/invoice.phtml b/view/adminhtml/templates/info/invoice.phtml old mode 100644 new mode 100755 index 1d02004ff79..70aed49705b --- a/view/adminhtml/templates/info/invoice.phtml +++ b/view/adminhtml/templates/info/invoice.phtml @@ -1,7 +1,7 @@ Date: Wed, 28 Feb 2018 11:38:07 +0100 Subject: [PATCH 3/3] [change] (MAGE-35) update version and changelog. --- CHANGELOG.md | 5 +++++ etc/module.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b995337bf0a..070f10dc805 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ This project does not follow a versioning standard. Versions are crafted after the dates; for example, the version 17.7.25 was released on July, 25th in 2017 +## 18.2.28 + +## Changed +- Renamed 'Heidelberger Payment GmbH' to 'heidelpay GmbH' due to re-branding. + ## 18.1.24 ### Fixed diff --git a/etc/module.xml b/etc/module.xml index 62b429c558f..4b3a022404d 100755 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,5 +1,5 @@ - +