Changeset 2428892

Timestamp:

11/30/2020 07:48:31 PM (5 years ago)

Author:

sixg

Message:

Created tag v2.4.12.

Location:

splitit-installment-payments-enabler/tags/v2.4.12

Files:

• . (copied) (copied from splitit-installment-payments-enabler/trunk)
• classes/splitit-api.php (modified) (6 diffs)
• classes/splitit-settings.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• splitit.php (modified) (8 diffs)

splitit-installment-payments-enabler/tags/v2.4.12/classes/splitit-api.php

@@ -53 +53 @@
         $params = array('UserName' => $this->_username,
             'Password' => $this->_password,
-            'TouchPoint' => array("Code" => "WooCommercePlugin", "Version" => "2.4.11"),
+            'TouchPoint' => array("Code" => "WooCommercePlugin", "Version" => "2.4.12"),
         );
 
@@ -232 +232 @@
                 "Email" => $order_data['Email'],
                 "PhoneNumber" => $order_data['Phone'],
+                "CultureName" => $culture = str_replace('_', '-', get_locale()),
             );
             $params['PaymentWizardData'] = array(
@@ -250 +251 @@
             }
 
-            $items = WC()->cart->get_cart();
+            $cart = WC()->cart;
+            $items = $cart->get_cart();
+            if (!function_exists('is_plugin_active')) {
+                include_once(ABSPATH . 'wp-admin/includes/plugin.php');
+            }
+            if (is_plugin_active('woocommerce-avatax/woocommerce-avatax.php')) {     // if avatax enabled, recalculate taxes
+                define(WOOCOMMERCE_CHECKOUT, true);
+                $this->removeTaxCache();
+                new WC_Cart_Totals($cart);
+                WC()->cart->calculate_totals();
+            }
             $itemsArr = array();
             foreach ($items as $item => $values) {
@@ -261 +272 @@
                 ));
             }
+            $params['PlanData']['Amount']['Value']=WC()->cart->get_total(false);
             $params['CartData'] = array(
                 "Items" => $itemsArr,
@@ -350 +362 @@
             try {
                 // print_r($params);
+                $this->_log->info(__FILE__, __LINE__, __METHOD__);
+                $this->_log->add($params);
                 $result = $this->make_request($this->_API['url'], "InstallmentPlan/Initiate", $params);
                 $userid = "0";
@@ -645 +659 @@
     }
 
+    /**
+     * Remove tax cache to allow recalculate tax when avatax is installed
+     */
+    public function removeTaxCache()
+    {
+        global $wp_object_cache;
+        $cache = $wp_object_cache->cache;
+        unset($cache['taxes']);
+        $wp_object_cache->cache = $cache;
+    }
 }

splitit-installment-payments-enabler/tags/v2.4.12/classes/splitit-settings.php

