From 5f95a4a0671e27ec808fd8a5dd6f4f85029612a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tatarczuk?= Date: Fri, 27 Nov 2015 12:04:25 +0100 Subject: [PATCH 1/2] Clean up unnecessary code --- .../community/Sign2pay/Payment/Model/Processor.php | 12 +++++++----- .../Payment/controllers/PaymentController.php | 6 ------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/code/community/Sign2pay/Payment/Model/Processor.php b/app/code/community/Sign2pay/Payment/Model/Processor.php index d8e540c..2995aed 100644 --- a/app/code/community/Sign2pay/Payment/Model/Processor.php +++ b/app/code/community/Sign2pay/Payment/Model/Processor.php @@ -57,8 +57,11 @@ public function performPayment(array $initial_response) return $this->processPaymentCaptureResponse($payment); } catch (Exception $e) { + Mage::logException($e); Mage::getSingleton('checkout/session')->addError($e->getMessage()); - return Mage::app()->getResponse()->setRedirect('cancel', array('_secure'=>true)); + + $this->cancel(); + return Mage::app()->getResponse()->setRedirect('failure', array('_secure'=>true)); } } @@ -196,12 +199,11 @@ public function processPaymentCaptureResponse(array $request) /** * Cancel the order - * - * @param Mage_Sales_Model_Order $order */ - public function cancel(Mage_Sales_Model_Order $order) + public function cancel() { - $order->cancel()->save(); + Mage::helper('sign2pay')->setStatusOnOrder($this->_order, 'Canceled'); + $this->_order->cancel()->save(); return $this; } diff --git a/app/code/community/Sign2pay/Payment/controllers/PaymentController.php b/app/code/community/Sign2pay/Payment/controllers/PaymentController.php index ecbb58c..8c33e44 100644 --- a/app/code/community/Sign2pay/Payment/controllers/PaymentController.php +++ b/app/code/community/Sign2pay/Payment/controllers/PaymentController.php @@ -85,13 +85,7 @@ public function cancelAction() $session = Mage::getSingleton('checkout/session'); $session->setQuoteId($session->getSign2payQuoteId(true)); if ($session->getLastRealOrderId()) { - $order = Mage::getModel('sales/order')->loadByIncrementId($session->getLastRealOrderId()); - if ($order->getId()) { - Mage::getModel('sign2pay/processor')->cancel($order); - } Mage::helper('sign2pay/checkout')->restoreQuote(); - Mage::getSingleton('checkout/session')->addError("The payment has been cancelled."); - } $this->_redirect('checkout/cart'); } From 86f6a2b56b759fb8aa93bc600f759ca2adfd8820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tatarczuk?= Date: Fri, 27 Nov 2015 12:28:03 +0100 Subject: [PATCH 2/2] Inrease version to 0.7.5 --- app/code/community/Sign2pay/Payment/etc/config.xml | 2 +- package.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/code/community/Sign2pay/Payment/etc/config.xml b/app/code/community/Sign2pay/Payment/etc/config.xml index b90ca3d..59d4c42 100644 --- a/app/code/community/Sign2pay/Payment/etc/config.xml +++ b/app/code/community/Sign2pay/Payment/etc/config.xml @@ -2,7 +2,7 @@ - 0.7.4 + 0.7.5 diff --git a/package.xml b/package.xml index 5bbff4b..c7d5647 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ Sign2Pay_Mobile_Payments - 0.7.4 + 0.7.5 beta Sign2Pay Commercial License community @@ -13,13 +13,13 @@ Analysing hundreds of data points in a single signature, Sign2Pay provides the s Compatible with: 1.7, 1.8, 1.9 Changes: -- Add dynamic bank logo to payment method label -- Add mobile phone number to authorize request +- Simplify order cancelation workflow during payment +- Change logo url in admin section Sign2PaySign2Payteam@sign2pay.com - 2015-11-24 - - + 2015-11-27 + + 5.3.06.0.0