feat: IntCurrency to HRK, EUR mandatory, removed old HRK to EUR conversion, CurrencyCode mandatory added property

Author: marinsagovac

CHANGELOG.md

@@ -6,6 +6,16 @@ Most recent latest changes is defined on every major, minor and bug fixes.
 
 ## Versions
 
+### 1.7
+
+Use since 01.01.2023 as EUR mandatory currency:
+
+* EUR as main currency set 1.1.2022., removed unnecessary codes for conversion from HRK to EUR
+* Added Currency code 978 and sent mandatory as `CurrencyCode` property [ISO 4217 HR](https://www.six-group.com/en/products-services/financial-information/data-standards.html)
+* IntCurrency/IntAmount set as HRK currency for informative calculation
+
+> Na svim Vašim shopID-evima će se sa 01.01.2023 od strane PayWay-a automatski postaviti EUR valuta, a na platnoj formi će i dalje biti dvojni prikaz cijena, no sa EUR valutom kao osnovnom i informativnim iznosom u HRK.
+
 ### 1.6.1
 
 * Curl module load checks

README.md

@@ -11,13 +11,15 @@ Support payment gateway for PayWay HT payment gateway.
 
 ## API
 
-API 2.0 support updated to latest IntlCurrency and IntAmount 
+API 2.x.x support updated to latest IntlCurrency and IntAmount 
 
 Official Croatia Hrvatski Telekom [PayWay](https://www.hrvatskitelekom.hr/poslovni/ict/poslovna-rjesenja/web-shop#payway).
 
 ## FEATURES
 
 Features
+* EUR mandatory currency, HRK set as IntAmount from 1.1.2023.
+* Added Currency code 978 and sent mandatory as `CurrencyCode` property [ISO 4217 HR](https://www.six-group.com/en/products-services/financial-information/data-standards.html)
 * IntlCurrency and IntAmount added
 * API 2.0 Support
 * Production and testing API
@@ -31,25 +33,30 @@ Features
 Removed
 * Removed woo-multi-currency support and integration
 * Removed T-Com names
+* Removed HRK to EUR conversion
 
 ## RELEASES
 
 ### OFFICIAL RELEASES
 
-API 2.0:
+Latest version:
 
+* Version [1.7](https://github.com/marinsagovac/woocommerce-tcom-payway/archive/refs/tags/1.7.zip) December/2022
+
+API 2.x.x:
+
+* Version [1.7](https://github.com/marinsagovac/woocommerce-tcom-payway/archive/refs/tags/1.7.zip) December/2022
 * Version [1.6.1](https://github.com/marinsagovac/woocommerce-tcom-payway/archive/refs/tags/1.6.1.zip) September/2022
-* Version [1.5](https://github.com/marinsagovac/woocommerce-tcom-payway/releases/tags/1.5.zip) November/2021
-* Version [1.4](https://github.com/marinsagovac/woocommerce-tcom-payway/releases/tags/1.4.zip) June/2021
 
-Old releases:
+Old releases (not recommended):
 
+* Version [1.5](https://github.com/marinsagovac/woocommerce-tcom-payway/releases/tags/1.5.zip) November/2021
+* Version [1.4](https://github.com/marinsagovac/woocommerce-tcom-payway/releases/tags/1.4.zip) June/2021
 * Version [1.3.3](https://github.com/marinsagovac/woocommerce-tcom-payway/releases/tag/1.3.3) January/2021
 * Version [1.3](https://github.com/marinsagovac/woocommerce-tcom-payway/releases/tag/1.3) December/2019
 * Release [1.2](https://github.com/marinsagovac/woocommerce-tcom-payway/releases/tag/1.2)
 * Release [1.1](https://github.com/marinsagovac/woocommerce-tcom-payway/releases/tag/1.1)
 
-
 ## INSTALLATION
 
 Download ZIP archive, upload via plugin page and apply package. Activate plugin. Change settings under Woocomerce settings page on the checkout page.

classes/class-wc-tpayway.php

@@ -119,8 +119,8 @@ public function admin_options()
         echo '</table>';
         echo '<p>';
         echo '<p>' . 'HNB rates fetched: ' . $this->get_last_modified_hnb_file()  . '</p>';
-        echo '<p>Until 12.12.2022. calculation will be fixed between HRK-EUR: 1 HRK = '. $this->ratehrkfixed .'</p>';
-        echo '<p>If you use other curency it can automatically convert from USD (Wordpress) to HRK (PayWay) using ' .$hnbRatesUri . '</p>';
+        echo '<p>Preferred currency will be EUR, make sure that default currency on your webshop is set to EUR</p>';
+        echo '<p>Other currency will automatically calculated and sent to PayWay using HNB rates: USD (Wordpress) to HRK (PayWay) using ' .$hnbRatesUri . '</p>';
         echo '</p>';
     }
 
@@ -151,7 +151,7 @@ private function get_hnb_currency()
 
         curl_setopt($ch, CURLOPT_URL, $this->tecajnaHnbApi);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20100101 Firefox/17.0');
+        curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.2; WOW64; rv:18.0) Gecko/20100101 Firefox/18.0');
 
         $content = curl_exec($ch);
         if (curl_errno($ch)) {
@@ -325,46 +325,19 @@ public function generate_ipg_form($order_id)
 
         $pgw_language = strtoupper($pgw_language);
 
-        // $order->order_total = $order->order_total;
-        if ('HR' === $woocommerce->customer->country) {
-            if ('HRK' === $order->get_order_currency()) {
-                $order_total = $order_total;
-            }
-        } else {
-            $order_total = $order_total;
-        }
-
         $curr_symbole = get_woocommerce_currency();
-        $hrk_rate = 1;
-        $convert = 'HRK' !== $curr_symbole;
-
         $wcml_settings = get_option('_wcml_settings'); // WooCommerce Multilingual - Multi Currency (WPML plugin)
 
-        // HRK currency
-        if (false === $convert && $hrk_rate) {
-            if ($wcml_settings) {
-                $curr_rates = $wcml_settings['currency_options'];
-
-                $hrk_rate = $curr_rates[$curr_symbole]['rate'];
-                $order_total = $woocommerce->cart->total * (1 / $hrk_rate);
-            }
-        } else {
-            // Difference than HRK
-
-            // HNB Tecaj
-            if (!$wcml_settings) {
-                if ($curr_symbole === "EUR") {
-                    // Force to 7,3450 until 12.12.2022. fixed rate
-                    $order_total = $woocommerce->cart->total * $this->ratehrkfixed;
-
-                } else {
-                    if ($this->curlExtension) {
-                        $order_total = $woocommerce->cart->total * $this->fetch_hnb_currency($curr_symbole);
-                    }
-                }
-            } else {
+        if (!$wcml_settings) {
+            if ($curr_symbole === "EUR") {
                 $order_total = $woocommerce->cart->total;
+            } else {
+                if ($this->curlExtension) {
+                    $order_total = $woocommerce->cart->total * $this->fetch_hnb_currency($curr_symbole);
+                }
             }
+        } else {
+            $order_total = $woocommerce->cart->total;
         }
 
         $order_format_value = str_pad(($order_total * 100), 12, '0', STR_PAD_LEFT);
@@ -412,13 +385,16 @@ public function generate_ipg_form($order_id)
             'CustomerEmail' => substr($pgw_email, 0, 254),
             'CustomerPhone' => substr($pgw_telephone, 0, 20),
             // 'PaymentPlan' => 0000, // No payment plan
-            'IntAmount' => $total_amount_request / $this->ratehrkfixed,
             'ReturnMethod' => 'POST',
 
             'acq_id' => $this->acq_id, // secret key
             'PurchaseAmt' => $order_format_value,
 
-            'IntCurrency' => 'EUR',
+            'IntCurrency' => 'HRK',
+            'IntAmount' => $total_amount_request * $this->ratehrkfixed,
+
+            // ISO 4217
+            'CurrencyCode' => 978
         );
 
         $form_args_array = array();

tcom-payway-woocommerce.php

@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce PayWay Hrvatski Telekom payment gateway
  * Plugin URI:  https://github.com/marinsagovac/woocommerce-tcom-payway
  * Description: WooCommerce PayWay Hrvatski Telekom payment gateway
- * Version:     1.6
+ * Version:     1.7
  * Licence:     MIT
  * License URI: https://opensource.org/licenses/MIT
  * Author:      Marin Šagovac