Changeset 3327241

Timestamp:

07/13/2025 11:04:58 PM (7 months ago)

Author:

fullstackhouse

Message:

tagging 1.8.0

Location:

wc-smart-cod

Files:

• tags/1.8.0 (copied) (copied from wc-smart-cod/trunk)
• tags/1.8.0/README.txt (copied) (copied from wc-smart-cod/trunk/README.txt) (1 diff)
• tags/1.8.0/admin/class-wc-smart-cod-admin.php (copied) (copied from wc-smart-cod/trunk/admin/class-wc-smart-cod-admin.php) (36 diffs)
• tags/1.8.0/admin/css/wc-smart-cod-admin.css (modified) (1 diff)
• tags/1.8.0/admin/js/wc-smart-cod-admin.min.js (modified) (1 diff)
• tags/1.8.0/includes/class-wc-smart-cod-notification-settings.php (modified) (2 diffs)
• tags/1.8.0/includes/class-wc-smart-cod.php (copied) (copied from wc-smart-cod/trunk/includes/class-wc-smart-cod.php) (4 diffs)
• tags/1.8.0/public/class-wc-smart-cod-public.php (copied) (copied from wc-smart-cod/trunk/public/class-wc-smart-cod-public.php)
• tags/1.8.0/wc-smart-cod.php (copied) (copied from wc-smart-cod/trunk/wc-smart-cod.php) (2 diffs)
• trunk/README.txt (modified) (1 diff)
• trunk/admin/class-wc-smart-cod-admin.php (modified) (36 diffs)
• trunk/admin/css/wc-smart-cod-admin.css (modified) (1 diff)
• trunk/admin/js/wc-smart-cod-admin.min.js (modified) (1 diff)
• trunk/includes/class-wc-smart-cod-notification-settings.php (modified) (2 diffs)
• trunk/includes/class-wc-smart-cod.php (modified) (4 diffs)
• trunk/wc-smart-cod.php (modified) (2 diffs)

wc-smart-cod/tags/1.8.0/README.txt

@@ -3 +3 @@
 Tags: WooCommerce, Cash on Delivery, COD, COD Extra Fee, Smart COD, WooCommerce COD, Multiple Fees
 Requires at least: 3.0.1
-Tested up to: 6.8
-Stable tag: 1.7.3
+Tested up to: 6.8.1
+Stable tag: 1.8.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

wc-smart-cod/tags/1.8.0/admin/class-wc-smart-cod-admin.php

@@ -51 +51 @@
     public $new_wc = false;
 
+    private $restriction_settings = array();
+
+    private $fee_settings = array();
+
+    private $prepared_fields = array();
+
+    private $settings_manager = array();
+
     public function __construct() {
 
@@ -56 +64 @@
         $this->plugin_name = 'wc-smart-cod';
         $this->version = SMART_COD_VER;
+        
+        $this->settings_manager = (object)Wc_Smart_Cod::get_settings_manager();
 
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
         add_action( 'woocommerce_settings_api_form_fields_cod', array( $this, 'extend_cod' ) );
         add_action( 'woocommerce_settings_api_sanitized_fields_cod', array( $this, 'clean_up_settings' ) );
+        add_filter( 'experimental_woocommerce_admin_payment_reactify_render_sections', array( $this, 'woocommerce_smart_cod') );
         add_action( 'woocommerce_delete_shipping_zone', array( $this, 'clean_up_gateway' ) );
     }
@@ -144 +155 @@
         echo '</h2>';
         echo wp_kses_post( wpautop( $this->get_method_description() ) );
+        
         $template_data = array(
             'promo_texts' => WC_Smart_Cod::$promo_texts,
@@ -221 +233 @@
     }
 
+    public function woocommerce_smart_cod($sections) {
+        $cod = 'cod';
+        return array_filter($sections, function($v) use ($cod) {
+            return $v !== $cod;
+        });
+    }
+
+    public function get_field_value($key, $field, $post_data = array())
+    {
+        if ($this->has_prefix_in_array($key, $this->settings_manager->e)) {
+            if (!in_array($key, haystack: $this->settings_manager->d)) {
+                if (isset($this->settings[$key]) && $this->settings[$key] !== '') {
+                    return $this->settings[$key];
+                }
+                return '';
+            }
+        }
+        return parent::get_field_value($key, $field, $post_data);
+    }
+
     private function update_wc_smart_cod( $settings, $restriction_settings ) {
 
@@ -258 +290 @@
     }
 
+    /**
+     * Check if a string starts with any of the prefixes in an array.
+     *
+     * @param string $haystack   The string to check.
+     * @param array  $prefixes   Array of possible prefixes.
+     * @return bool              True if any prefix matches the start of the string.
+     */
+    protected function has_prefix_in_array($haystack, $prefixes) {
+        foreach ($prefixes as $prefix) {
+            if (strncmp($haystack, $prefix, strlen($prefix)) === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     protected function analyze_fields( $form_fields, $settings, $restriction_settings, $old_wc_smart_cod ) {
 
-        $fields = array();
         $fee_settings = array_key_exists( 'fee_settings', $settings ) ? $settings[ 'fee_settings' ] : false;
         $fee_settings = $fee_settings ? json_decode( $fee_settings, true ) : array();
@@ -274 +321 @@
             $class_arr = explode( ' ', $field[ 'class' ] );
 
+            /**
+             * - Checks if the current field has the 'wc-smart-cod-restriction' class:
+             *   - Determines whether the restriction mode should be 'enable' or 'disable' based on $restriction_settings.
+             *   - Updates the field title to reflect the enabled state if applicable.
+             *   - Initializes restriction settings for new fields after plugin update.
+             *   - Sets a custom data attribute 'data-mode' to indicate the current mode.
+             */
             if( in_array( 'wc-smart-cod-restriction', $class_arr ) ) {
                 // determine include or exclude
@@ -299 +353 @@
             }
 
+            /*   - Checks if the current field has the 'wc-smart-cod-percentage' class:
+             *   - Ensures the fee type is set (defaults to 'fixed' if not present).
+             *   - Marks that fee settings need to be updated if a new key is added.
+             */
             if( in_array( 'wc-smart-cod-percentage', $class_arr ) ) {
 
@@ -311 +369 @@
             }
 
+            if ($this->settings_manager && count($this->settings_manager->e) > 0) {
+                if ($this->has_prefix_in_array($key, $this->settings_manager->e)) {
+                
+                    if(!in_array($key, $this->settings_manager->d)) {
+                        $needle = $this->get_dsb_key(true);
+                        $form_fields[ $key ][ $this->get_dsb_key() ] = true;
+                        $form_fields[ $key ][ $needle ] = $field[ $needle ] . ' wc-smart-cod-pro-field';
+                    }
+                    
+                }
+            }
         }
 
@@ -336 +405 @@
     }
 
+    private function get_dsb_key( $needle = false ) {
+        return $needle ? "class" : "disabled";
+    }
+
     public function extend_cod( $form_fields ) {
         $this->prepared_fields = $this->get_prepared_fields();
@@ -389 +462 @@
         $this->new_wc = class_exists( 'WC_Shipping_Zones' ) ? true : false;
         $existing_settings = $this->settings;
-        $existing_zone_restrictions = array();
         $countries = new WC_Countries;
         $states = $countries->get_allowed_country_states();
@@ -468 +540 @@
                     'data-placeholder' => __( 'Select shipping zones', 'wc-smart-cod' ),
                     'data-name' => 'shipping_zone_restrictions'
-                )
+                ),
+                'disabled' => false
             );
 
