Merge pull request #49 from heidelpay/develop

Develop
heidelpay · Feb 28, 2018 · 0091e97 · 0091e97
2 parents 17720fc + 63e490e
commit 0091e97
Show file tree

Hide file tree

Showing 57 changed files with 64 additions and 58 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
  *
@@ -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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
  *