Changeset 2877106

Timestamp:

03/09/2023 11:19:30 AM (3 years ago)

Author:

zaytseff

Message:

v1.1.1 Fix php-8 install & save settings errors

Location:

multi-crypto-currency-payment/trunk

Files:

• inc/invoice-admin-trait.php (modified) (5 diffs)
• inc/invoice-utils-trait.php (modified) (8 diffs)
• mccp.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

multi-crypto-currency-payment/trunk/inc/invoice-admin-trait.php

@@ -40 +40 @@
     */
     public function admin_options() {
-        $this->update();
         $this->mccp_init_form_fields();
         if ( Apirone::isFiatSupported(get_option('woocommerce_currency')) ) :?>
@@ -183 +182 @@
                 'description' => __('List of available cryptocurrencies processed by Apirone', 'mccp'),
                 'desc_tip' => true,
+                'default' => [],
             ),
             'factor' => array(
@@ -216 +216 @@
         );
     }
+    /**
+    * Save apirone currensies into options table
+    */
+    public function validate_currencies_list_field($k, $v) {
+        $currencies = $this->mccp_currencies();
+
+        foreach ($currencies as $key => $value) {
+            if (!empty($value->address) && !$value->valid) {
+                $currencies[$key]->address = '';
+                $currencies[$key]->enabled = 0;
+                $currencies[$key]->valid = 0;
+            }
+        }
+        return $currencies;
+    }
+
 
     /**
@@ -229 +245 @@
     public function mccp_currency($apirone_currency, $apirone_account = false) {
             $currency = $this->get_mccp_currency($apirone_currency->abbr);
-            if ($currency == false || !property_exists($currency, 'name')) {
+            if ($currency == false || gettype($currency) === 'array' || !property_exists($currency, 'name')) {
                 $currency = new \stdClass();
 
@@ -244 +260 @@
             // Set address from config 
             if ($_SERVER['REQUEST_METHOD'] == 'POST' && $apirone_account) {
-                $currency->enabled = sanitize_text_field($_POST['woocommerce_mccp_currencies'][$currency->abbr]['enabled']);
+                if (array_key_exists('enabled', $_POST['woocommerce_mccp_currencies'][$currency->abbr])) {
+                    $currency->enabled = sanitize_text_field($_POST['woocommerce_mccp_currencies'][$currency->abbr]['enabled']);
+                }
                 $currency->address = sanitize_text_field($_POST['woocommerce_mccp_currencies'][$currency->abbr]['address']);
                 if ($currency->address != '') {

multi-crypto-currency-payment/trunk/inc/invoice-utils-trait.php

@@ -102 +102 @@
      */
     public function get_mccp_currency($abbr) {
-        $currencies = $this->get_option('currencies');
+        $currencies = (array) $this->get_option('currencies');
 
         if ( $currencies && array_key_exists($abbr, $currencies) ) {
@@ -133 +133 @@
 
         $woo_currency = get_woocommerce_currency();
-
         $active_currencies = array();
-        foreach ($this->get_option('currencies') as $item) {
+
+        foreach ((array) $this->get_option('currencies') as $item) {
             if ($item->testnet === 1 && !current_user_can('manage_options')) {
                 continue;
@@ -190 +190 @@
 
     /**
+     * Update plugin version only
+     *
+     * @return void 
+     */ 
+    function upd_version($new) {
+        $settings = get_option('woocommerce_mccp_settings');
+        $settings['version'] = $new;
+
+        update_option('woocommerce_mccp_settings', $settings);
+    }
+
+    /**
      * Plugin version update entry point
      *
@@ -195 +207 @@
      */
     function update() {
-        if ($this->version() === false) {
-            $this->update_1_0_0__1_1_0();
+        $this->update_1_0_0__1_1_0();
+        $this->update_1_1_0__1_1_1();
+    }
+
+    /**
+     * Update plugin from 1.1.0 to 1.1.1
+     *
+     * @return void 
+     */
+    function update_1_1_0__1_1_1() {
+        if ($this->version() === '1.1.0') {
+            $this->upd_version('1.1.1');
         }
     }
@@ -206 +228 @@
      */
     function update_1_0_0__1_1_0() {
+        if ($this->version() !== false) {
+            return;
+        }
         global $wpdb, $table_prefix;
 
@@ -223 +248 @@
 
         $apirone_account = $this->mccp_account();
-        
+
         // Map old currensies
         foreach (Apirone::currencyList() as $apirone_currency) {
             $currency = $this->mccp_currency($apirone_currency, $apirone_account);
-            if (array_key_exists($apirone_currency->abbr, $settings['currencies'])) {
+            if (array_key_exists($apirone_currency->abbr, (array) $settings['currencies'])) {
                 $old_currency = $settings['currencies'][$apirone_currency->abbr];
-                if ($old_currency['address']) {
-                    $currency->address = $old_currency['address'];
-                    $result = Apirone::setTransferAddress($apirone_account, $currency->abbr, $old_currency['address']);
-                    if ($result) {
-                        $currency->valid = 1;
+                if (gettype($old_currency) === 'array') { // Update from version 1.0.0
+                    if ($old_currency['address']) {
+                        $currency->address = $old_currency['address'];
+                        $result = Apirone::setTransferAddress($apirone_account, $currency->abbr, $old_currency['address']);
+                        if ($result) {
+                            $currency->valid = 1;
+                        }
                     }
+                    $currency->enabled = ($old_currency['enabled']) ? 1 : 0;
                 }
-                $currency->enabled = ($old_currency['enabled']) ? 1 : 0;
+                else { // Clear install of 1.1.1
+                    $currency = $old_currency;
+                }
             }
-
             $mccp_currencies[$apirone_currency->abbr] = $currency;
 
@@ -244 +273 @@
         // Update currensies
         $settings['currencies'] = $mccp_currencies;
-        // Add version
+        // Add new params
+        $settings['factor'] = '1';
+        $settings['timeout'] = '1800';
+        $settings['check_timeout'] = '10';
+        $settings['backlink'] = '';
+        $settings['apirone_logo'] = 'yes';
         $settings['version'] = '1.1.0';
+        
         // Unset unused
         unset($settings['count_confirmations']);
@@ -252 +287 @@
         unset($settings['statuses']);
 
-        update_option('woocommerce_mccp_settings', $settings);      
-    }
-
+        update_option('woocommerce_mccp_settings', $settings);
+        delete_option('woocommerce_mccp_wallets');
+    }
 }

multi-crypto-currency-payment/trunk/mccp.php

@@ -4 +4 @@
 Plugin URI: https://github.com/zaytseff/mccp-woo
 Description: Multi currency crypto payments for Woocommerce. Uses Apirone Processing Provider
-Version: 1.1.0
+Version: 1.1.1
 Author: Alex Zaytseff
 Author URI: https://github.com/zaytseff
@@ -17 +17 @@
 require_once('inc/apirone_api/Payment.php');
 
-define('PLUGIN_VERSION', '1.1.0');
 define('MCCP_ROOT', __DIR__);
 define('MCCP_MAIN', __FILE__);
@@ -40 +39 @@
         return;
 
-    // require_once 'inc/class-mccp.php';
     require_once 'inc/invoice-class.php';
 
-    
     /**
      * Add MCCP gateway to WooCommerce

multi-crypto-currency-payment/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.1.1
 Requires PHP: 7.0
-Stable tag: 1.1.0
+Stable tag: 1.1.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
 Woocommerce plugin - Multi CryptoCurrency Payments
-Requires at least WooCommerce: 4.0 Tested up to: 4.9.7 License: GPLv2 or later
+Requires at least WooCommerce: 4.0 Tested up to: 7.4 License: GPLv2 or later
 
 == Description ==
@@ -78 +78 @@
 
 == Changelog ==
+= Version 1.1.1 | 09/03/2023 =
+- Fix installation errors on php-8.x version.
+- Fix update from 1.0.0 on php-8.x
+- Improve new installation (without plugin update)
+- Improve update logic
+
 = Version 1.1.0 | 25/12/2022 =
 - Add apirone invoices support.