@@ -483 +556 @@
                 'data-placeholder' => __( 'Select Countries', 'wc-smart-cod' ),
                 'data-name' => 'country_restrictions'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -496 +570 @@
                 'data-placeholder' => __( 'Select States', 'wc-smart-cod' ),
                 'data-name' => 'state_restrictions'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -506 +581 @@
             'custom_attributes' => array(
                 'data-name' => 'restrict_postals'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -516 +592 @@
             'custom_attributes' => array(
                 'data-name' => 'city_restrictions'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -527 +604 @@
             'custom_attributes' => array(
                 'data-name' => 'cart_amount_restriction'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -540 +618 @@
                 'data-placeholder' => __( 'Select Roles', 'wc-smart-cod' ),
                 'data-name' => 'user_role_restriction'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -553 +632 @@
             ),
             'default' => 'one_product',
-            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart belongs to a restricted category. Select "all", if you want the COD to be restricted if all the cart product\'s belongs to restricted categories. Then add the restricted categories in the select field below.', 'wc-smart-cod' )
+            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart belongs to a restricted category. Select "all", if you want the COD to be restricted if all the cart product\'s belongs to restricted categories. Then add the restricted categories in the select field below.', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -568 +648 @@
                 'data-name' => 'category_restriction',
                 'data-action' => 'wcsmartcod_json_search_categories'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -581 +662 @@
             ),
             'default' => 'one_product',
-            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart is restricted. Select "all", if you want the COD to be restricted if all of the cart\'s product\'s are restricted. Then add the restricted products in the select field below.', 'wc-smart-cod' )
+            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart is restricted. Select "all", if you want the COD to be restricted if all of the cart\'s product\'s are restricted. Then add the restricted products in the select field below.', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -596 +678 @@
                 'data-minimum_input_length' => '1',
                 'data-name' => 'product_restriction'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -609 +692 @@
             ),
             'default' => 'one_product',
-            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart belongs to a restricted shipping class. Select "all", if you want the COD to be restricted if all of the cart\'s product\'s belongs to restricted shipping classes. Then add the restricted shipping classes in the select field below.', 'wc-smart-cod' )
+            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart belongs to a restricted shipping class. Select "all", if you want the COD to be restricted if all of the cart\'s product\'s belongs to restricted shipping classes. Then add the restricted shipping classes in the select field below.', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -622 +706 @@
                 'data-placeholder' => __( 'Select Shipping Classes', 'wc-smart-cod' ),
                 'data-name' => 'shipping_class_restriction'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -642 +727 @@
             'type' => 'cod_messages',
             'class' => 'wc-smart-cod-group',
-            'description' => __( 'An informational text to display before the payment methods, when the COD method is not available for a customer. Leave it empty if you don\'t want to use this feature. You can define different messages per reason.', 'wc-smart-cod' )
+            'description' => __( 'An informational text to display before the payment methods, when the COD method is not available for a customer. Leave it empty if you don\'t want to use this feature. You can define different messages per reason.', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -651 +737 @@
             'description' => __( 'The extra amount you charging for cash on delivery (leave blank or zero if you don\'t charge extra)', 'wc-smart-cod' ),
             'desc_tip' => true,
-            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -665 +752 @@
             'default' => 'round_up',
             'description' => __( 'Examples: Round up setting will transform 5.345&euro; to 6&euro;<br />Round down will transform it to 5&euro;.', 'wc-smart-cod' ),
-            'desc_tip' => false
+            'desc_tip' => false,
+            'disabled' => false
         );
 
@@ -679 +767 @@
             'default' => 'disable',
             'description' => __( 'Is extra fee taxable? Use this option if you have taxes enabled in your shop and you want to include tax to COD method.', 'wc-smart-cod' ),
-            'desc_tip' => false
+            'desc_tip' => false,
+            'disabled' => false
         );
 
@@ -691 +780 @@
             'custom_attributes' => array(
                 'data-name' => 'nocharge_amount'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -712 +802 @@
             'default' => array( 'tax', 'shipping' ),
             'description' => __( 'This setting affect those settings: "Disable extra fee if cart amount is greater than this limit." and "Disable if cart amount is greater than". <strong>It defines what is finally calculated as the cart amount.</strong>', 'wc-smart-cod' ),
-            'desc_tip' => false
+            'desc_tip' => false,
+            'disabled' => false
         );
 
@@ -724 +815 @@
                     'desc_tip' => true,
                     'class' => 'wc-smart-cod-group wc-smart-cod-percentage',
-                    'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+                    'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+                    'disabled' => false
                 );
             }
@@ -748 +840 @@
                         'desc_tip' => true,
                         'class' => 'wc-smart-cod-group wc-smart-cod-percentage',
-                        'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+                        'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+                        'disabled' => false
                     );
 
@@ -786 +879 @@
                     'desc_tip' => true,
                     'class' => 'wc-smart-cod-group wc-smart-cod-fee wc-smart-cod-percentage',
-                    'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+                    'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+                    'disabled' => false
                 );
 
@@ -825 +919 @@
                             'desc_tip' => true,
                             'class' => 'wc-smart-cod-group wc-smart-cod-fee wc-smart-cod-percentage',
-                            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+                            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+                            'disabled' => false
                         );
                     }
@@ -838 +933 @@
         $form_fields[ 'fee_settings' ] = array(
             'type' => 'hidden'
+        );
+
+        $form_fields[ 'risk_free_advance_payment' ] = array(
+            'title' => __( 'Partial payment amount for COD orders', 'wc-smart-cod' ),
+            'type' => 'price',
+            'class' => 'wc-smart-cod-group wc-smart-cod-percentage',
+            'description' => __( 'Require customers to pay a portion of the order in advance, before processing a Cash on Delivery order.', 'wc-smart-cod' ),
+            'desc_tip' => true,
+            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+            'disabled' => true
         );
 
@@ -1117 +1222 @@
                     unset( $settings [ $key ] );
             }
-
         }
 
@@ -1194 +1298 @@
                 'enhanced_select' => $enhanced_select_variables,
                 'restriction_settings' => ( object ) $this->get_json_settings( 'restriction_settings' ),
-                'fee_settings' => ( object ) $this->get_json_settings( 'fee_settings' )
+                'fee_settings' => ( object ) $this->get_json_settings( 'fee_settings' ),
+                'pro_site_url' => $this->settings_manager->l
             );
 

wc-smart-cod/tags/1.8.0/admin/css/wc-smart-cod-admin.css

@@ -92 +92 @@
 }
 
