From d35fd244c273742df159296940cdcee4bfc1e098 Mon Sep 17 00:00:00 2001 From: Piotr Date: Fri, 9 Oct 2015 08:27:41 +0200 Subject: [PATCH] corrected amount checking and fix translation --- languages/en-GB.plg_j2store_payment_dotpay.sys.ini | 1 + languages/pl-PL.plg_j2store_payment_dotpay.sys.ini | 1 + payment_dotpay.php | 4 ++-- payment_dotpay.xml | 8 +++++--- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 languages/en-GB.plg_j2store_payment_dotpay.sys.ini create mode 100644 languages/pl-PL.plg_j2store_payment_dotpay.sys.ini diff --git a/languages/en-GB.plg_j2store_payment_dotpay.sys.ini b/languages/en-GB.plg_j2store_payment_dotpay.sys.ini new file mode 100644 index 0000000..e2156d9 --- /dev/null +++ b/languages/en-GB.plg_j2store_payment_dotpay.sys.ini @@ -0,0 +1 @@ +J2STORE_DOTPAY_PAYMENT_DESC="Dotpay payment gateway for J2Store." \ No newline at end of file diff --git a/languages/pl-PL.plg_j2store_payment_dotpay.sys.ini b/languages/pl-PL.plg_j2store_payment_dotpay.sys.ini new file mode 100644 index 0000000..b3cdf5b --- /dev/null +++ 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 index 2667b44..f8c6366 100644 --- 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 index d271b4a..d358959 100644 --- a/payment_dotpay.xml +++ b/payment_dotpay.xml @@ -4,8 +4,8 @@ 1.0 August 2015 Dotpay - - + galaspiotrek@gmail.com + dotpay Dotpay GNU General Public License v2 or later J2STORE_DOTPAY_PAYMENT_DESC @@ -17,9 +17,11 @@ payment_dotpay validation - + languages/en-GB.plg_j2store_payment_dotpay.ini languages/pl-PL.plg_j2store_payment_dotpay.ini + languages/en-GB.plg_j2store_payment_dotpay.sys.ini + languages/pl-PL.plg_j2store_payment_dotpay.sys.ini