@@ -41 +41 @@
         $fields =
         array(
-            'enabled' => array(
-                'title' => __('Enable/Disable', 'splitit'),
-                'type' => 'checkbox',
-                'label' => __('Enable Splitit Payment', 'splitit'),
-                'default' => 'yes',
-            ),
             '_General_settings' => array(
                 'type' => 'title',
@@ -52 +46 @@
                 'description' => __('Api and debug settings'),
             ),
+
+            'enabled' => array(
+                'title' => __('Enable/Disable', 'splitit'),
+                'type' => 'checkbox',
+                'label' => __('Enable Splitit Payment', 'splitit'),
+                'default' => 'yes',
+            ),
 
             'splitit_api_terminal_key' => array(

splitit-installment-payments-enabler/tags/v2.4.12/readme.txt

@@ -3 +3 @@
 Tags: ecommerce, e-commerce, commerce, wordpress ecommerce, sales, sell, shop, shopping, checkout, payment, splitit
 Requires at least: 3.0.1
-Tested up to: 5.5.0
-Stable tag: 2.4.11
+Tested up to: 5.6.0
+Stable tag: 2.4.12
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -71 +71 @@
 == Changelog ==
 
+= 2.4.12 =
+* Fix tax when avatax is installed
+* Add support language on checkout
+* Fix BR culture
+* Fix session issue
+* Fix settings save
+* Fix for google crawlers
+
 = 2.4.11 =
 *Fix help me link

splitit-installment-payments-enabler/tags/v2.4.12/splitit.php

@@ -5 +5 @@
 Plugin URI: http://wordpress.org/plugins/splitit/
 Description: Integrates Splitit payment method into your WooCommerce installation.
-Version: 2.4.11
+Version: 2.4.12
 Author: Splitit
 Text Domain: splitit
@@ -177 +177 @@
     if (!class_exists('WC_Payment_Gateway')) {return;}
 
-    define('Splitit_VERSION', '2.4.11');
+    define('Splitit_VERSION', '2.4.12');
     define('Splitit_logo_source_local', plugin_dir_url(__FILE__) . 'assets/images/Offical_Splitit_Logo.png');
 
@@ -434 +434 @@
             do_action('splitit_settings_table_before');
 
-            echo "<table class=\"form-table\">";
+//          echo "<table class=\"form-table\">";
             $this->generate_settings_html();
-            echo "</table";
+//          echo "</table";
 
             do_action('splitit_settings_table_after');
@@ -1260 +1260 @@
             // $esi = isset($_COOKIE["splitit_checkout_session_id_data"]) ? wc_clean($_COOKIE["splitit_checkout_session_id_data"]) : false;
             $esi = (WC()->session->get('splitit_checkout_session_id_data')) ? WC()->session->get('splitit_checkout_session_id_data') : false;
+            if(!$esi){
+                $api = self::getApi($this->settings);
+                $esi = $api->login();
+            }
             // echo $esi.'<pre>';
             // print_r(WC()->session->get('splitit_checkout_session_id_data'));die('-------fsfsdfs');
@@ -1266 +1270 @@
             if (empty($exists_data_array)) {
                 $api = self::getApi($this->settings); //passing settings to API
+                
+                /* Fix for avatax */
+                $cart = WC()->cart;
+                if (!function_exists('is_plugin_active')) {
+                    include_once(ABSPATH . 'wp-admin/includes/plugin.php');
+                }
+                if (is_plugin_active('woocommerce-avatax/woocommerce-avatax.php')) {     // if avatax enabled, recalculate taxes
+                    define(WOOCOMMERCE_CHECKOUT, true);
+                    $api->removeTaxCache();
+                    new WC_Cart_Totals($cart);
+                    WC()->cart->calculate_totals();
+                }
+                /* Fix for avatax */
+                
                 if (!isset($this->settings['splitit_cancel_url']) || $this->settings['splitit_cancel_url'] == '') {
                     $this->settings['splitit_cancel_url'] = 'checkout/';
@@ -1282 +1300 @@
                     exit;
                 }
-                $total_amount_on_cart = WC()->cart->total;
+                $total_amount_on_cart = WC()->cart->get_total(false);
                 if($total_amount_on_cart != $verifyData->{'OriginalAmountPaid'}){
                     wc_clear_notices();
@@ -1648 +1666 @@
             $learnmore = " <a href='" . $this->getHelpMeLink($product->get_price()) . "' id='tell-me-more'>" . $learnmoreImage . "</a>";
             $split_price = round($product->get_price() / self::$_maxInstallments, 3);
-            return '<span style="display:block;" class="splitit-installment-price splitit-installment-price-product">or ' . self::$_maxInstallments . ' interest-free payments of ' . wc_price($split_price, array('decimals' => 2)) . ' with ' . $replace . $learnmore . '</span>';
+            $resultPrice = str_replace('woocommerce-Price-amount', '', wc_price($split_price, array('decimals' => 2)));
+            return '<span style="display:block;" class="splitit-installment-price splitit-installment-price-product">or ' . self::$_maxInstallments . ' interest-free payments of ' . $resultPrice . ' with ' . $replace . $learnmore . '</span>';
         }
 
@@ -2001 +2020 @@
             $apiKey = $this->get_option('splitit_api_terminal_key');
             $culture = str_replace('_', '-', get_locale());
+            $culture = $culture != 'pt-BR' ?: 'pt-PT';
             $currencyCode = "USD";
             if (get_woocommerce_currency() != "") {