+.pro-badge {
+    margin: 5px 0;
+}
+
+.pro-badge a {
+  display: inline-block;
+  padding: 4px 10px;
+  font-size: 10px;
+  font-weight: 600;
+  color: #fff;
+  background: #403447;
+  border-radius: 999px;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
+  letter-spacing: 0.5px;
+  user-select: none;
+  cursor: pointer;
+  text-transform: none;
+  text-decoration: none;
+  transition: all 0.2s ease-in;
+}
+
+.pro-badge a:hover {
+  background-color: #481c41;
+}
+
+.woocommerce_page_wc-settings-checkout-cod form h2 {
+    padding-top: 15px;
+}
+
 @media screen and (min-width: 1200px) {
 

wc-smart-cod/tags/1.8.0/admin/js/wc-smart-cod-admin.min.js

@@ -1 @@
-jQuery(document).ready(function(e){var t=e("#mainform"),a=e(".woocommerce-save-button"),n=e(".wc-smart-cod-group"),c=e(".wc-smartcod-categories, .wc-smartcod-products"),r=e(".wc-smartcod-products.wc-smart-cod-group"),i=e(".wc-smart-cod-restriction"),s=e(".wc-smart-cod-percentage"),o=e("body"),d=e("#woocommerce_cod_restriction_settings"),l=e("#woocommerce_cod_fee_settings"),_=e(".wsc-message-switcher"),m=e(".wsc-message"),u={},h={};smart_cod_variables.hasOwnProperty("restriction_settings")&&(u=smart_cod_variables.restriction_settings),smart_cod_variables.hasOwnProperty("fee_settings")&&(h=smart_cod_variables.fee_settings);var p={init:function(){d.parents("tr").addClass("hidden"),l.parents("tr").addClass("hidden"),i.each(function(t,a){p.enableConditional(e(this))}),s.each(function(t,a){p.enablePercentage(e(this))}),o.on("change",".wc-smart-cod-percantage-switcher",p.switchFee),o.on("click",".wc-smart-cod-mode",p.switchMode),a.click(function(e){p.validateFields(n)||e.preventDefault()}),c.each(function(t,a){p.initSelect2(e(this))}),p.fixSelect2Bug(r),_.on("change",p.changeMessageVisibility)},changeMessageVisibility:function(t){e(this);var a=e(this).val();m.addClass("hidden"),e('.wsc-message[data-restriction="'+a+'"]').removeClass("hidden")},isObjectEmpty:function(e){var t;for(t in e)return!1;return!0},switchMode:function(t){t.preventDefault();var a=e(this),n=a.data("mode"),c="enable"===n?"disable":"enable",r=a.parents("tr").find(".wc-smart-cod-restriction").data("name");"enable"!==n&&"disable"!==n||(u[r]="enable"===c?1:0,d.val(JSON.stringify(u)),a.html(c),a.data("mode",c))},switchFee:function(t){var a=e(this),n=a.prev(),c=a.val(),r=n.attr("name");h[r.slice(16)]=c,l.val(JSON.stringify(h))},enablePercentage:function(t){var a=t.parents("fieldset"),n=e('<select class="wc-smart-cod-percantage-switcher"><option value="fixed">Fixed</option><option value="percentage">%</option></select>'),c="0",r=t.attr("name").slice(16);h.hasOwnProperty(r)?c=h[r]:h[r]=c="fixed",n.val(c),a.append(n)},enableConditional:function(e){var t=e.parents("tr").find("th").find("label");if(t.length>0){var a=t.contents().get(0).nodeValue,n=a.trim().split(" ");if(n[0]){var c=n[0].toLowerCase();switch(c){case"enable":case"disable":var r=e.attr("name"),i=e.data("name");t.contents().get(0).nodeValue=t.text().replace(a,""),n.shift(),t.prepend('<a class="wc-smart-cod-mode" href="#" data-mode="'+c+'" data-input-name="'+r+'">'+c+"</a> "+n.join(" ")),u.hasOwnProperty(i)||(u[i]="enable"===c?1:0)}}}},fixSelect2Bug:function(e){var t=e.data("select2");t&&t.on("results:message",function(e){this.dropdown._resizeDropdown(),this.dropdown._positionDropdown()})},initSelect2:function(t){var a,n=t.data("action")||"woocommerce_json_search_categories";"wcsmartcod_json_search_categories"===n?a=smart_cod_variables.enhanced_select.search_categories_nonce:"woocommerce_json_search_products_and_variations"===n&&(a=smart_cod_variables.enhanced_select.search_products_nonce);var c={allowClear:!!t.data("allow_clear"),placeholder:t.data("placeholder"),minimumInputLength:t.data("minimum_input_length")?t.data("minimum_input_length"):"3",escapeMarkup:function(e){return e},ajax:{url:smart_cod_variables.enhanced_select.ajax_url,dataType:"json",delay:250,data:function(e){return{term:e.term,action:n,security:a,exclude:t.data("exclude"),include:t.data("include"),limit:t.data("limit")}},processResults:function(t){var a=[];return t&&e.each(t,function(e,t){a.push({id:e,text:t})}),{results:a}},cache:!0}};c=e.extend(c,p.getEnhancedSelectFormatString()),t.select2(c).addClass("enhanced")},validateFields:function(a){t.find(".field-error").remove();return a.each(function(t,a){if("woocommerce_cod_include_restrict_postals"!==a.id&&"woocommerce_cod_restrict_postals"!==a.id)return!0;var n=e(this),c=n.val()?n.val().replace(/\s/g,""):n.val();n.val(c)}),!0},getEnhancedSelectFormatString:function(){return{language:{errorLoading:function(){return smart_cod_variables.enhanced_select.i18n_searching},inputTooLong:function(e){var t=e.input.length-e.maximum;return 1===t?smart_cod_variables.enhanced_select.i18n_input_too_long_1:smart_cod_variables.enhanced_select.i18n_input_too_long_n.replace("%qty%",t)},inputTooShort:function(e){var t=e.minimum-e.input.length;return 1===t?smart_cod_variables.enhanced_select.i18n_input_too_short_1:smart_cod_variables.enhanced_select.i18n_input_too_short_n.replace("%qty%",t)},loadingMore:function(){return smart_cod_variables.enhanced_select.i18n_load_more},maximumSelected:function(e){return 1===e.maximum?smart_cod_variables.enhanced_select.i18n_selection_too_long_1:smart_cod_variables.enhanced_select.i18n_selection_too_long_n.replace("%qty%",e.maximum)},noResults:function(){return smart_cod_variables.enhanced_select.i18n_no_matches},searching:function(){return smart_cod_variables.enhanced_select.i18n_searching}}}}};p.init()});
+jQuery(document).ready((function(e){var t=e("#mainform"),a=e(".woocommerce-save-button"),n=e(".wc-smart-cod-group"),r=e(".wc-smartcod-categories, .wc-smartcod-products"),i=e(".wc-smartcod-products.wc-smart-cod-group"),c=e(".wc-smart-cod-restriction"),s=e(".wc-smart-cod-percentage"),o=e("body"),d=e("#woocommerce_cod_restriction_settings"),l=e("#woocommerce_cod_fee_settings"),_=e(".wsc-message-switcher"),m=e(".wsc-message"),u=e(".wc-smart-cod-pro-field"),h={},p={},g="";smart_cod_variables.hasOwnProperty("restriction_settings")&&(h=smart_cod_variables.restriction_settings),smart_cod_variables.hasOwnProperty("fee_settings")&&(p=smart_cod_variables.fee_settings),smart_cod_variables.hasOwnProperty("pro_site_url")&&(g=smart_cod_variables.pro_site_url);var f={init:function(){d.parents("tr").addClass("hidden"),l.parents("tr").addClass("hidden"),c.each((function(t,a){f.enableConditional(e(this))})),s.each((function(t,a){f.enablePercentage(e(this))})),u.each((function(t,a){f.enableProField(e(this))})),o.on("change",".wc-smart-cod-percantage-switcher",f.switchFee),o.on("click",".wc-smart-cod-mode",f.switchMode),a.click((function(e){f.validateFields(n)||e.preventDefault()})),r.each((function(t,a){f.initSelect2(e(this))})),f.fixSelect2Bug(i),_.on("change",f.changeMessageVisibility)},changeMessageVisibility:function(t){e(this);var a=e(this).val();m.addClass("hidden"),e('.wsc-message[data-restriction="'+a+'"]').removeClass("hidden")},isObjectEmpty:function(e){var t;for(t in e)return!1;return!0},switchMode:function(t){t.preventDefault();var a=e(this),n=a.data("mode"),r="enable"===n?"disable":"enable",i=a.parents("tr").find(".wc-smart-cod-restriction").data("name");"enable"!==n&&"disable"!==n||(h[i]="enable"===r?1:0,d.val(JSON.stringify(h)),a.html(r),a.data("mode",r))},switchFee:function(t){var a=e(this),n=a.prev(),r=a.val(),i=n.attr("name");p[i.slice(16)]=r,l.val(JSON.stringify(p))},enablePercentage:function(t){var a=t.parents("fieldset"),n=e('<select class="wc-smart-cod-percantage-switcher"><option value="fixed">Fixed</option><option value="percentage">%</option></select>'),r="0",i=t.attr("name").slice(16);a.find("input").is(":disabled")&&n.prop("disabled",!0),p.hasOwnProperty(i)?r=p[i]:p[i]=r="fixed",n.val(r),a.append(n)},enableConditional:function(e){var t=e.parents("tr").find("th").find("label");if(t.length>0){var a=t.contents().get(0).nodeValue,n=a.trim().split(" ");if(n[0]){var r=n[0].toLowerCase();switch(r){case"enable":case"disable":var i=e.attr("name"),c=e.data("name");t.contents().get(0).nodeValue=t.text().replace(a,""),n.shift(),t.prepend('<a class="wc-smart-cod-mode" href="#" data-mode="'+r+'" data-input-name="'+i+'">'+r+"</a> "+n.join(" ")),h.hasOwnProperty(c)||(h[c]="enable"===r?1:0)}}}},enableProField:function(e){var t=e.parents("tr").find("th");t.length>0&&t.append('<p class="pro-badge"><a href="'+g+'" target="_blank">🚀 Available in PRO</a></p>')},fixSelect2Bug:function(e){var t=e.data("select2");t&&t.on("results:message",(function(e){this.dropdown._resizeDropdown(),this.dropdown._positionDropdown()}))},initSelect2:function(t){var a,n=t.data("action")||"woocommerce_json_search_categories";"wcsmartcod_json_search_categories"===n?a=smart_cod_variables.enhanced_select.search_categories_nonce:"woocommerce_json_search_products_and_variations"===n&&(a=smart_cod_variables.enhanced_select.search_products_nonce);var r={allowClear:!!t.data("allow_clear"),placeholder:t.data("placeholder"),minimumInputLength:t.data("minimum_input_length")?t.data("minimum_input_length"):"3",escapeMarkup:function(e){return e},ajax:{url:smart_cod_variables.enhanced_select.ajax_url,dataType:"json",delay:250,data:function(e){return{term:e.term,action:n,security:a,exclude:t.data("exclude"),include:t.data("include"),limit:t.data("limit")}},processResults:function(t){var a=[];return t&&e.each(t,(function(e,t){a.push({id:e,text:t})})),{results:a}},cache:!0}};r=e.extend(r,f.getEnhancedSelectFormatString()),t.select2(r).addClass("enhanced")},validateFields:function(a){t.find(".field-error").remove();return a.each((function(t,a){if("woocommerce_cod_include_restrict_postals"!==a.id&&"woocommerce_cod_restrict_postals"!==a.id)return!0;var n=e(this),r=n.val()?n.val().replace(/\s/g,""):n.val();n.val(r)})),!0},getEnhancedSelectFormatString:function(){return{language:{errorLoading:function(){return smart_cod_variables.enhanced_select.i18n_searching},inputTooLong:function(e){var t=e.input.length-e.maximum;return 1===t?smart_cod_variables.enhanced_select.i18n_input_too_long_1:smart_cod_variables.enhanced_select.i18n_input_too_long_n.replace("%qty%",t)},inputTooShort:function(e){var t=e.minimum-e.input.length;return 1===t?smart_cod_variables.enhanced_select.i18n_input_too_short_1:smart_cod_variables.enhanced_select.i18n_input_too_short_n.replace("%qty%",t)},loadingMore:function(){return smart_cod_variables.enhanced_select.i18n_load_more},maximumSelected:function(e){return 1===e.maximum?smart_cod_variables.enhanced_select.i18n_selection_too_long_1:smart_cod_variables.enhanced_select.i18n_selection_too_long_n.replace("%qty%",e.maximum)},noResults:function(){return smart_cod_variables.enhanced_select.i18n_no_matches},searching:function(){return smart_cod_variables.enhanced_select.i18n_searching}}}}};f.init()}));

wc-smart-cod/tags/1.8.0/includes/class-wc-smart-cod-notification-settings.php

@@ -17 +17 @@
             $res = wp_remote_get(
                 $this->settings_url,
-                array( 'timeout' => 1 )
+                array( 'timeout' => 5, 'headers' => $headers )
             );
 
@@ -24 +24 @@
             }
 
