Merge pull request #98 from mollie/5.0.3

5.0.3
mollie · Dec 27, 2018 · 8aa0670 · 8aa0670
2 parents 1e0bd99 + b9bd7b3
commit 8aa0670
Show file tree

Hide file tree

Showing 23 changed files with 152 additions and 84 deletions.
diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Abstract.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Abstract.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (c) 2012-2018, Mollie B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * @category    Mollie
+ * @package     Mollie_Mpm
+ * @author      Mollie B.V. ([email protected])
+ * @copyright   Copyright (c) 2012-2018 Mollie B.V. (https://www.mollie.nl)
+ * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
+ */
+
+class Mollie_Mpm_Model_Method_Deprecated_Abstract extends Mage_Payment_Model_Method_Abstract
+{
+
+    /**
+     * Availability options
+     */
+    protected $_canUseInternal = false;
+    protected $_canUseCheckout = false;
+    protected $_canUseForMultishipping = false;
+}
diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void00.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void00.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void00 extends Mollie_Mpm_Model_Mollie
+class Mollie_Mpm_Model_Method_Deprecated_Void00 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void01.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void01.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void01 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void01 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void02.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void02.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void02 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void02 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void03.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void03.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void03 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void03 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void04.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void04.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void04 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void04 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void05.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void05.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void05 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void05 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void06.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void06.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void06 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void06 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void07.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void07.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void07 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void07 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void08.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void08.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void08 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void08 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void09.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void09.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void09 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void09 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void10.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void10.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void10 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void10 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void11.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void11.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void11 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void11 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void12.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void12.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void12 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void12 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void13.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void13.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void13 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void13 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void14.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void14.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void14 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void14 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }

diff --git a/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void15.php b/app/code/community/Mollie/Mpm/Model/Method/Deprecated/Void15.php
@@ -31,7 +31,7 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD-License 2
  */
 
-class Mollie_Mpm_Model_Method_Deprecated_Void15 extends Mollie_Mpm_Model_Api
+class Mollie_Mpm_Model_Method_Deprecated_Void15 extends Mollie_Mpm_Model_Method_Deprecated_Abstract
 {
 
     /**
@@ -52,10 +52,10 @@ public function getTitle()
         try {
             $paymentInfo = $this->getInfoInstance();
             if ($paymentInfo instanceof Mage_Sales_Model_Order_Payment) {
-                $orderId = $paymentInfo->getOrder()->getId();
+                $order = $paymentInfo->getOrder();
                 /** @var Mollie_Mpm_Model_Payments $oldPaymentModel */
                 $oldPaymentModel = Mage::getModel('mpm/payments');
-                if ($title = $oldPaymentModel->getTitleByOrderId($orderId)) {
+                if ($title = $oldPaymentModel->getTitleByOrder($order)) {
                     return $title;
                 }
             }