From e80bdb7aedae30c5d64919e057087f0f26bdf8b6 Mon Sep 17 00:00:00 2001 From: Dimitar Natskin Date: Fri, 20 Nov 2020 10:23:07 +0200 Subject: [PATCH] 1.5.7 --- README.md | 2 +- .../EMerchantPay/Genesis/Helper/Data.php | 23 +++++++++++++++++++ .../EMerchantPay/Genesis/Model/Checkout.php | 15 ++++++------ .../EMerchantPay/Genesis/Model/Direct.php | 17 ++++++++++---- .../Genesis/Model/Task/Recurring.php | 3 ++- .../EMerchantPay/Genesis/etc/config.xml | 2 +- app/locale/en_GB/EMerchantPay_Genesis.csv | 4 +++- app/locale/en_US/EMerchantPay_Genesis.csv | 1 + 8 files changed, 52 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index d0b3582..299e731 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is a Payment Module for Magento Community Edition, that gives you the abili Requirements ------------ -* Magento Community Edition > 1.7 (Tested up to: __1.9.3.1__) +* Magento Community Edition > 1.7 (Tested up to: __1.9.3.6__) * [GenesisPHP v1.18.4](https://github.com/GenesisGateway/genesis_php/releases/tag/1.18.4) - (Integrated in Module) * PCI-certified server in order to use ```emerchantpay Direct``` diff --git a/app/code/community/EMerchantPay/Genesis/Helper/Data.php b/app/code/community/EMerchantPay/Genesis/Helper/Data.php index 3ffc68e..6006668 100755 --- a/app/code/community/EMerchantPay/Genesis/Helper/Data.php +++ b/app/code/community/EMerchantPay/Genesis/Helper/Data.php @@ -30,6 +30,8 @@ class EMerchantPay_Genesis_Helper_Data extends Mage_Core_Helper_Abstract const RAW_DETAILS_TRANSACTION_TYPE = 'transaction_type'; const RAW_DETAILS_TERMINAL_TOKEN = 'terminal_token'; + const PLATFORM_TRANSACTION_PREFIX = 'mage_'; + /** * Include Genesis library * @@ -1077,4 +1079,25 @@ public function getCaptureForRefund(Varien_Object $payment) return $capture; } + + /** + * Return Store frontend name + * + * @return string + */ + public function getStoreName() + { + return Mage::app()->getStore()->getFrontendName(); + } + + /** + * Return platform transaction prefix + * + * @return string + */ + public function getPlatformTransactionPrefix() + { + return self::PLATFORM_TRANSACTION_PREFIX; + } + } diff --git a/app/code/community/EMerchantPay/Genesis/Model/Checkout.php b/app/code/community/EMerchantPay/Genesis/Model/Checkout.php index 290bab4..05f3931 100755 --- a/app/code/community/EMerchantPay/Genesis/Model/Checkout.php +++ b/app/code/community/EMerchantPay/Genesis/Model/Checkout.php @@ -77,13 +77,14 @@ public function order(Varien_Object $payment, $amount) $genesis = new \Genesis\Genesis('WPF\Create'); - $orderItemsList = $this->getHelper()->getItemList($order); + $orderItemsList = $this->getHelper()->getItemList($order); + $platformPrefix = $this->getHelper()->getPlatformTransactionPrefix(); $genesis ->request() ->setTransactionId( $this->getHelper()->genTransactionId( - $order->getIncrementId() + $platformPrefix . $order->getIncrementId() ) ) ->setCurrency( @@ -91,7 +92,7 @@ public function order(Varien_Object $payment, $amount) ) ->setAmount($amount) ->setUsage( - $this->getHelper()->__('Magento Payment') + $this->getHelper()->__('Payment via') . ' ' . $this->getHelper()->getStoreName() ) ->setDescription($orderItemsList) ->setCustomerPhone($billing->getTelephone()) @@ -364,7 +365,7 @@ public function capture(Varien_Object $payment, $amount) ->request() ->setTransactionId( $this->getHelper()->genTransactionId( - $payment->getOrder()->getIncrementId() + $payment->getOrder()->getIncrementId() ) ) ->setRemoteIp( @@ -473,7 +474,7 @@ public function refund(Varien_Object $payment, $amount) ->request() ->setTransactionId( $this->getHelper()->genTransactionId( - $payment->getOrder()->getIncrementId() + $payment->getOrder()->getIncrementId() ) ) ->setRemoteIp( @@ -594,7 +595,7 @@ public function void(Varien_Object $payment) ->request() ->setTransactionId( $this->getHelper()->genTransactionId( - $payment->getOrder()->getIncrementId() + $payment->getOrder()->getIncrementId() ) ) ->setRemoteIp( @@ -1110,7 +1111,7 @@ public function submitRecurringProfile( $amount ) ->setUsage( - $this->getHelper()->__('Magento Init Recurring Payment') + $this->getHelper()->__('Recurring Payment via') . ' ' . $this->getHelper()->getStoreName() ) ->setDescription( $this->getHelper()->getRecurringProfileItemDescription( diff --git a/app/code/community/EMerchantPay/Genesis/Model/Direct.php b/app/code/community/EMerchantPay/Genesis/Model/Direct.php index 01f6a5f..2238c7f 100755 --- a/app/code/community/EMerchantPay/Genesis/Model/Direct.php +++ b/app/code/community/EMerchantPay/Genesis/Model/Direct.php @@ -258,6 +258,7 @@ protected function processTransaction(Varien_Object $payment, $amount) $billing = $order->getBillingAddress(); $shipping = $order->getShippingAddress(); + $platform_prefix = $this->getHelper()->getPlatformTransactionPrefix(); $genesis = new \Genesis\Genesis( $this->getTransactionTypeRequestClassName( @@ -269,14 +270,18 @@ protected function processTransaction(Varien_Object $payment, $amount) ->request() ->setTransactionId( $this->getHelper()->genTransactionId( - $order->getIncrementId() + $platform_prefix . $order->getIncrementId() ) ) ->setRemoteIp( $this->getHelper()->getRemoteAddress() ) ->setUsage( - $this->getHelper()->getItemList($order) + $this->getHelper()->__('Payment via') + . ' ' + . $this->getHelper()->getStoreName() + . ' ' + . $this->getHelper()->getItemList($order) ) ->setCurrency( $order->getOrderCurrencyCode() @@ -692,7 +697,9 @@ public function void(Varien_Object $payment) $genesis ->request() ->setTransactionId( - $this->getHelper()->genTransactionId($payment->getOrder()->getIncrementId()) + $this->getHelper()->genTransactionId( + $payment->getOrder()->getIncrementId() + ) ) ->setRemoteIp( $this->getHelper()->getRemoteAddress() @@ -1021,7 +1028,9 @@ public function submitRecurringProfile( ->setTransactionId( $profile->getInternalReferenceId() ) - ->setUsage('Magento Init Recurring Payment') + ->setUsage( + $this->getHelper()->__('Recurring Payment via') . ' ' . $this->getHelper()->getStoreName() + ) ->setMoto('') ->setRemoteIp( $this->getHelper()->getRemoteAddress() diff --git a/app/code/community/EMerchantPay/Genesis/Model/Task/Recurring.php b/app/code/community/EMerchantPay/Genesis/Model/Task/Recurring.php index 426d654..e52b344 100755 --- a/app/code/community/EMerchantPay/Genesis/Model/Task/Recurring.php +++ b/app/code/community/EMerchantPay/Genesis/Model/Task/Recurring.php @@ -302,12 +302,13 @@ protected function chargeRecurringProfile( } } + $platform_prefix = $this->getHelper()->getPlatformTransactionPrefix(); $genesis = new \Genesis\Genesis("Financial\\Cards\\Recurring\\RecurringSale"); $genesis ->request() ->setTransactionId( - $this->getHelper()->genTransactionId() + $this->getHelper()->genTransactionId($platform_prefix) ) ->setReferenceId( $initRecurringCaptureTransaction->getTxnId() diff --git a/app/code/community/EMerchantPay/Genesis/etc/config.xml b/app/code/community/EMerchantPay/Genesis/etc/config.xml index 3254dcf..46c135d 100755 --- a/app/code/community/EMerchantPay/Genesis/etc/config.xml +++ b/app/code/community/EMerchantPay/Genesis/etc/config.xml @@ -19,7 +19,7 @@ GNU General Public License for more details. - 1.5.6 + 1.5.7 diff --git a/app/locale/en_GB/EMerchantPay_Genesis.csv b/app/locale/en_GB/EMerchantPay_Genesis.csv index bda890f..c88d9dd 100644 --- a/app/locale/en_GB/EMerchantPay_Genesis.csv +++ b/app/locale/en_GB/EMerchantPay_Genesis.csv @@ -31,6 +31,8 @@ "InstaDebit","InstaDebit Payin" "Instant Transfer","Instant Transfer" "Itau","Itau" +"Payment via","Payment via" +"Recurring Payment via","Recurring Payment via" "Magento Payment","Magento Payment" "Magento Capture","Magento Capture" "Magento Refund","Magento Refund" @@ -76,4 +78,4 @@ "You will be redirected to our partner's website, where you can safely pay with your credit card.","You will be redirected to our partner's website, where you can safely pay with your credit card." "Your payment session has been cancelled successfully!","Your payment session has been cancelled successfully!" "eps","eps" -"You cannot finish the payment as a guest, please login / register.","You cannot finish the payment as a guest, please login / register." \ No newline at end of file +"You cannot finish the payment as a guest, please login / register.","You cannot finish the payment as a guest, please login / register." diff --git a/app/locale/en_US/EMerchantPay_Genesis.csv b/app/locale/en_US/EMerchantPay_Genesis.csv index 0450fce..84e5a67 100644 --- a/app/locale/en_US/EMerchantPay_Genesis.csv +++ b/app/locale/en_US/EMerchantPay_Genesis.csv @@ -31,6 +31,7 @@ "InstaDebit","InstaDebit Payin" "Instant Transfer","Instant Transfer" "Itau","Itau" +"Payment via","Payment via" "Magento Payment","Magento Payment" "Magento Capture","Magento Capture" "Magento Refund","Magento Refund"