-            $ok = ( $res
-                && isset( $res['response'] )
-                && isset( $res['response']['code'] )
-                && $res['response']['code'] === 200
-            );
+            $ok = $res
+                && isset($res['response'])
+                && isset($res['response']['code'])
+                && $res['response']['code'] === 200;
     
             if($ok) {

wc-smart-cod/tags/1.8.0/includes/class-wc-smart-cod.php

@@ -80 +80 @@
         $this->plugin_name = 'wc-smart-cod';
         
-        define( 'SMART_COD_VER', '1.7.3' );
+        define( 'SMART_COD_VER', '1.8.0' );
 
         self::$version = SMART_COD_VER;
 
         $this->load_notification_manager();
+
+        $this->load_settings_manager();
 
         self::setup_promos();
@@ -221 +223 @@
     }
 
+    public static function get_settings_manager() {
+
+        $settings = get_transient( 'wc-smart-cod-settings' );
+
+        if( $settings ) {
+            return $settings;
+        }
+
+        $settings_manager = new Wc_Smart_Cod_Settings_Manager( self::$pro_url );
+        $settings = $settings_manager->get_settings_manager();
+
+        set_transient( 'wc-smart-cod-settings', $settings, 86400 );
+        
+        return $settings;
+    }
+
     public function activate_notice() {
 
@@ -268 +286 @@
     }
 
