1.5.7

eMerchantPay · Nov 20, 2020 · e80bdb7 · e80bdb7
1 parent cebbbb1
commit e80bdb7
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 15 deletions.
diff --git 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
@@ -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
@@ -77,21 +77,22 @@ 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(
                         $order->getOrderCurrencyCode()
                     )
                     ->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
@@ -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
@@ -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
@@ -19,7 +19,7 @@ GNU General Public License for more details.
 <config>
     <modules>
        <EMerchantPay_Genesis>
-         <version>1.5.6</version>
+         <version>1.5.7</version>
        </EMerchantPay_Genesis>
     </modules>
 

diff --git 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."
+"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
@@ -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"