corrected amount checking and fix translation

dotpay · Oct 9, 2015 · d35fd24 · d35fd24
1 parent 67921cf
commit d35fd24
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/languages/en-GB.plg_j2store_payment_dotpay.sys.ini b/languages/en-GB.plg_j2store_payment_dotpay.sys.ini
@@ -0,0 +1 @@
+J2STORE_DOTPAY_PAYMENT_DESC="Dotpay payment gateway for J2Store."
diff --git a/languages/pl-PL.plg_j2store_payment_dotpay.sys.ini b/languages/pl-PL.plg_j2store_payment_dotpay.sys.ini
@@ -0,0 +1 @@
+J2STORE_DOTPAY_PAYMENT_DESC="System płatności dla J2Store"
diff --git a/payment_dotpay.php b/payment_dotpay.php
@@ -380,10 +380,10 @@ private function getValidation($data) {
         if (hash('sha256', $string) != $data->getString('signature')){
                 return self::VALIDATION_TOKEN;
         }
-        if ((float) $data->getString('operation_amount') != (float) $total_price){
+        if ((float) $data->getString('operation_original_amount') != (float) $total_price){
                 return self::VALIDATION_PRICE;
         }
-        if ($data->getString('operation_currency') != $this->getCurrencyFromOrder($data->getString('control'))){
+        if ($data->getString('operation_original_currency') != $this->getCurrencyFromOrder($data->getString('control'))){
                 return self::VALIDATION_CURRENCY;
         }
         return $data->getString('operation_status');

diff --git a/payment_dotpay.xml b/payment_dotpay.xml
@@ -4,8 +4,8 @@
     <version>1.0</version>
     <creationDate>August 2015</creationDate>
     <author>Dotpay</author>
-    <authorEmail></authorEmail>
-    <authorUrl></authorUrl>
+    <authorEmail>galaspiotrek@gmail.com</authorEmail>
+    <authorUrl>dotpay</authorUrl>
     <copyright>Dotpay</copyright>
     <license>GNU General Public License v2 or later</license>
     <description>J2STORE_DOTPAY_PAYMENT_DESC</description>
@@ -17,9 +17,11 @@
         <folder>payment_dotpay</folder>
         <folder>validation</folder>
     </files>
-    <languages>
+    <languages folder="admin">
         <language tag="en-GB">languages/en-GB.plg_j2store_payment_dotpay.ini</language>
         <language tag="pl-PL">languages/pl-PL.plg_j2store_payment_dotpay.ini</language>
+        <language tag="en-GB">languages/en-GB.plg_j2store_payment_dotpay.sys.ini</language>
+        <language tag="pl-PL">languages/pl-PL.plg_j2store_payment_dotpay.sys.ini</language>
     </languages>
     <config>
         <fields name="params">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		J2STORE_DOTPAY_PAYMENT_DESC="Dotpay payment gateway for J2Store."
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		J2STORE_DOTPAY_PAYMENT_DESC="System płatności dla J2Store"