+    public function load_settings_manager() {
+        /**
+         * Class responsible for settings manager
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wc-smart-cod-settings-manager.php';
+    }
+
     public function load_dependencies() {
 
@@ -339 +364 @@
 
     /**
-     * Register all of the hooks related to the admin area functionality
-     * of the plugin.
-     *
-     * @since    1.0.0
-     * @access   private
-     */
-    private function define_admin_hooks() {
-
-        $plugin_admin = new Wc_Smart_Cod_Admin( $this->get_plugin_name(), $this->get_version() );
-
-        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
-
-    }
-
-    /**
      * Register all of the hooks related to the public-facing functionality
      * of the plugin.

wc-smart-cod/tags/1.8.0/wc-smart-cod.php

@@ -17 +17 @@
  * Plugin URI:        https://wordpress.org/plugins/wc-smart-cod/
  * Description:       A powerful plugin that extends WooCommerce COD (Cash on Delivery) Gateway, supporting multiple extra fees and a multiple factor gateway restriction.
- * Version:           1.7.3
+ * Version:           1.8.0
  * Author:            woosmartcod.com
  * Author URI:        https://woosmartcod.com
@@ -25 +25 @@
  * Domain Path:       /languages
  * WC requires at least: 2.7
- * WC tested up to: 9.8.1
+ * WC tested up to: 9.9.5
  */
 

wc-smart-cod/trunk/README.txt

@@ -3 +3 @@
 Tags: WooCommerce, Cash on Delivery, COD, COD Extra Fee, Smart COD, WooCommerce COD, Multiple Fees
 Requires at least: 3.0.1
-Tested up to: 6.8
-Stable tag: 1.7.3
+Tested up to: 6.8.1
+Stable tag: 1.8.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

wc-smart-cod/trunk/admin/class-wc-smart-cod-admin.php

@@ -51 +51 @@
     public $new_wc = false;
 
+    private $restriction_settings = array();
+
+    private $fee_settings = array();
+
+    private $prepared_fields = array();
+
+    private $settings_manager = array();
+
     public function __construct() {
 
@@ -56 +64 @@
         $this->plugin_name = 'wc-smart-cod';
         $this->version = SMART_COD_VER;
+        
+        $this->settings_manager = (object)Wc_Smart_Cod::get_settings_manager();
 
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
         add_action( 'woocommerce_settings_api_form_fields_cod', array( $this, 'extend_cod' ) );
         add_action( 'woocommerce_settings_api_sanitized_fields_cod', array( $this, 'clean_up_settings' ) );
+        add_filter( 'experimental_woocommerce_admin_payment_reactify_render_sections', array( $this, 'woocommerce_smart_cod') );
         add_action( 'woocommerce_delete_shipping_zone', array( $this, 'clean_up_gateway' ) );
     }
@@ -144 +155 @@
         echo '</h2>';
         echo wp_kses_post( wpautop( $this->get_method_description() ) );
+        
         $template_data = array(
             'promo_texts' => WC_Smart_Cod::$promo_texts,
@@ -221 +233 @@
     }
 
+    public function woocommerce_smart_cod($sections) {
+        $cod = 'cod';
+        return array_filter($sections, function($v) use ($cod) {
+            return $v !== $cod;
+        });
+    }
+
+    public function get_field_value($key, $field, $post_data = array())
+    {
+        if ($this->has_prefix_in_array($key, $this->settings_manager->e)) {
+            if (!in_array($key, haystack: $this->settings_manager->d)) {
+                if (isset($this->settings[$key]) && $this->settings[$key] !== '') {
+                    return $this->settings[$key];
+                }
+                return '';
+            }
+        }
+        return parent::get_field_value($key, $field, $post_data);
+    }
+
     private function update_wc_smart_cod( $settings, $restriction_settings ) {
 
@@ -258 +290 @@
     }
 
+    /**
+     * Check if a string starts with any of the prefixes in an array.
+     *
+     * @param string $haystack   The string to check.
+     * @param array  $prefixes   Array of possible prefixes.
+     * @return bool              True if any prefix matches the start of the string.
+     */
+    protected function has_prefix_in_array($haystack, $prefixes) {
+        foreach ($prefixes as $prefix) {
+            if (strncmp($haystack, $prefix, strlen($prefix)) === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     protected function analyze_fields( $form_fields, $settings, $restriction_settings, $old_wc_smart_cod ) {
 
-        $fields = array();
         $fee_settings = array_key_exists( 'fee_settings', $settings ) ? $settings[ 'fee_settings' ] : false;
         $fee_settings = $fee_settings ? json_decode( $fee_settings, true ) : array();
@@ -274 +321 @@
             $class_arr = explode( ' ', $field[ 'class' ] );
 
+            /**
+             * - Checks if the current field has the 'wc-smart-cod-restriction' class:
+             *   - Determines whether the restriction mode should be 'enable' or 'disable' based on $restriction_settings.
+             *   - Updates the field title to reflect the enabled state if applicable.
+             *   - Initializes restriction settings for new fields after plugin update.
+             *   - Sets a custom data attribute 'data-mode' to indicate the current mode.
+             */
             if( in_array( 'wc-smart-cod-restriction', $class_arr ) ) {
                 // determine include or exclude
@@ -299 +353 @@
             }
 
+            /*   - Checks if the current field has the 'wc-smart-cod-percentage' class:
+             *   - Ensures the fee type is set (defaults to 'fixed' if not present).
+             *   - Marks that fee settings need to be updated if a new key is added.
+             */
             if( in_array( 'wc-smart-cod-percentage', $class_arr ) ) {
 
@@ -311 +369 @@
             }
 
+            if ($this->settings_manager && count($this->settings_manager->e) > 0) {
+                if ($this->has_prefix_in_array($key, $this->settings_manager->e)) {
+                
+                    if(!in_array($key, $this->settings_manager->d)) {
+                        $needle = $this->get_dsb_key(true);
+                        $form_fields[ $key ][ $this->get_dsb_key() ] = true;
+                        $form_fields[ $key ][ $needle ] = $field[ $needle ] . ' wc-smart-cod-pro-field';
+                    }
+                    
+                }
+            }
         }
 
@@ -336 +405 @@
     }
 
+    private function get_dsb_key( $needle = false ) {
+        return $needle ? "class" : "disabled";
+    }
+
     public function extend_cod( $form_fields ) {
         $this->prepared_fields = $this->get_prepared_fields();
@@ -389 +462 @@
         $this->new_wc = class_exists( 'WC_Shipping_Zones' ) ? true : false;
         $existing_settings = $this->settings;
-        $existing_zone_restrictions = array();
         $countries = new WC_Countries;
         $states = $countries->get_allowed_country_states();
@@ -468 +540 @@
                     'data-placeholder' => __( 'Select shipping zones', 'wc-smart-cod' ),
                     'data-name' => 'shipping_zone_restrictions'
-                )
+                ),
+                'disabled' => false
             );
 
@@ -483 +556 @@
                 'data-placeholder' => __( 'Select Countries', 'wc-smart-cod' ),
                 'data-name' => 'country_restrictions'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -496 +570 @@
                 'data-placeholder' => __( 'Select States', 'wc-smart-cod' ),
                 'data-name' => 'state_restrictions'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -506 +581 @@
             'custom_attributes' => array(
                 'data-name' => 'restrict_postals'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -516 +592 @@
             'custom_attributes' => array(
                 'data-name' => 'city_restrictions'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -527 +604 @@
             'custom_attributes' => array(
                 'data-name' => 'cart_amount_restriction'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -540 +618 @@
                 'data-placeholder' => __( 'Select Roles', 'wc-smart-cod' ),
                 'data-name' => 'user_role_restriction'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -553 +632 @@
             ),
             'default' => 'one_product',
-            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart belongs to a restricted category. Select "all", if you want the COD to be restricted if all the cart product\'s belongs to restricted categories. Then add the restricted categories in the select field below.', 'wc-smart-cod' )
+            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart belongs to a restricted category. Select "all", if you want the COD to be restricted if all the cart product\'s belongs to restricted categories. Then add the restricted categories in the select field below.', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -568 +648 @@
                 'data-name' => 'category_restriction',
                 'data-action' => 'wcsmartcod_json_search_categories'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -581 +662 @@
             ),
             'default' => 'one_product',
-            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart is restricted. Select "all", if you want the COD to be restricted if all of the cart\'s product\'s are restricted. Then add the restricted products in the select field below.', 'wc-smart-cod' )
+            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart is restricted. Select "all", if you want the COD to be restricted if all of the cart\'s product\'s are restricted. Then add the restricted products in the select field below.', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -596 +678 @@
                 'data-minimum_input_length' => '1',
                 'data-name' => 'product_restriction'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -609 +692 @@
             ),
             'default' => 'one_product',
