Merge pull request #24 from marinsagovac/feature/hnb_tecaj_v3

feat: hnb tecaj v3 change

Author: marinsagovac

CHANGELOG.md

@@ -6,6 +6,10 @@ Most recent latest changes is defined on every major, minor and bug fixes.
 
 ## Versions
 
+### 1.7.1
+
+* Change HNB URL tecajna to v3
+
 ### 1.7
 
 Use since 01.01.2023 as EUR mandatory currency:

README.md

@@ -41,10 +41,11 @@ Removed
 
 Latest version:
 
-* Version [1.7](https://github.com/marinsagovac/woocommerce-tcom-payway/archive/refs/tags/1.7.zip) December/2022
+* Version [1.7.1](https://github.com/marinsagovac/woocommerce-tcom-payway/archive/refs/tags/1.7.1.zip) January/2023
 
 API 2.x.x:
 
+* Version [1.7.1](https://github.com/marinsagovac/woocommerce-tcom-payway/archive/refs/tags/1.7.1.zip) January/2023
 * 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
 

classes/class-wc-tpayway.php

@@ -21,7 +21,7 @@ public function __construct()
         $this->curlExtension = extension_loaded('curl');
 
         $this->ratehrkfixed = 7.53450;
-        $this->tecajnaHnbApi = "https://api.hnb.hr/tecajn/v2";
+        $this->tecajnaHnbApi = "https://api.hnb.hr/tecajn-eur/v3";
 
         $this->api_version = '2.0';
 
@@ -205,7 +205,7 @@ private function get_last_modified_hnb_file()
     /**
      * Retrieve by currency conversion rate
      *
-     * @return void
+     * @return array|string|string[]|void
      */
     private function fetch_hnb_currency($currency) {
 
@@ -216,7 +216,8 @@ private function fetch_hnb_currency($currency) {
 
         foreach ($jsonFile as $val) {
             if ($val['valuta'] === $currency) {
-                return $val['jedinica'] * $val['srednji_tecaj'];
+                /** @var float $val */
+                return str_replace(",", ".", $val['srednji_tecaj']);
             }
 
         }
@@ -410,16 +411,16 @@ public function generate_ipg_form($order_id)
         }
 
         return '<p></p>
-    <p>Total amount will be <b>' . number_format(($order_total)) . ' ' . $curr_symbole . '</b></p>
-    <form action="' . $pgDomain . '" method="post" name="payway-authorize-form" id="payway-authorize-form" type="application/x-www-form-urlencoded">
-        ' . implode('', $form_args_array) . '
-        <input type="submit" class="button-alt" id="submit_ipg_payment_form" value="' . __('Pay via PayWay', 'tcom-payway-wc') . '" />
-            <a class="button cancel" href="' . $order->get_cancel_order_url() . '">' . __('Cancel order &amp; restore cart', 'tcom-payway-wc') . '</a>
-        </form>
-        <!-- autoform submit -->
-        <script type="text/javascript">
-            jQuery("#submit_ipg_payment_form").trigger("click");
-        </script>
+            <p>Total amount will be <b>' . number_format(($order_total)) . ' ' . $curr_symbole . '</b></p>
+            <form action="' . $pgDomain . '" method="post" name="payway-authorize-form" id="payway-authorize-form" type="application/x-www-form-urlencoded">
+                ' . implode('', $form_args_array) . '
+                <input type="submit" class="button-alt" id="submit_ipg_payment_form" value="' . __('Pay via PayWay', 'tcom-payway-wc') . '" />
+                <a class="button cancel" href="' . $order->get_cancel_order_url() . '">' . __('Cancel order &amp; restore cart', 'tcom-payway-wc') . '</a>
+            </form>
+            <!-- autoform submit -->
+            <script type="text/javascript">
+                jQuery("#submit_ipg_payment_form").trigger("click");
+            </script>
         ';
     }
 

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.7
+ * Version:     1.7.1
  * Licence:     MIT
  * License URI: https://opensource.org/licenses/MIT
  * Author:      Marin Šagovac