-            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart belongs to a restricted shipping class. Select "all", if you want the COD to be restricted if all of the cart\'s product\'s belongs to restricted shipping classes. Then add the restricted shipping classes in the select field below.', 'wc-smart-cod' )
+            'description' => __( 'Select "at least one", if you want the COD to be restricted when at least one product of the cart belongs to a restricted shipping class. Select "all", if you want the COD to be restricted if all of the cart\'s product\'s belongs to restricted shipping classes. Then add the restricted shipping classes in the select field below.', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -622 +706 @@
                 'data-placeholder' => __( 'Select Shipping Classes', 'wc-smart-cod' ),
                 'data-name' => 'shipping_class_restriction'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -642 +727 @@
             'type' => 'cod_messages',
             'class' => 'wc-smart-cod-group',
-            'description' => __( 'An informational text to display before the payment methods, when the COD method is not available for a customer. Leave it empty if you don\'t want to use this feature. You can define different messages per reason.', 'wc-smart-cod' )
+            'description' => __( 'An informational text to display before the payment methods, when the COD method is not available for a customer. Leave it empty if you don\'t want to use this feature. You can define different messages per reason.', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -651 +737 @@
             'description' => __( 'The extra amount you charging for cash on delivery (leave blank or zero if you don\'t charge extra)', 'wc-smart-cod' ),
             'desc_tip' => true,
-            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+            'disabled' => false
         );
 
@@ -665 +752 @@
             'default' => 'round_up',
             'description' => __( 'Examples: Round up setting will transform 5.345&euro; to 6&euro;<br />Round down will transform it to 5&euro;.', 'wc-smart-cod' ),
-            'desc_tip' => false
+            'desc_tip' => false,
+            'disabled' => false
         );
 
@@ -679 +767 @@
             'default' => 'disable',
             'description' => __( 'Is extra fee taxable? Use this option if you have taxes enabled in your shop and you want to include tax to COD method.', 'wc-smart-cod' ),
-            'desc_tip' => false
+            'desc_tip' => false,
+            'disabled' => false
         );
 
@@ -691 +780 @@
             'custom_attributes' => array(
                 'data-name' => 'nocharge_amount'
-            )
+            ),
+            'disabled' => false
         );
 
@@ -712 +802 @@
             'default' => array( 'tax', 'shipping' ),
             'description' => __( 'This setting affect those settings: "Disable extra fee if cart amount is greater than this limit." and "Disable if cart amount is greater than". <strong>It defines what is finally calculated as the cart amount.</strong>', 'wc-smart-cod' ),
-            'desc_tip' => false
+            'desc_tip' => false,
+            'disabled' => false
         );
 
@@ -724 +815 @@
                     'desc_tip' => true,
                     'class' => 'wc-smart-cod-group wc-smart-cod-percentage',
-                    'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+                    'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+                    'disabled' => false
                 );
             }
@@ -748 +840 @@
                         'desc_tip' => true,
                         'class' => 'wc-smart-cod-group wc-smart-cod-percentage',
-                        'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+                        'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+                        'disabled' => false
                     );
 
@@ -786 +879 @@
                     'desc_tip' => true,
                     'class' => 'wc-smart-cod-group wc-smart-cod-fee wc-smart-cod-percentage',
-                    'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+                    'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+                    'disabled' => false
                 );
 
@@ -825 +919 @@
                             'desc_tip' => true,
                             'class' => 'wc-smart-cod-group wc-smart-cod-fee wc-smart-cod-percentage',
-                            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' )
+                            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+                            'disabled' => false
                         );
                     }
@@ -838 +933 @@
         $form_fields[ 'fee_settings' ] = array(
             'type' => 'hidden'
+        );
+
+        $form_fields[ 'risk_free_advance_payment' ] = array(
+            'title' => __( 'Partial payment amount for COD orders', 'wc-smart-cod' ),
+            'type' => 'price',
+            'class' => 'wc-smart-cod-group wc-smart-cod-percentage',
+            'description' => __( 'Require customers to pay a portion of the order in advance, before processing a Cash on Delivery order.', 'wc-smart-cod' ),
+            'desc_tip' => true,
+            'placeholder' => __( 'Enter Amount', 'wc-smart-cod' ),
+            'disabled' => true
         );
 
@@ -1117 +1222 @@
                     unset( $settings [ $key ] );
             }
-
         }
 
@@ -1194 +1298 @@
                 'enhanced_select' => $enhanced_select_variables,
                 'restriction_settings' => ( object ) $this->get_json_settings( 'restriction_settings' ),
-                'fee_settings' => ( object ) $this->get_json_settings( 'fee_settings' )
+                'fee_settings' => ( object ) $this->get_json_settings( 'fee_settings' ),
+                'pro_site_url' => $this->settings_manager->l
             );
 

wc-smart-cod/trunk/admin/css/wc-smart-cod-admin.css

@@ -92 +92 @@
 }
 
+.pro-badge {
+    margin: 5px 0;
+}
+
+.pro-badge a {
+  display: inline-block;
+  padding: 4px 10px;
+  font-size: 10px;
+  font-weight: 600;
+  color: #fff;
+  background: #403447;
+  border-radius: 999px;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
+  letter-spacing: 0.5px;
+  user-select: none;
+  cursor: pointer;
+  text-transform: none;
+  text-decoration: none;
+  transition: all 0.2s ease-in;
+}
+
+.pro-badge a:hover {
+  background-color: #481c41;
+}
+
+.woocommerce_page_wc-settings-checkout-cod form h2 {
+    padding-top: 15px;
+}
+
 @media screen and (min-width: 1200px) {
 

wc-smart-cod/trunk/admin/js/wc-smart-cod-admin.min.js

@@ -1 @@
-jQuery(document).ready(function(e){var t=e("#mainform"),a=e(".woocommerce-save-button"),n=e(".wc-smart-cod-group"),c=e(".wc-smartcod-categories, .wc-smartcod-products"),r=e(".wc-smartcod-products.wc-smart-cod-group"),i=e(".wc-smart-cod-restriction"),s=e(".wc-smart-cod-percentage"),o=e("body"),d=e("#woocommerce_cod_restriction_settings"),l=e("#woocommerce_cod_fee_settings"),_=e(".wsc-message-switcher"),m=e(".wsc-message"),u={},h={};smart_cod_variables.hasOwnProperty("restriction_settings")&&(u=smart_cod_variables.restriction_settings),smart_cod_variables.hasOwnProperty("fee_settings")&&(h=smart_cod_variables.fee_settings);var p={init:function(){d.parents("tr").addClass("hidden"),l.parents("tr").addClass("hidden"),i.each(function(t,a){p.enableConditional(e(this))}),s.each(function(t,a){p.enablePercentage(e(this))}),o.on("change",".wc-smart-cod-percantage-switcher",p.switchFee),o.on("click",".wc-smart-cod-mode",p.switchMode),a.click(function(e){p.validateFields(n)||e.preventDefault()}),c.each(function(t,a){p.initSelect2(e(this))}),p.fixSelect2Bug(r),_.on("change",p.changeMessageVisibility)},changeMessageVisibility:function(t){e(this);var a=e(this).val();m.addClass("hidden"),e('.wsc-message[data-restriction="'+a+'"]').removeClass("hidden")},isObjectEmpty:function(e){var t;for(t in e)return!1;return!0},switchMode:function(t){t.preventDefault();var a=e(this),n=a.data("mode"),c="enable"===n?"disable":"enable",r=a.parents("tr").find(".wc-smart-cod-restriction").data("name");"enable"!==n&&"disable"!==n||(u[r]="enable"===c?1:0,d.val(JSON.stringify(u)),a.html(c),a.data("mode",c))},switchFee:function(t){var a=e(this),n=a.prev(),c=a.val(),r=n.attr("name");h[r.slice(16)]=c,l.val(JSON.stringify(h))},enablePercentage:function(t){var a=t.parents("fieldset"),n=e('<select class="wc-smart-cod-percantage-switcher"><option value="fixed">Fixed</option><option value="percentage">%</option></select>'),c="0",r=t.attr("name").slice(16);h.hasOwnProperty(r)?c=h[r]:h[r]=c="fixed",n.val(c),a.append(n)},enableConditional:function(e){var t=e.parents("tr").find("th").find("label");if(t.length>0){var a=t.contents().get(0).nodeValue,n=a.trim().split(" ");if(n[0]){var c=n[0].toLowerCase();switch(c){case"enable":case"disable":var r=e.attr("name"),i=e.data("name");t.contents().get(0).nodeValue=t.text().replace(a,""),n.shift(),t.prepend('<a class="wc-smart-cod-mode" href="#" data-mode="'+c+'" data-input-name="'+r+'">'+c+"</a> "+n.join(" ")),u.hasOwnProperty(i)||(u[i]="enable"===c?1:0)}}}},fixSelect2Bug:function(e){var t=e.data("select2");t&&t.on("results:message",function(e){this.dropdown._resizeDropdown(),this.dropdown._positionDropdown()})},initSelect2:function(t){var a,n=t.data("action")||"woocommerce_json_search_categories";"wcsmartcod_json_search_categories"===n?a=smart_cod_variables.enhanced_select.search_categories_nonce:"woocommerce_json_search_products_and_variations"===n&&(a=smart_cod_variables.enhanced_select.search_products_nonce);var c={allowClear:!!t.data("allow_clear"),placeholder:t.data("placeholder"),minimumInputLength:t.data("minimum_input_length")?t.data("minimum_input_length"):"3",escapeMarkup:function(e){return e},ajax:{url:smart_cod_variables.enhanced_select.ajax_url,dataType:"json",delay:250,data:function(e){return{term:e.term,action:n,security:a,exclude:t.data("exclude"),include:t.data("include"),limit:t.data("limit")}},processResults:function(t){var a=[];return t&&e.each(t,function(e,t){a.push({id:e,text:t})}),{results:a}},cache:!0}};c=e.extend(c,p.getEnhancedSelectFormatString()),t.select2(c).addClass("enhanced")},validateFields:function(a){t.find(".field-error").remove();return a.each(function(t,a){if("woocommerce_cod_include_restrict_postals"!==a.id&&"woocommerce_cod_restrict_postals"!==a.id)return!0;var n=e(this),c=n.val()?n.val().replace(/\s/g,""):n.val();n.val(c)}),!0},getEnhancedSelectFormatString:function(){return{language:{errorLoading:function(){return smart_cod_variables.enhanced_select.i18n_searching},inputTooLong:function(e){var t=e.input.length-e.maximum;return 1===t?smart_cod_variables.enhanced_select.i18n_input_too_long_1:smart_cod_variables.enhanced_select.i18n_input_too_long_n.replace("%qty%",t)},inputTooShort:function(e){var t=e.minimum-e.input.length;return 1===t?smart_cod_variables.enhanced_select.i18n_input_too_short_1:smart_cod_variables.enhanced_select.i18n_input_too_short_n.replace("%qty%",t)},loadingMore:function(){return smart_cod_variables.enhanced_select.i18n_load_more},maximumSelected:function(e){return 1===e.maximum?smart_cod_variables.enhanced_select.i18n_selection_too_long_1:smart_cod_variables.enhanced_select.i18n_selection_too_long_n.replace("%qty%",e.maximum)},noResults:function(){return smart_cod_variables.enhanced_select.i18n_no_matches},searching:function(){return smart_cod_variables.enhanced_select.i18n_searching}}}}};p.init()});
+jQuery(document).ready((function(e){var t=e("#mainform"),a=e(".woocommerce-save-button"),n=e(".wc-smart-cod-group"),r=e(".wc-smartcod-categories, .wc-smartcod-products"),i=e(".wc-smartcod-products.wc-smart-cod-group"),c=e(".wc-smart-cod-restriction"),s=e(".wc-smart-cod-percentage"),o=e("body"),d=e("#woocommerce_cod_restriction_settings"),l=e("#woocommerce_cod_fee_settings"),_=e(".wsc-message-switcher"),m=e(".wsc-message"),u=e(".wc-smart-cod-pro-field"),h={},p={},g="";smart_cod_variables.hasOwnProperty("restriction_settings")&&(h=smart_cod_variables.restriction_settings),smart_cod_variables.hasOwnProperty("fee_settings")&&(p=smart_cod_variables.fee_settings),smart_cod_variables.hasOwnProperty("pro_site_url")&&(g=smart_cod_variables.pro_site_url);var f={init:function(){d.parents("tr").addClass("hidden"),l.parents("tr").addClass("hidden"),c.each((function(t,a){f.enableConditional(e(this))})),s.each((function(t,a){f.enablePercentage(e(this))})),u.each((function(t,a){f.enableProField(e(this))})),o.on("change",".wc-smart-cod-percantage-switcher",f.switchFee),o.on("click",".wc-smart-cod-mode",f.switchMode),a.click((function(e){f.validateFields(n)||e.preventDefault()})),r.each((function(t,a){f.initSelect2(e(this))})),f.fixSelect2Bug(i),_.on("change",f.changeMessageVisibility)},changeMessageVisibility:function(t){e(this);var a=e(this).val();m.addClass("hidden"),e('.wsc-message[data-restriction="'+a+'"]').removeClass("hidden")},isObjectEmpty:function(e){var t;for(t in e)return!1;return!0},switchMode:function(t){t.preventDefault();var a=e(this),n=a.data("mode"),r="enable"===n?"disable":"enable",i=a.parents("tr").find(".wc-smart-cod-restriction").data("name");"enable"!==n&&"disable"!==n||(h[i]="enable"===r?1:0,d.val(JSON.stringify(h)),a.html(r),a.data("mode",r))},switchFee:function(t){var a=e(this),n=a.prev(),r=a.val(),i=n.attr("name");p[i.slice(16)]=r,l.val(JSON.stringify(p))},enablePercentage:function(t){var a=t.parents("fieldset"),n=e('<select class="wc-smart-cod-percantage-switcher"><option value="fixed">Fixed</option><option value="percentage">%</option></select>'),r="0",i=t.attr("name").slice(16);a.find("input").is(":disabled")&&n.prop("disabled",!0),p.hasOwnProperty(i)?r=p[i]:p[i]=r="fixed",n.val(r),a.append(n)},enableConditional:function(e){var t=e.parents("tr").find("th").find("label");if(t.length>0){var a=t.contents().get(0).nodeValue,n=a.trim().split(" ");if(n[0]){var r=n[0].toLowerCase();switch(r){case"enable":case"disable":var i=e.attr("name"),c=e.data("name");t.contents().get(0).nodeValue=t.text().replace(a,""),n.shift(),t.prepend('<a class="wc-smart-cod-mode" href="#" data-mode="'+r+'" data-input-name="'+i+'">'+r+"</a> "+n.join(" ")),h.hasOwnProperty(c)||(h[c]="enable"===r?1:0)}}}},enableProField:function(e){var t=e.parents("tr").find("th");t.length>0&&t.append('<p class="pro-badge"><a href="'+g+'" target="_blank">🚀 Available in PRO</a></p>')},fixSelect2Bug:function(e){var t=e.data("select2");t&&t.on("results:message",(function(e){this.dropdown._resizeDropdown(),this.dropdown._positionDropdown()}))},initSelect2:function(t){var a,n=t.data("action")||"woocommerce_json_search_categories";"wcsmartcod_json_search_categories"===n?a=smart_cod_variables.enhanced_select.search_categories_nonce:"woocommerce_json_search_products_and_variations"===n&&(a=smart_cod_variables.enhanced_select.search_products_nonce);var r={allowClear:!!t.data("allow_clear"),placeholder:t.data("placeholder"),minimumInputLength:t.data("minimum_input_length")?t.data("minimum_input_length"):"3",escapeMarkup:function(e){return e},ajax:{url:smart_cod_variables.enhanced_select.ajax_url,dataType:"json",delay:250,data:function(e){return{term:e.term,action:n,security:a,exclude:t.data("exclude"),include:t.data("include"),limit:t.data("limit")}},processResults:function(t){var a=[];return t&&e.each(t,(function(e,t){a.push({id:e,text:t})})),{results:a}},cache:!0}};r=e.extend(r,f.getEnhancedSelectFormatString()),t.select2(r).addClass("enhanced")},validateFields:function(a){t.find(".field-error").remove();return a.each((function(t,a){if("woocommerce_cod_include_restrict_postals"!==a.id&&"woocommerce_cod_restrict_postals"!==a.id)return!0;var n=e(this),r=n.val()?n.val().replace(/\s/g,""):n.val();n.val(r)})),!0},getEnhancedSelectFormatString:function(){return{language:{errorLoading:function(){return smart_cod_variables.enhanced_select.i18n_searching},inputTooLong:function(e){var t=e.input.length-e.maximum;return 1===t?smart_cod_variables.enhanced_select.i18n_input_too_long_1:smart_cod_variables.enhanced_select.i18n_input_too_long_n.replace("%qty%",t)},inputTooShort:function(e){var t=e.minimum-e.input.length;return 1===t?smart_cod_variables.enhanced_select.i18n_input_too_short_1:smart_cod_variables.enhanced_select.i18n_input_too_short_n.replace("%qty%",t)},loadingMore:function(){return smart_cod_variables.enhanced_select.i18n_load_more},maximumSelected:function(e){return 1===e.maximum?smart_cod_variables.enhanced_select.i18n_selection_too_long_1:smart_cod_variables.enhanced_select.i18n_selection_too_long_n.replace("%qty%",e.maximum)},noResults:function(){return smart_cod_variables.enhanced_select.i18n_no_matches},searching:function(){return smart_cod_variables.enhanced_select.i18n_searching}}}}};f.init()}));

wc-smart-cod/trunk/includes/class-wc-smart-cod-notification-settings.php

@@ -17 +17 @@
             $res = wp_remote_get(
                 $this->settings_url,
-                array( 'timeout' => 1 )
+                array( 'timeout' => 5, 'headers' => $headers )
             );
 
@@ -24 +24 @@
             }
 
-            $ok = ( $res
-                && isset( $res['response'] )
-                && isset( $res['response']['code'] )
-                && $res['response']['code'] === 200
-            );
+            $ok = $res
+                && isset($res['response'])
+                && isset($res['response']['code'])
+                && $res['response']['code'] === 200;
     
             if($ok) {

wc-smart-cod/trunk/includes/class-wc-smart-cod.php

@@ -80 +80 @@
         $this->plugin_name = 'wc-smart-cod';
         
-        define( 'SMART_COD_VER', '1.7.3' );
+        define( 'SMART_COD_VER', '1.8.0' );
 
         self::$version = SMART_COD_VER;
 
         $this->load_notification_manager();
+
+        $this->load_settings_manager();
 
         self::setup_promos();
@@ -221 +223 @@
     }
 
+    public static function get_settings_manager() {
+
+        $settings = get_transient( 'wc-smart-cod-settings' );
+
+        if( $settings ) {
+            return $settings;
+        }
+
+        $settings_manager = new Wc_Smart_Cod_Settings_Manager( self::$pro_url );
+        $settings = $settings_manager->get_settings_manager();
+
+        set_transient( 'wc-smart-cod-settings', $settings, 86400 );
+        
+        return $settings;
+    }
+
     public function activate_notice() {
 
@@ -268 +286 @@
     }
 
+    public function load_settings_manager() {
+        /**
+         * Class responsible for settings manager
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wc-smart-cod-settings-manager.php';
+    }
+
     public function load_dependencies() {
 
@@ -339 +364 @@
 
     /**
-     * Register all of the hooks related to the admin area functionality
-     * of the plugin.
-     *
-     * @since    1.0.0
-     * @access   private
-     */
-    private function define_admin_hooks() {
-
-        $plugin_admin = new Wc_Smart_Cod_Admin( $this->get_plugin_name(), $this->get_version() );
-
-        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
-
-    }
-
-    /**
      * Register all of the hooks related to the public-facing functionality
      * of the plugin.

wc-smart-cod/trunk/wc-smart-cod.php

@@ -17 +17 @@
  * Plugin URI:        https://wordpress.org/plugins/wc-smart-cod/
  * Description:       A powerful plugin that extends WooCommerce COD (Cash on Delivery) Gateway, supporting multiple extra fees and a multiple factor gateway restriction.
- * Version:           1.7.3
+ * Version:           1.8.0
  * Author:            woosmartcod.com
  * Author URI:        https://woosmartcod.com
@@ -25 +25 @@
  * Domain Path:       /languages
  * WC requires at least: 2.7
- * WC tested up to: 9.8.1
+ * WC tested up to: 9.9.5
  */