Changeset 3492012

elex-discount-per-country/tags/1.2.1/assets/css/dpc-plugin-styles.css

-                      r2644557
+                      r3492012
 #custom_price_field {
     /* margin-bottom: 5px; */
 …
+}
 .interested_products{
     color:red;
     font:bolder;
+.interested_products {
+    color: red;
+    font: bolder;
+}
 …
 .elex_cpp_custom_title_heading {
     font-size: 1.4em;
+}
 …
 .custom-min-price1 {
     color: rgb(20, 19, 19);
+    font-size: 25;
+}
+    font-size: 25px;
+}
 .custom-min-price-validation {
     color: rgb(20, 19, 19);
     font-size: 25;
+    font-size: 25px;
+}
 …
     height: 5%;
     border-color: rgb(200, 210, 219);
     vertical-align:middle;
     margin-bottom:15px;
+    vertical-align: middle;
+    margin-bottom: 15px;
     line-height: 20px;
+    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    box-shadow: 0 5px 10px 5px rgba(0,0,0,0.2);
+}
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.2);
+}
 /*
 input.style {
 …
 /*Styles for form-settings-template*/
+.fields_adjustment_dpc {
+    table-layout: fixed;
+    width: 100%;
+}
 .fields_adjustment_dpc td {
     vertical-align: middle;
+    padding: 4px 7px;
+}
+    padding: 8px;
+    white-space: normal;
+}
 .fields_adjustment_dpc th {
     padding: 9px 7px;
+    padding: 10px 10px;
+}
 .fields_adjustment_dpc .bold_span {
     font-weight:bold;
+}
 .fields_adjustment_dpc .col_btn{
+    font-weight: bold;
+}
+.fields_adjustment_dpc .col_btn {
     display: flex;
     justify-content: center;
+    align-items: center;
+}
+    align-items: center;
+}
 .fields_adjustment_dpc .remove_icon_discount_dpc {
+    width: 10%;
+}
+    width: 7%;
+    min-width: 65px;
+    text-align: center;
+}
 .fields_adjustment_dpc .table_col_1_dpc {
+    width: 2%;
+}
+    width: 3%;
+    min-width: 30px;
+}
 .fields_adjustment_dpc .table_col_2_dpc {
+    width: 35%;
+}
+    width: 20%;
+    min-width: 160px;
+    /* Payment Method / region select */
+}
+.fields_adjustment_dpc .table_col_type_dpc {
+    width: 12%;
+    min-width: 120px;
+    /* Discount Type - wider so Percentage/Fixed shows fully */
+}
+.fields_adjustment_dpc .table_col_label_dpc {
+    width: 12%;
+    min-width: 110px;
+    /* Discount Label */
+}
 .fields_adjustment_dpc .table_col_3_dpc {
+    width: 35%;
+}
+    width: 15%;
+    min-width: 180px;
+    /* Percentage/Fixed Amount value */
+}
+.fields_adjustment_dpc .table_col_5_dpc {
+    width: 12%;
+    min-width: 130px;
+    /* From Date */
+}
+.fields_adjustment_dpc .table_col_6_dpc {
+    width: 12%;
+    min-width: 130px;
+    /* To Date */
+}
 .fields_adjustment_dpc .table_col_4_dpc {
+    width: 10%;
+}
+.fields_adjustment_dpc .table_col_5_dpc {
+    width: 10%;
+}
+.fields_adjustment_dpc .table_col_6_dpc {
+    width: 10%;
+    width: 7%;
+    min-width: 65px;
+    text-align: center;
+}
+/* Reduce outer spacing around the Add New Discount button */
+.fields_adjustment_dpc tfoot td {
+    padding: 16px 0 !important;
+}
+.fields_adjustment_dpc td input[type="text"],
+.fields_adjustment_dpc td input[type="number"],
+.fields_adjustment_dpc td input[type="datetime-local"],
+.fields_adjustment_dpc td select {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 7px 10px;
+    border: 1px solid #c3c4c7;
+    border-radius: 4px;
+    /* Match the Select region border-radius */
+    background-color: #fff;
+    color: #2c3338;
+    font-size: 13px;
+}
+.fields_adjustment_dpc td input:focus,
+.fields_adjustment_dpc td select:focus {
+    border-color: #2271b1;
+    box-shadow: none;
+    /* Flat focus, no glow */
+    outline: none;
+}
 .fields_adjustment_dpc td input {
+    margin-right: 4px;
+}
+    margin-right: 0;
+}
 .fields_adjustment_dpc .check-column {
     vertical-align: middle;
 …
     padding: 0 7px;
+}
+.fields_adjustment_dpc .table_input_raw_dpc{
+    background: #EBEBEB;
+}
+.woocommerce table.form-table .select2-container {
+min-width: 500px!important;
+.fields_adjustment_dpc .table_input_raw_dpc {
+    background: #f6f7f7;
+}
+/* Empty state messages - centered */
+.nodiscount-dpc td {
+    text-align: center !important;
+    padding: 24px 0 !important;
+}
+#no_discount_available_dpc {
+    display: block;
+    text-align: center;
+    color: #50575e;
+    font-size: 13px;
+    margin-bottom: 6px;
+}
+.no-payments-btn {
+    text-align: center;
+    color: #50575e;
+    font-size: 13px;
+}
+.fields_adjustment_dpc .select2-container {
+    min-width: 100% !important;
+}
 .fields_adjustment_dpc .table_header {
+    font-weight:bold;
+    font-weight: bold;
+    font-size: 13px;
+    color: #50575e;
+    vertical-align: middle;
+}
 .table_th_label {
+    font-weight:bold;
+    font-size:small;
+}
+    font-weight: bold;
+    font-size: 13px;
+}
 .fields_adjustment_dpc .table_header_remove {
     text-align: center;
+    font-weight:bold;
+    font-weight: bold;
+    font-size: 13px;
+    color: #50575e;
+    vertical-align: middle;
+}
 …
     padding: 0 16px;
+}
 .fields_adjustment_dpc td.sort {
     width: 16px;
     padding: 0 16px;
     cursor: move;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAHUlEQVQYV2O8f//+fwY8gJGgAny6QXKETRgEVgAAXxAVsa5Xr3QAAAAASUVORK5CYII=) no-repeat center;
+    }
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAHUlEQVQYV2O8f//+fwY8gJGgAny6QXKETRgEVgAAXxAVsa5Xr3QAAAAASUVORK5CYII=) no-repeat center;
+}
 .fields_adjustment_dpc td.remove_icon_discount_dpc {
     width: 16px;
     padding: 0 16px;
     cursor: pointer;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAA3NCSVQICAjb4U/gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAB70lEQVQ4T61UPUhbURT+7n0vLxE1vmqFEBTR6lS7uHaTYpfqopsu0qkgODh0EURwadFBEJy62a3t0BbBIm5dXdTJP/whiFr7EpUmL3m5nnNixR80EfLBXe79vu+ce865VxkCbsHf2Ud6eQWZzS1k1tZlL/y8DeFnLYh0vIDT1CB713HDKPBS8D5/xemPX8hns1COA2VbcmZyAYzvQ4dCqO7ugtvfC8uNyhnjyiibOMDByDhyngdFZKW1EG7D5PMwFMR2XcSmxhCKx2RfjIJkCol375E7IZMwZaGUHN4Hjm0yPuxaF/HZD7BqopCw3twXBH9LM2Ewh7msYS1D+zt7OP25CNh0HdqQaCUsCUca1rKHTi+vIk9FVFrR/YmUTsP8K7KYQ1zWsJY91OHHGXO29Fu6Y7k1iPa8ptwlNY55F3x1Okp9X6AuJ6WbVZ0voXYHh01w9AegbjitzYhPT1wqHkZieBT+xjYVR8OqrysUuxwo39WS3+bN8cwnWFWVhWL7GSE+CPJSTliKHZyd4+nQW+hIRzs0PYX/XVCRCFRFkcWcyy6ztuDR1IjqN6+AXFYSkWErYUnSpGEte0ix3YE+WE9cGXsetmKQoSQua1jLECN+K7HJMdhsRgPGD/M+yKMlDnNZw1pG+b+R63j8xwZcADXJQNHUd268AAAAAElFTkSuQmCC) no-repeat center
 …
 .fields_adjustment_dpc #elex_dpc_add_field {
     cursor: pointer;
+}
+}
 .fields_adjustment_dpc select {
 …
+}
-tr td {
-white-space: nowrap;
+}
 body {
+background:#FCFCFC;
+color:#222;
+font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Open Sans,Helvetica Neue,sans-serif;
+}
+    background: #FCFCFC;
+    color: #222;
+    font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, sans-serif;
+}
 .btn_raw {
+background-color: white;
+padding-top: 5px;
+border: none;
+border-radius: 50%;
+background:   #1E90FF;
+color: white;
+padding: 1px 2px;
+cursor: pointer;
+}
+    background-color: white;
+    padding-top: 5px;
+    border: none;
+    border-radius: 50%;
+    background: #1E90FF;
+    color: white;
+    padding: 1px 2px;
+    cursor: pointer;
+}
+/* Premium "Add New Discount" Button Style */
+.fields_adjustment_dpc .elex-add-new-btn {
+    background: #2271b1;
+    border: none;
+    color: #ffffff;
+    padding: 6px 20px 6px 6px;
+    border-radius: 50px;
+    display: inline-flex;
+    align-items: center;
+    gap: 12px;
+    cursor: pointer;
+    font-weight: 500;
+    font-size: 14px;
+    transition: all 0.3s ease;
+    box-shadow: 0 2px 4px rgba(34, 113, 177, 0.2);
+    text-decoration: none;
+    line-height: 1;
+}
+.fields_adjustment_dpc .elex-add-new-btn:hover {
+    background: #1c5d91;
+    transform: translateY(-1px);
+    box-shadow: 0 4px 8px rgba(34, 113, 177, 0.3);
+}
+.fields_adjustment_dpc .elex-add-new-btn .icon-circle {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 28px;
+    height: 28px;
+    background: #ffffff;
+    color: #2271b1;
+    border-radius: 50%;
+    font-size: 18px;
+    /* Slightly larger for text + */
+    font-weight: bold;
+    padding: 0;
+    line-height: 0;
+    /* Helps with centering text + */
+}
+#elex_dpc_add_field_discount .icon-circle {
+    color: #2271b1;
+}
+.fields_adjustment_dpc .elex-add-new-btn .btn-text {
+    padding-right: 5px;
+    color: #ffffff;
+}
 .switch {
+position: relative;
+display: inline-block;
+width: 40px;
+height: 19px;
+}
+.switch input {
+opacity: 0;
+width: 0;
+height: 0;
+    position: relative;
+    display: inline-block;
+    width: 40px;
+    height: 19px;
+}
+.switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+}
 .slider {
 position: absolute;
 cursor: pointer;
 top: 0;
 left: 0;
 right: 0;
 bottom: 0;
 background-color: #ccc;
 -webkit-transition: .4s;
 transition: .4s;
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    -webkit-transition: .4s;
+    transition: .4s;
+}
 .slider:before {
 position: absolute;
 content: "";
 height:16px;
 width: 16px;
 left: 4px;
 bottom: 2px;
 background-color: white;
 -webkit-transition: .4s;
 transition: .4s;
+}
 input:checked + .slider {
 background-color: #2196F3;
+}
 input:focus + .slider {
 box-shadow: 0 0 1px #2196F3;
+}
 input:checked + .slider:before {
 -webkit-transform: translateX(16px);
 -ms-transform: translateX(16px);
 transform: translateX(16px);
+    position: absolute;
+    content: "";
+    height: 16px;
+    width: 16px;
+    left: 4px;
+    bottom: 2px;
+    background-color: white;
+    -webkit-transition: .4s;
+    transition: .4s;
+}
+input:checked+.slider {
+    background-color: #2196F3;
+}
+input:focus+.slider {
+    box-shadow: 0 0 1px #2196F3;
+}
+input:checked+.slider:before {
+    -webkit-transform: translateX(16px);
+    -ms-transform: translateX(16px);
+    transform: translateX(16px);
+}
 /* Rounded sliders */
 .slider.round {
 border-radius: 34px;
+    border-radius: 34px;
+}
 .slider.round:before {
 border-radius: 50%;
+}
+    border-radius: 50%;
+}

elex-discount-per-country/tags/1.2.1/assets/js/dpc-plugin-scripts.js

-                      r3460057
+                      r3492012
 jQuery(document).ready(function(){
     jQuery(document).on('change','.elex_discount_per_country_to_date' ,function(){
+jQuery(document).ready(function () {
+    jQuery(document).off('change', '.elex_discount_per_country_to_date').on('change', '.elex_discount_per_country_to_date', function () {
         var end_date = new Date(jQuery(this).val());
         var start_date  = new Date(jQuery(this).parents('tr').find('.elex_discount_per_country_from_date').val());
     if(start_date.getTime() >  end_date.getTime()){
         alert("To date can not be less than From date");
         var end_date = new Date(jQuery(this).val(''));
         return;
+    }
     });
     jQuery(document).on('change','.elex_discount_per_country_from_date' ,function(){
+        var start_date = new Date(jQuery(this).parents('tr').find('.elex_discount_per_country_from_date').val());
+        if (start_date.getTime() > end_date.getTime()) {
+            alert("To date can not be less than From date");
+            var end_date = new Date(jQuery(this).val(''));
+            return;
+        }
+    });
+    jQuery(document).off('change', '.elex_discount_per_country_from_date').on('change', '.elex_discount_per_country_from_date', function () {
         var start_date = new Date(jQuery(this).val());
         var end_date  = new Date(jQuery(this).parents('tr').find('.elex_discount_per_country_to_date').val());
     if(start_date.getTime() >  end_date.getTime()){
         var start_date = new Date(jQuery(this).val(''));
         alert("start date can not be more than From date");
         return;
+    }
+        var end_date = new Date(jQuery(this).parents('tr').find('.elex_discount_per_country_to_date').val());
+        if (start_date.getTime() > end_date.getTime()) {
+            var start_date = new Date(jQuery(this).val(''));
+            alert("start date can not be more than From date");
+            return;
+        }
     });
     /*Scripts for form-settings-temp */
     jQuery("#elex_dpc_table_body").on('click', '.remove_icon_discount_dpc', function () {
         var tbody = jQuery('.fields_adjustment_dpc').find('tbody');
         var size = tbody.find('tr').size();
+    jQuery("#elex_dpc_table_body").off('click', '.remove_icon_discount_dpc').on('click', '.remove_icon_discount_dpc', function () {
+        var tbody = jQuery('#elex_dpc_table_body');
+        var size = tbody.find('tr').length;
         var id = jQuery(this).closest("tr").attr("id");
         var value = jQuery(this).closest("tr").attr("class");
+        if(value==="nodiscount-dpc"){
+        if (value === "nodiscount-dpc") {
             jQuery("#nodiscount-dpc").remove();
+        }else if(size===1){
+            jQuery('#elex_discount_per_country_options_select_value').append('<option id="'+id+'" value="'+value+'">'+elexdpc_translations['country_id']+'</option>');
+        } else {
+            // Add removed country options back to the country dropdown if they were loaded as existing rows
+            var $tr = jQuery(this).closest("tr");
+            var existingCountryCode = $tr.find('input[name*="[country_code]"]').val();
+            var existingCountryName = $tr.find('input[name*="[country_name]"]').val() || $tr.find('span.bold_span').text();
+            if (existingCountryCode) {
+                if (jQuery('#zone_locations_template option[value="' + existingCountryCode + '"]').length === 0) {
+                    jQuery('#zone_locations_template').append('<option value="' + existingCountryCode + '">&nbsp;&nbsp; ' + existingCountryName + '</option>');
+                }
+            }
+            // Capture dynamically selected ones in case they are missing
+            $tr.find('select[id^="zone_locations_"] option:selected').each(function () {
+                var optionValue = jQuery(this).val();
+                var optionText = jQuery(this).text();
+                if (optionValue && jQuery('#zone_locations_template option[value="' + optionValue + '"]').length === 0) {
+                    jQuery('#zone_locations_template').append('<option value="' + optionValue + '">' + optionText + '</option>');
+                }
+            });
             jQuery(this).closest("tr").remove();
+            var default_code='<tr id="nodiscount-dpc" class="nodiscount-dpc"><td class="table_col_1"></td><td class="table_col_2"><span class="wc-country-name"  id="no_discount_available_dpc">'+elexdpc_translations['tooltip']['nodiscount-dpc']+'</span></td><td class="table_col_3"></td><td class="table_col_4"></td> <td class="table_col_4"></td></tr>';
+            jQuery('#elex_dpc_table_body').append( default_code );
+        }else{
+        jQuery('#elex_discount_per_country_options_select_value').append('<option id="'+id+'" value="'+value+'">'+elexdpc_translations['country_id']+'</option>');
+        jQuery(this).closest("tr").remove();
+        }
+    });
+    jQuery("#elex_dpc_table_body").on('click','.checkbox_click', function () {
+        var v = jQuery(this).closest("td").find('input').val();
+        if(v== true)
+        {
+            jQuery(this).closest("td").find('input').val("yes");
+            jQuery(this).closest("td").find('label').attr('title',elexdpc_translations['tooltip']['toggleon']);
+        }
+        if(v== false)
+        {
+            jQuery(this).closest("td").find('input').val("no");
+            if (size === 1) {
+                var default_code = '<tr id="nodiscount-dpc" class="nodiscount-dpc"><td colspan="9"><div class="no-payments-btn">' + elexdpc_translations['tooltip']['nodiscount-dpc'] + '</div></td></tr>';
+                jQuery('#elex_dpc_table_body').append(default_code);
+            }
+        }
+    });
+    jQuery("#elex_dpc_table_body").off('click', '.checkbox_click').on('click', '.checkbox_click', function () {
+        var v = jQuery(this).is(':checked');
+        if (v) {
+            jQuery(this).closest("td").find('label').attr('title', elexdpc_translations['tooltip']['toggleon']);
+        } else {
             jQuery(this).closest("td").find('label').attr('title', elexdpc_translations['tooltip']['toggleoff']);
+        }
+    });
+    //To add more rules before saving changes
+    jQuery('#elex_dpc_add_field_discount').click( function(e) {
+        }
+    });
+    // Update discount input constraints based on discount type
+    function updateDiscountConstraints($row) {
+        var type = $row.find('select[name*="[discount_type]"]').val();
+        // accidentally matching [discount_type] or other fields that contain "[discount]"
+        var $input = $row.find('input[name$="[discount]"]');
+        if (type === 'fixed') {
+            $input.removeAttr('max');
+            $input.attr('min', '0');
+            $input.attr('title', 'Enter the fixed discount amount (0 or above)');
+        } else {
+            $input.attr('max', '100');
+            $input.attr('min', '0');
+            $input.attr('title', 'Enter the discount percentage value from 0 to 100.');
+        }
+    }
+    // Initialize constraints on page load for all existing rows
+    jQuery('#elex_dpc_table_body tr').each(function () {
+        updateDiscountConstraints(jQuery(this));
+    });
+    // Update constraints when discount type changes
+    jQuery('#elex_dpc_table_body').off('change', 'select[name*="[discount_type]"]').on('change', 'select[name*="[discount_type]"]', function () {
+        updateDiscountConstraints(jQuery(this).closest('tr'));
+    });
+    // To add empty editable rules before saving changes
+    jQuery('#elex_dpc_add_field_discount').off('click').on('click', function (e) {
         e.preventDefault();
+        if(closest_tr_class="nodiscount-dpc"){
+        if (jQuery("#nodiscount-dpc").length) {
             jQuery("#nodiscount-dpc").remove();
+        }
+        var tbody = jQuery('.fields_adjustment_dpc').find('tbody');
+        var size = tbody.find('tr').size();
+        var closest_tr_class = jQuery('#nodiscount-dpc').attr("class");
+        var checkbox_enabled= jQuery('#elex_discount_per_country_options_enabled').is(':checked');
+        var id = [];
+        var input_value = jQuery("#elex_discount_per_country_options_input_value").val();
+        var country_selected = jQuery("#zone_locations").val();
+        if ( country_selected.length <= 0 ) {
+            alert( elexdpc_translations['error_message']['nofieldsfilled'] );
+            return;
+        }
+        // get the date in required format and it to the table
+        var startdate_bfr_converting= jQuery("#elex_discount_per_country_start_date").val();
+        var enddate_bfr_converting= jQuery("#elex_discount_per_country_end_date").val();
+        if(startdate_bfr_converting === '')
+        {
+            var start_date = '';
+        }
+        else
+        {
+            var start_date = moment(new Date(jQuery("#elex_discount_per_country_start_date").val()) ).format('YYYY-MM-DDTHH:mm');
+        }
+        if(enddate_bfr_converting === '')
+        {
+            var end_date = '';
+        }
+        else
+        {
+            var end_date= moment(new Date(jQuery("#elex_discount_per_country_end_date").val()) ).format('YYYY-MM-DDTHH:mm');
+        }
+        if(start_date !== '' && end_date !== '' )
+        {
+                if(start_date >  end_date){
+                    alert("To date can not be less than From date");
+                    return;
+        }
+        var tbody = jQuery('#elex_dpc_table_body');
+        // Find the highest existing index to determine the next size
+        var maxIndex = -1;
+        tbody.find('tr').each(function () {
+            var idAttr = jQuery(this).attr('id');
+            // Existing rows might have numeric IDs or custom IDs.
+            // We look for the inputs to get the actual array index used.
+            jQuery(this).find('input[name*="elex_discount_per_country_options"]').each(function () {
+                var name = jQuery(this).attr('name');
+                var match = name.match(/\[(\d+)\]/);
+                if (match) {
+                    var idx = parseInt(match[1]);
+                    if (idx > maxIndex) maxIndex = idx;
+                }
+        }
+        var startdate_bfr_converting= jQuery("#elex_discount_per_country_start_date").val('');
+        var enddate_bfr_converting= jQuery("#elex_discount_per_country_end_date").val('');
+        var country_names = [];
+         jQuery('#zone_locations').find("option:selected").map(function() {
+            country_names.push(jQuery(this).text());
+            id.push(this.value);
+            });
         });
+        country_names = country_names.join(', ');
+        jQuery('#zone_locations').find("option:selected").remove();
+        id = id.join(',');
+        jQuery("#elex_discount_per_country_options_input_value").val(0);
+        if ( input_value <= 100 && input_value >= 0 && ( input_value.indexOf(".") <= 2 ) && input_value != "" && country_selected != "" )
+        {
+            var code='<tr id="'+id+'" class="'+country_selected+'">\
+                    <td class="table_col_1"  > </td>\
+                    <td class="table_col_2"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][country_code]" value="'+id+'"/><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][country_name]" value="'+country_selected+'"/> <span  class="wc-country-name" >'+country_names+'</span></td>\
+                    <td class="table_col_3" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="number"  min="0" max="100" step="any" class="order" name="elex_discount_per_country_options['+size+'][discount]" value="'+input_value+'" required></td>\
+                    <td class="table_col_5" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="datetime-local"   class="elex_discount_per_country_from_date" name="elex_discount_per_country_options['+size+'][start_date]" value="'+start_date+'"  ></td>\
+                    <td class="table_col_6" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="datetime-local" class="elex_discount_per_country_to_date" name="elex_discount_per_country_options['+size+'][end_date]" value="'+end_date+'"  ></td>';
+            if(checkbox_enabled)
+            {
+                code +='<td  class="table_col_4" > <label title="'+elexdpc_translations['tooltip']['toggleoff']+'" class="switch"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][status]" value="yes"/><input    type="checkbox" class="checkbox_click" name="elex_discount_per_country_options['+size+'][enabled]" value="1" checked><span class="slider round"></span></label></td>';
+            }else{
+                code +='<td class="table_col_4"> <label title="'+elexdpc_translations['tooltip']['toggleon']+'" class="switch"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][status]" value="no"/><input  type="checkbox" class="checkbox_click" name="elex_discount_per_country_options['+size+'][enabled]" value="0"  ><span class="slider round"></span></label></td>';
+            }
+            code +='<td class="remove_icon_discount_dpc" title="'+elexdpc_translations['tooltip']['remove']+'" ></td>\
+        var size = maxIndex + 1;
+        // Clone templates
+        var countrySelect = jQuery('#zone_locations_template').clone();
+        countrySelect.attr('id', 'zone_locations_' + size);
+        countrySelect.attr('name', 'elex_discount_per_country_options[' + size + '][country_code][]');
+        countrySelect.css('width', '100%');
+        countrySelect.addClass('wc-enhanced-select');
+        var typeSelect = jQuery('#elex_discount_per_country_discount_type_template').clone();
+        typeSelect.attr('id', 'discount_type_' + size);
+        typeSelect.attr('name', 'elex_discount_per_country_options[' + size + '][discount_type]');
+        var labelInput = jQuery('#elex_discount_per_country_label_template').clone();
+        labelInput.attr('id', 'label_' + size);
+        labelInput.attr('name', 'elex_discount_per_country_options[' + size + '][label]');
+        var discountInput = jQuery('#elex_discount_per_country_options_input_value_template').clone();
+        discountInput.attr('id', 'discount_value_' + size);
+        discountInput.attr('name', 'elex_discount_per_country_options[' + size + '][discount]');
+        var startDateInput = jQuery('#elex_discount_per_country_start_date_template').clone();
+        startDateInput.attr('id', 'start_date_' + size);
+        startDateInput.attr('name', 'elex_discount_per_country_options[' + size + '][start_date]');
+        var endDateInput = jQuery('#elex_discount_per_country_end_date_template').clone();
+        endDateInput.attr('id', 'end_date_' + size);
+        endDateInput.attr('name', 'elex_discount_per_country_options[' + size + '][end_date]');
+        var statusLabel = jQuery('#elex_discount_per_country_options_enabled_template').parent().clone();
+        statusLabel.find('input').attr('id', 'enabled_' + size);
+        statusLabel.find('input').attr('name', 'elex_discount_per_country_options[' + size + '][status]');
+        statusLabel.find('input').val('yes'); // Default enabled
+        statusLabel.find('input').prop('checked', true);
+        var code = '<tr id="new_row_' + size + '" class="new_row_dpc">\
+                    <td class="table_col_1_dpc"> </td>\
+                    <td class="table_col_2_dpc"></td>\
+                    <td class="table_col_type_dpc"></td>\
+                    <td class="table_col_3_dpc"></td>\
+                    <td class="table_col_label_dpc"></td>\
+                    <td class="table_col_5_dpc"></td>\
+                    <td class="table_col_6_dpc"></td>\
+                    <td class="table_col_4_dpc"></td>\
+                    <td class="remove_icon_discount_dpc" title="' + elexdpc_translations['tooltip']['remove'] + '"><span class="remove-btn-circle"><i class="fas fa-minus"></i></span></td>\
                     </tr>';
+            jQuery('#elex_dpc_table_body').append( code );
+        }else{
+            if(country_selected==""){
+                alert(elexdpc_translations['tooltip']['allcountriesselected']);
+            }else{
+                alert(elexdpc_translations['tooltip']['inputalert']);
+            }
+        }
+        var $newRow = jQuery(code);
+        $newRow.find('.table_col_2_dpc').append(countrySelect);
+        $newRow.find('.table_col_type_dpc').append(typeSelect);
+        $newRow.find('.table_col_3_dpc').append(discountInput);
+        $newRow.find('.table_col_label_dpc').append(labelInput);
+        $newRow.find('.table_col_5_dpc').append(startDateInput);
+        $newRow.find('.table_col_6_dpc').append(endDateInput);
+        $newRow.find('.table_col_4_dpc').append(statusLabel);
+        tbody.append($newRow);
+        // Initialize discount constraints for the new row
+        updateDiscountConstraints($newRow);
+        // Initialize Select2/Enhanced Select
+        jQuery(document.body).trigger('wc-enhanced-select-init');
         return false;
     });
+        //To save the rule on clicking save changes button(without clicking add button)
+        jQuery("button[name='save']").click( function() {
+        var checkbox_enabled= jQuery('#elex_discount_per_country_options_enabled').is(':checked');
+        var id = [];
+        var input_value = jQuery("#elex_discount_per_country_options_input_value").val();
+        var country_selected = jQuery("#zone_locations").val();
+        var tbody = jQuery('.fields_adjustment_dpc').find('tbody');
+        var size = tbody.find('tr').size();
+        // get the date in required format and it to the table
+        var startdate_bfr_converting= jQuery("#elex_discount_per_country_start_date").val();
+        var enddate_bfr_converting= jQuery("#elex_discount_per_country_end_date").val();
+        if(startdate_bfr_converting === '')
+        {
+            var start_date = '';
+        }
+        else
+        {
+            var start_date = moment(new Date(jQuery("#elex_discount_per_country_start_date").val()) ).format('YYYY-MM-DDTHH:mm');
+        }
+        if(enddate_bfr_converting === '')
+        {
+            var end_date = '';
+        }
+        else
+        {
+            var end_date= moment(new Date(jQuery("#elex_discount_per_country_end_date").val()) ).format('YYYY-MM-DDTHH:mm');
+        }
+        if(start_date !== '' && end_date !== '' )
+        {
+                if(start_date >  end_date){
+                    alert("To date can not be less than From date");
+                    return;
+                }
+        }
+        var startdate_bfr_converting= jQuery("#elex_discount_per_country_start_date").val('');
+        var enddate_bfr_converting= jQuery("#elex_discount_per_country_end_date").val('');
+        var country_names = [];
+         jQuery('#zone_locations').find("option:selected").map(function() {
+            country_names.push(jQuery(this).text());
+            id.push(this.value);
+        });
+        jQuery('#zone_locations').find("option:selected").remove();
+        jQuery("#elex_discount_per_country_options_input_value").val(0);
+        if (input_value<=100 && input_value>=0 && ( input_value.indexOf(".") <= 2 ) && input_value!="" && country_selected!="")
+        {
+            var code='<tr id="'+id+'" class="'+country_selected+'">\
+                    <td class="table_col_1"  > </td>\
+                    <td class="table_col_2"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][country_code]" value="'+id+'"/><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][country_name]" value="'+country_selected+'"/> <span  class="wc-country-name" >'+country_names+'</span></td>\
+                    <td class="table_col_3" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="number" min="0" max="100" step="any" class="order" name="elex_discount_per_country_options['+size+'][discount]" value="'+input_value+'" required></td>\
+                    <td class="table_col_5" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="datetime-local"   class="elex_discount_per_country_from_date" name="elex_discount_per_country_options['+size+'][start_date]" value="'+start_date+'"  ></td>\
+                    <td class="table_col_6" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="datetime-local" class="elex_discount_per_country_to_date" name="elex_discount_per_country_options['+size+'][end_date]" value="'+end_date+'"  ></td>';
+            if(checkbox_enabled)
+            {
+                code +='<td  class="table_col_4" > <label title="'+elexdpc_translations['tooltip']['toggleoff']+'" class="switch"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][status]" value="yes"/><input    type="checkbox" class="checkbox_click" name="elex_discount_per_country_options['+size+'][enabled]" value="1" checked><span class="slider round"></span></label></td>';
+            }else{
+                code +='<td class="table_col_4"> <label title="'+elexdpc_translations['tooltip']['toggleon']+'" class="switch"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][status]" value="no"/><input  type="checkbox" class="checkbox_click" name="elex_discount_per_country_options['+size+'][enabled]" value="0"  ><span class="slider round"></span></label></td>';
+            }
+            code +='<td class="remove_icon_discount_dpc" title="'+elexdpc_translations['tooltip']['remove']+'" ></td>\
+                    </tr>';
+            jQuery('#elex_dpc_table_body').append( code );
+        }
+    });
+    /* script for refreshing cart on selecting different country_selected option */
+    (function($){
+        $( 'form.checkout' ).on( 'change', 'input[name^="country"]', function() {
+        $('body').trigger('update_checkout');
+        });
+    })(jQuery);
+    // The save handler no longer needs to auto-add rows from static inputs
+    jQuery("button[name='save']").off('click').on('click', function (e) {
+        // Just let the form submit normally
+        return true;
+    });
 });
+/* script for refreshing cart on selecting different country_selected option */
+(function ($) {
+    $('form.checkout').off('change', 'input[name^="country"]').on('change', 'input[name^="country"]', function () {
+        $('body').trigger('update_checkout');
+    });
+})(jQuery);

elex-discount-per-country/tags/1.2.1/elex-discount-per-country.php

r3460057	r3492012
4	4	* Plugin URI: https://elextensions.com/plugin/elex-woocommerce-discount-per-country-plugin-free/
5	5	* Description: The plugin allows you to offer discounts on your WooCommerce store based on the shipping country and shipping state chosen by customers.
6		* Version: 1.2.0
	6	* Version: 1.2.1
7	7	* Author: ELEXtensions
8	8	* Author URI: https://elextensions.com/

elex-discount-per-country/tags/1.2.1/includes/class-discount-per-country.php

-                      r3460057
+                      r3492012
 class ELEXDPC_Discount_Per_Country_Model {
     const OPTION_KEY = 'elexdpc_discount_per_country_options';
     private $items   = [];
+    private $items = [];
     public function get_items() {
        return $this->items;
+       return $this->items;
+    }
 …
         return array_map(
             function ( $item ) {
             return $item->to_array();
+                return $item->to_array();
             },
             $this->items
         );
+    }
     public function build() {
+         $items = get_option( self::OPTION_KEY, array() );
+       $items = get_option( self::OPTION_KEY, array() );
+        $old_global_label = get_option( 'elex-discount-per-country_label', '' );
         foreach ( $items as $item ) {
+            $array_obj = new ELEXDPC_Discount_Per_Country_Rule( $item['country_code'], $item['discount'], $item['status'], $item['country_name'] , $item['start_date'], $item['end_date'] );
+            if ( ! array_key_exists( 'label', $item ) ) {
+                $resolved_label = $old_global_label;
+            } else {
+                $resolved_label = $item['label'];
+            }
+            $array_obj = new ELEXDPC_Discount_Per_Country_Rule(
+                isset( $item['country_code'] ) ? $item['country_code'] : '',
+                isset( $item['discount'] ) ? $item['discount'] : 0,
+                isset( $item['status'] ) ? $item['status'] : false,
+                isset( $item['country_name'] ) ? $item['country_name'] : '',
+                isset( $item['start_date'] ) ? $item['start_date'] : '',
+                isset( $item['end_date'] ) ? $item['end_date'] : '',
+                $resolved_label,
+                isset( $item['discount_type'] ) ? $item['discount_type'] : 'percentage'
+            );
             $this->add( $array_obj );
+        }
+    }
+    }
 …
     public function remove( $country_code ) {
                 $this->items = array_filter(
                     $this->items,
                     function ( $item ) use ( $country_code ) {
                         return $country_code !== $item->country_code;
+                    }
                 );
+        $this->items = array_filter(
+            $this->items,
+            function ( $item ) use ( $country_code ) {
+                return $country_code !== $item->country_code;
+            }
+        );
+    }
 …
 class ELEXDPC_Discount_Per_Country_Rule {
+    const STATUS_ENABLE  = true;
+    const STATUS_ENABLE = true;
     const STATUS_DISABLE = false;
     public $country_code;
     public $discount;
+    public $discount_type;
     public $status;
     public $country_name;
     public $start_date;
     public $end_date;
+    public $label;
     public function __construct( $country_code, $discount, $status, $country_name, $start_date, $end_date ) {
+    public function __construct( $country_code, $discount, $status, $country_name, $start_date, $end_date, $label = '', $discount_type = 'percentage' ) {
         $this->country_code = $country_code;
+        $this->discount     = $discount;
+        $this->status       = $status;
+        $this->discount = $discount;
+        $this->discount_type = $discount_type;
+        $this->status = $status;
         $this->country_name = $country_name;
+        $this->start_date   = $start_date;
+        $this->end_date     = $end_date;
+        $this->start_date = $start_date;
+        $this->end_date = $end_date;
+        $this->label = $label;
+    }
 …
             $data['country_name'],
             $data['start_date'],
+            $data['end_date']
+            $data['end_date'],
+            isset( $data['label'] ) ? $data['label'] : '',
+            isset( $data['discount_type'] ) ? $data['discount_type'] : 'percentage'
         );
+    }
     public function is_enabled() {
         return self::STATUS_ENABLE === $this->status;
+      return self::STATUS_ENABLE === $this->status;
+    }
     public function disable() {
         $this->status = self::STATUS_DISABLE;
+         $this->status = self::STATUS_DISABLE;
+    }
     public function enable() {
         $this->status = self::STATUS_ENABLE;
+      $this->status = self::STATUS_ENABLE;
+    }
 …
         return [
             'country_code' => $this->country_code,
+            'discount'     => $this->discount,
+            'status'       => $this->status,
+            'discount' => $this->discount,
+            'discount_type' => $this->discount_type,
+            'status' => $this->status,
             'country_name' => $this->country_name,
+            'start_date'   => $this->start_date,
+            'end_date'     => $this->end_date,
+            'start_date' => $this->start_date,
+            'end_date' => $this->end_date,
+            'label' => $this->label,
         ];
+    }

elex-discount-per-country/tags/1.2.1/includes/elex-discount-per-country-admin-settings.php

-                      r3460057
+                      r3492012
+}
 require_once  WP_PLUGIN_DIR . '/woocommerce/includes/admin/settings/class-wc-settings-page.php' ;
 require_once  ABSPATH . 'wp-admin/includes/plugin.php' ;
 require_once  __DIR__ . '/class-discount-per-country.php';
+require_once WP_PLUGIN_DIR . '/woocommerce/includes/admin/settings/class-wc-settings-page.php';
+require_once ABSPATH . 'wp-admin/includes/plugin.php';
+require_once __DIR__ . '/class-discount-per-country.php';
 class ELEXDPC_Admin_Settings extends WC_Settings_Page {
     public function __construct() {
         //registering and loading scripts
         $this->id    = 'elex-discount-per-country';
+         //registering and loading scripts
+        $this->id = 'elex-discount-per-country';
         $this->label = __( 'ELEX Woo Discount Per Country', 'elex-discount-per-country' );
         add_filter( 'woocommerce_settings_tabs_array', array( $this, 'add_settings_page' ), 99 );
 …
         add_action( 'woocommerce_cart_calculate_fees', array( $this, 'calculate_fees' ) );
         add_action( 'admin_enqueue_scripts', array( $this, 'load_assets' ) );
+    }
     public function load_assets() {
         wp_nonce_field( 'elex_dpc_ajax_nonce', '_elex_dpc_ajax_nonce' );
+         wp_nonce_field( 'elex_dpc_ajax_nonce', '_elex_dpc_ajax_nonce' );
         wp_verify_nonce( 'elex_dpc_ajax_nonce', '_elex_dpc_ajax_nonce' );
         global $woocommerce;
         $woocommerce_version = function_exists( 'WC' ) ? WC()->version : $woocommerce->version;
         $page                = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
         $tab                 = isset( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : '';
         $section             = isset( $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '';
+        $woocommerce_version = function_exists( 'WC' ) ? WC()->version : $woocommerce->version;
+        $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
+        $tab = isset( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : '';
+        $section = isset( $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '';
         if ( 'wc-settings' === $page && 'elex-discount-per-country' === $tab && '' === $section ) {
                 wp_enqueue_style( 'woocommerce_admin_styles', $woocommerce->plugin_url() . '/assets/css/admin.css', array(), $woocommerce_version, false );
                 wp_register_style( 'elex-dpc-plugin-styles', ELEX_DISCOUNT_PER_COUNTRY_MAIN_URL_PATH . '/assets/css/dpc-plugin-styles.css', array(), $woocommerce_version, false );
                 wp_enqueue_style( 'elex-dpc-plugin-styles' );
                 wp_register_script( 'elex-dpc-custom-jquery', ELEX_DISCOUNT_PER_COUNTRY_MAIN_URL_PATH . '/assets/js/dpc-plugin-scripts.js', array( 'jquery' ), '1.0', false );
                 wp_enqueue_script( 'elex-dpc-custom-jquery' );
+        }
               $countries_available = array();
               $countries_obj       = new WC_Countries();
+            wp_enqueue_style( 'woocommerce_admin_styles', $woocommerce->plugin_url() . '/assets/css/admin.css', array(), $woocommerce_version, false );
+            wp_register_style( 'elex-dpc-plugin-styles', ELEX_DISCOUNT_PER_COUNTRY_MAIN_URL_PATH . '/assets/css/dpc-plugin-styles.css', array(), $woocommerce_version, false );
+            wp_enqueue_style( 'elex-dpc-plugin-styles' );
+            wp_register_script( 'elex-dpc-custom-jquery', ELEX_DISCOUNT_PER_COUNTRY_MAIN_URL_PATH . '/assets/js/dpc-plugin-scripts.js', array( 'jquery' ), '1.0', false );
+            wp_enqueue_script( 'elex-dpc-custom-jquery' );
+        }
+        $countries_available = array();
+        $countries_obj = new WC_Countries();
         foreach ( $countries_obj->__get( 'countries' ) as $allowed_c ) {
             $countries_available['country_id'] = $allowed_c;
+        }
+              $countries_available['tooltip']['nodiscount']           = __( 'No country discounts have been specified. Select a country from the drop-down to set up a discount.', 'elex-discount-per-country' );
+              $countries_available['tooltip']['allcountriesselected'] = __( 'All available country have been selected', 'elex-discount-per-country' );
+              $countries_available['tooltip']['inputalert']           = __( 'Please enter value between 0 to 100', 'elex-discount-per-country' );
+              $countries_available['tooltip']['toggleon']             = __( 'Click here to enable the discount', 'elex-discount-per-country' );
+              $countries_available['tooltip']['toggleoff']            = __( 'Click here to disable the discount', 'elex-discount-per-country' );
+              $countries_available['tooltip']['inputtooltip']         = __( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' );
+              $countries_available['tooltip']['remove']               = __( 'Click here to remove the discount.', 'elex-discount-per-country' );
+              $countries_available['error_message']['nofieldsfilled'] = __( 'Please fill in the fields before adding a discount rule', 'elex-discount-per-country' );
+              wp_localize_script( 'elex-dpc-custom-jquery', 'elexdpc_translations', $countries_available );
+    }
+        $countries_available['tooltip']['nodiscount'] = __( 'No country discounts have been specified. Select a country from the drop-down to set up a discount.', 'elex-discount-per-country' );
+        $countries_available['tooltip']['allcountriesselected'] = __( 'All available country have been selected', 'elex-discount-per-country' );
+        $countries_available['tooltip']['inputalert'] = __( 'Please enter value between 0 to 100', 'elex-discount-per-country' );
+        $countries_available['tooltip']['toggleon'] = __( 'Click here to enable the discount', 'elex-discount-per-country' );
+        $countries_available['tooltip']['toggleoff'] = __( 'Click here to disable the discount', 'elex-discount-per-country' );
+        $countries_available['tooltip']['inputtooltip'] = __( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' );
+        $countries_available['tooltip']['remove'] = __( 'Click here to remove the discount.', 'elex-discount-per-country' );
+        $countries_available['tooltip']['nodiscount-dpc'] = __( 'No Payments', 'elex-discount-per-country' );
+        $countries_available['error_message']['nofieldsfilled'] = __( 'Please fill in the fields before adding a discount rule', 'elex-discount-per-country' );
+        wp_localize_script( 'elex-dpc-custom-jquery', 'elexdpc_translations', $countries_available );
+    }
     public function get_sections() {
         $sections = array(
             ''                    => __( 'General Settings', 'elex-discount-per-country' ),
+            '' => __( 'General Settings', 'elex-discount-per-country' ),
             'interested_products' => __( 'Related Products!', 'elex-discount-per-country' ),
         );
         /**
 …
     public function output_sections() {
         global $current_section;
+         global $current_section;
         $sections = $this->get_sections();
         if ( empty( $sections ) || 1 === count( $sections ) ) {
 …
         $settings = array();
         if ( 'interested_products' === $current_section ) {
             $settings = array();
 …
                     'type' => 'title',
                     'desc' => __( 'Helps you configure and apply a discount on the Checkout page based on the shipping states/country selected by the customer.' ),
                     'id'   => 'elex-discount-per-country_title',
+                    'id' => 'elex-discount-per-country_title',
                 ),
+                'section'       => array(
+                    'name'        => __( 'Checkout discount label', 'elex-discount-per-country' ),
+                    'type'        => 'text',
+                    'placeholder' => __( 'Enter custom discount label', 'elex-discount-per-country' ),
+                    'desc_tip'    => true,
+                    'css'         => 'width:300px',
+                    'desc'        => __( 'Enter the text to be displayed on checkout. The default text is <strong> Discount per country</strong>.', 'elex-discount-per-country' ),
+                    'id'          => 'elex-discount-per-country_label',
+                'section_end' => array(
+                    'type' => 'sectionend',
+                    'id' => 'elex-discount-per-country_end',
                 ),
+                'section_end'   => array(
+                    'type' => 'sectionend',
+                    'id'   => 'elex-discount-per-country_end',
+                ),
             );
+        }
 …
+    }
     public function output() {
         global $current_section;
+      global $current_section;
         if ( 'interested_products' === $current_section ) {
 …
             include_once __DIR__ . '/market.php';
         } else {
             $countries_obj = new WC_Countries();
             $countries     = $countries_obj->__get( 'countries' );
             $settings      = $this->get_settings();
+            $countries = $countries_obj->__get( 'countries' );
+            $settings = $this->get_settings();
             WC_Admin_Settings::output_fields( $settings );
             $countries_available = array();
             foreach ( $countries_obj->__get( 'countries' ) as $allowed_c ) {
 …
         // Prepare the data
         // save it
         $nonce  = isset( $_POST['nounce_verify'] ) ? sanitize_text_field( wp_unslash( $_POST['nounce_verify'] ) ) : '';
+        $nonce = isset( $_POST['nounce_verify'] ) ? sanitize_text_field( wp_unslash( $_POST['nounce_verify'] ) ) : '';
         $verify = wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['nounce_verify'] ) ), 'form_data' );
 …
         $countries_obj = new WC_Countries();
         $countries     = $countries_obj->__get( 'countries' );
+        $countries = $countries_obj->__get( 'countries' );
         global $current_section;
         $settings = $this->get_settings();
         WC_Admin_Settings::save_fields( $settings );
+        $repo        = new ELEXDPC_Discount_Per_Country_Model();
+        $items_count = isset( $_POST['elex_discount_per_country_options'] ) ? count( $_POST['elex_discount_per_country_options'] ) : 0;
+        $i           = -1;
+        $items_added = 0;
+        while ( $items_added < $items_count ) {
+            $i++;
+            if ( ! isset( $_POST['elex_discount_per_country_options'][ $i ] ) ) {
+                continue;
+            }
+            $country_codes = isset( $_POST['elex_discount_per_country_options'][ $i ]['country_code'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['country_code'] ) ) : '';
+            $country_codes = explode( ',', $country_codes );
+        $repo = new ELEXDPC_Discount_Per_Country_Model();
+        // Use filter_input to retrieve POSTed array safely when available, fall back to wp_unslash.
+        $raw_options = filter_input( INPUT_POST, 'elex_discount_per_country_options', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
+        if ( null === $raw_options || false === $raw_options ) {
+            // Avoid direct $_POST usage to satisfy PHPCS; fall back to empty array.
+            $raw_options = array();
+        }
+        // Recursively sanitize the incoming options to satisfy PHPCS/WPCS checks.
+        $sanitize_recursive = function ( $value ) use ( &$sanitize_recursive ) {
+            if ( is_array( $value ) ) {
+                return array_map( $sanitize_recursive, $value );
+            }
+            return is_string( $value ) ? sanitize_text_field( $value ) : $value;
+        };
+        $options = is_array( $raw_options ) ? $sanitize_recursive( $raw_options ) : array();
+        foreach ( $options as $option ) {
+            $post_country_codes = isset( $option['country_code'] ) ? $option['country_code'] : '';
+            if ( is_array( $post_country_codes ) ) {
+                $country_codes = array_map( 'sanitize_text_field', $post_country_codes );
+            } else {
+                $country_codes = explode( ',', sanitize_text_field( $post_country_codes ) );
+            }
             foreach ( $country_codes as $country_code ) {
                 if ( ! $country_code ) {
+                if ( empty( $country_code ) ) {
                     continue;
+                }
                 $discount_per_country = array();
+                $state_code           = strpos( $country_code, ':' );
+                if ( false === $state_code ) {
+                    $state_code = 0;
+                $state_code_pos = strpos( $country_code, ':' );
+                if ( false === $state_code_pos ) {
+                    $discount_per_country['country_code'] = $country_code;
+                    $discount_per_country['status'] = isset( $option['status'] ) ? ELEXDPC_Discount_Per_Country_Rule::STATUS_ENABLE : ELEXDPC_Discount_Per_Country_Rule::STATUS_DISABLE;
+                    $discount_per_country['country_name'] = isset( $countries[ $country_code ] ) ? $countries[ $country_code ] : $country_code;
+                    $discount_per_country['discount'] = isset( $option['discount'] ) ? sanitize_text_field( $option['discount'] ) : '';
+                    $discount_per_country['discount_type'] = isset( $option['discount_type'] ) ? sanitize_text_field( $option['discount_type'] ) : 'percentage';
+                    $discount_per_country['start_date'] = isset( $option['start_date'] ) ? sanitize_text_field( $option['start_date'] ) : '';
+                    $discount_per_country['end_date'] = isset( $option['end_date'] ) ? sanitize_text_field( $option['end_date'] ) : '';
+                    $discount_per_country['label'] = isset( $option['label'] ) ? sanitize_text_field( $option['label'] ) : '';
+                    $repo->add( ELEXDPC_Discount_Per_Country_Rule::build( $discount_per_country ) );
                 } else {
+                   $state_code = substr( $country_code, strpos( $country_code, ':' ) + 1 );
+                    $state_code = substr( $country_code, $state_code_pos + 1 );
+                    $countrycode = substr( $country_code, 0, $state_code_pos );
+                    $states = WC()->countries->get_states( $countrycode );
+                    $statename = isset( $states[ $state_code ] ) ? $states[ $state_code ] : $state_code;
+                    $discount_per_country['country_code'] = $countrycode . ':' . $state_code;
+                    $discount_per_country['status'] = isset( $option['status'] ) ? ELEXDPC_Discount_Per_Country_Rule::STATUS_ENABLE : ELEXDPC_Discount_Per_Country_Rule::STATUS_DISABLE;
+                    $discount_per_country['country_name'] = $statename . ', ' . ( isset( $countries[ $countrycode ] ) ? $countries[ $countrycode ] : $countrycode );
+                    $discount_per_country['discount'] = isset( $option['discount'] ) ? sanitize_text_field( $option['discount'] ) : '';
+                    $discount_per_country['discount_type'] = isset( $option['discount_type'] ) ? sanitize_text_field( $option['discount_type'] ) : 'percentage';
+                    $discount_per_country['start_date'] = isset( $option['start_date'] ) ? sanitize_text_field( $option['start_date'] ) : '';
+                    $discount_per_country['end_date'] = isset( $option['end_date'] ) ? sanitize_text_field( $option['end_date'] ) : '';
+                    $discount_per_country['label'] = isset( $option['label'] ) ? sanitize_text_field( $option['label'] ) : '';
+                    $repo->add( ELEXDPC_Discount_Per_Country_Rule::build( $discount_per_country ) );
+                }
+                if ( 0 !== $state_code ) {
+                    $countrycode                          = substr( $country_code, 0, strpos( $country_code, ':' ) );
+                    $states                               = WC()->countries->get_states( $countrycode );
+                    $statename                            = $states[ $state_code ];
+                    $discount_per_country['country_code'] = $countrycode . ':' . $state_code;
+                    $discount_per_country['status']       = isset( $_POST['elex_discount_per_country_options'][ $i ]['status'] ) ? ELEXDPC_Discount_Per_Country_Rule::STATUS_ENABLE : ELEXDPC_Discount_Per_Country_Rule::STATUS_DISABLE;
+                    $discount_per_country['country_name'] = $statename . ',' . $countries[ $countrycode ];
+                    $discount_per_country['discount']     = isset( $_POST['elex_discount_per_country_options'][ $i ]['discount'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['discount'] ) ) : '';
+                    $discount_per_country['start_date']   = isset( $_POST['elex_discount_per_country_options'][ $i ]['start_date'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['start_date'] ) ) : '';
+                    $discount_per_country['end_date']     = isset( $_POST['elex_discount_per_country_options'][ $i ]['end_date'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['end_date'] ) ) : '';
+                    $repo->add( ELEXDPC_Discount_Per_Country_Rule::build( $discount_per_country ) );
+                } else {
+                    $discount_per_country['country_code'] = $country_code;
+                    $discount_per_country['status']       = isset( $_POST['elex_discount_per_country_options'][ $i ]['status'] ) ? ELEXDPC_Discount_Per_Country_Rule::STATUS_ENABLE : ELEXDPC_Discount_Per_Country_Rule::STATUS_DISABLE;
+                    $discount_per_country['country_name'] = $countries[ $country_code ];
+                    $discount_per_country['discount']     = isset( $_POST['elex_discount_per_country_options'][ $i ]['discount'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['discount'] ) ) : '';
+                    $discount_per_country['start_date']   = isset( $_POST['elex_discount_per_country_options'][ $i ]['start_date'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['start_date'] ) ) : '';
+                    $discount_per_country['end_date']     = isset( $_POST['elex_discount_per_country_options'][ $i ]['end_date'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['end_date'] ) ) : '';
+                    $repo->add( ELEXDPC_Discount_Per_Country_Rule::build( $discount_per_country ) );
+                }
+            }
+            $items_added++;
+        }
+            }
+        }
         $repo->save();
         if ( $current_section ) {
             /**
 …
+        }
         $order_date                  = strtotime( wp_date( 'd-m-Y\TH:i' ) );
         $PWD_Selected_Country_id     = WC()->customer->get_shipping_country();
         $shipping_state              = WC()->customer->get_shipping_state();
+        $order_date = strtotime( wp_date( 'd-m-Y\TH:i' ) );
+        $PWD_Selected_Country_id = WC()->customer->get_shipping_country();
+        $shipping_state = WC()->customer->get_shipping_state();
         $selected_country_with_state = $PWD_Selected_Country_id . ':' . $shipping_state;
         if ( empty( $PWD_Selected_Country_id ) ) {
             return 0;
 …
         $repo = new ELEXDPC_Discount_Per_Country_Model();
         $repo->build();
+        $PWD_subtotal      = $PWD_cart->subtotal;
+        $PWD_label_default = 'Discount per country';
+        $PWD_label            = ! empty( get_option( 'elex-discount-per-country_label' ) ) ? get_option( 'elex-discount-per-country_label' ) : $PWD_label_default;
+        $PWD_subtotal = $PWD_cart->subtotal;
         $discount_per_country = $repo->find( $PWD_Selected_Country_id );
+        $country_with_state   = $repo->find( $selected_country_with_state );
+        if ( $discount_per_country ) {
+            if ( ( $discount_per_country && $discount_per_country->is_enabled() &&
+            $order_date >= strtotime( $discount_per_country->start_date ) &&
+            $order_date <= strtotime( $discount_per_country->end_date ) ) ||
+            ( $discount_per_country && $discount_per_country->is_enabled() &&
+             '' === $discount_per_country->start_date && '' === $discount_per_country->end_date ) ||
+             ( $discount_per_country && $discount_per_country->is_enabled() &&
+              ( '' === $discount_per_country->start_date && $order_date <= strtotime( $discount_per_country->end_date ) ) ||
+             ( '' === $discount_per_country->end_date && $order_date >= strtotime( $discount_per_country->start_date ) ) ) ) {
+                if ( $country_with_state && $country_with_state->is_enabled() ) {
+                    if ( ( $country_with_state && $country_with_state->is_enabled() &&
+                    $order_date >= strtotime( $country_with_state->start_date ) &&
+                    $order_date <= strtotime( $country_with_state->end_date ) ) ||
+                    ( $country_with_state && $country_with_state->is_enabled() &&
+                 '' === $country_with_state->start_date && '' === $country_with_state->end_date ) ||
+                 ( $country_with_state && $country_with_state->is_enabled() &&
+                  ( '' === $country_with_state->start_date && $order_date <= strtotime( $country_with_state->end_date ) ) ||
+                 ( '' === $country_with_state->end_date && $order_date >= strtotime( $country_with_state->start_date ) ) ) ) {
+                        $PWD_discount = ( $country_with_state->discount ) * $PWD_subtotal / 100;
+                        $PWD_cart -> add_fee( $PWD_label, -$PWD_discount );
+                    } else {
+                        $PWD_discount = ( $discount_per_country->discount ) * $PWD_subtotal / 100;
+                        $PWD_cart -> add_fee( $PWD_label, -$PWD_discount );
+                    }
+                } else {
+                    $PWD_discount = ( $discount_per_country->discount ) * $PWD_subtotal / 100;
+                    $PWD_cart->add_fee( $PWD_label, -$PWD_discount );
+                }
+            }
+        }
+        if ( $country_with_state && $country_with_state->is_enabled() ) {
+            if ( ( $country_with_state && $country_with_state->is_enabled() &&
+            $order_date >= strtotime( $country_with_state->start_date ) &&
+            $order_date <= strtotime( $country_with_state->end_date ) ) ||
+            ( $country_with_state && $country_with_state->is_enabled() &&
+             '' === $country_with_state->start_date && '' === $country_with_state->end_date ) ||
+             ( $country_with_state && $country_with_state->is_enabled() &&
+              ( '' === $country_with_state->start_date && $order_date <= strtotime( $country_with_state->end_date ) ) ||
+             ( '' === $country_with_state->end_date && $order_date >= strtotime( $country_with_state->start_date ) ) ) ) {
+                        $PWD_discount = ( $country_with_state->discount ) * $PWD_subtotal / 100;
+                        $PWD_cart -> add_fee( __( $PWD_label, 'elex-discount-per-country' ), -$PWD_discount );
+            }
+        }
+    }
+        $country_with_state = $repo->find( $selected_country_with_state );
+        $rule_to_apply = null;
+        $is_valid_rule = function ( $rule, $order_date ) {
+            if ( ! $rule || ! $rule->is_enabled() ) {
+                return false;
+            }
+            $start = strtotime( $rule->start_date );
+            $end = strtotime( $rule->end_date );
+            if ( ! empty( $rule->start_date ) && ! empty( $rule->end_date ) ) {
+                return ( $order_date >= $start && $order_date <= $end );
+            } elseif ( ! empty( $rule->start_date ) ) {
+                return ( $order_date >= $start );
+            } elseif ( ! empty( $rule->end_date ) ) {
+                return ( $order_date <= $end );
+            }
+            return true;
+        };
+        // Prioritize country+state specific rule over a general country rule
+        if ( $is_valid_rule( $country_with_state, $order_date ) ) {
+            $rule_to_apply = $country_with_state;
+        } elseif ( $is_valid_rule( $discount_per_country, $order_date ) ) {
+            $rule_to_apply = $discount_per_country;
+        }
+        if ( $rule_to_apply ) {
+            // build() already resolved the per-row label → old global label → ''
+            // Just use it directly; fall back to 'Discount per country' if still empty.
+            $label_text = trim( $rule_to_apply->label );
+            if ( '' === $label_text ) {
+                $label_text = __( 'Discount per country', 'elex-discount-per-country' );
+            }
+            $label = $label_text;
+            if ( 'fixed' === $rule_to_apply->discount_type ) {
+                $PWD_discount = floatval( $rule_to_apply->discount );
+            } else {
+                $PWD_discount = ( floatval( $rule_to_apply->discount ) * $PWD_subtotal ) / 100;
+            }
+            // Ensure discount doesn't exceed the subtotal negatively
+            if ( $PWD_subtotal < $PWD_discount ) {
+                $PWD_discount = $PWD_subtotal;
+            }
+            // Yoda conditions preferred by WPCS for literal comparisons.
+            if ( 0 < $PWD_discount ) {
+                $PWD_cart->add_fee( __( $label, 'elex-discount-per-country' ), -$PWD_discount );
+            }
+        }
+    }
     public function add_action_links( $links ) {
 …
         return array_merge( $plugin_links, $links );
+    }
+}

elex-discount-per-country/tags/1.2.1/includes/form-settings-template-dpc.php

-                      r3460057
+                      r3492012
  */
 require_once  __DIR__ . '/class-discount-per-country.php';
+require_once __DIR__ . '/class-discount-per-country.php';
 $repo = new ELEXDPC_Discount_Per_Country_Model();
 $repo->build();
 …
 global $woocommerce;
 $allowed_countries   = WC()->countries->get_shipping_countries();
+$allowed_countries = WC()->countries->get_shipping_countries();
 $shipping_continents = WC()->countries->get_shipping_continents();
 $zone                = new WC_Shipping_Zone();
 $locations           = array();
 $postcodes           = array();
+$zone = new WC_Shipping_Zone();
+$locations = array();
+$postcodes = array();
 foreach ( $zone->get_zone_locations() as $location ) {
 …
 ?>
 <tr valign="top" >
+<tr valign="top">
     <td class="forminp" colspan="3" style="padding-left:0px">
         <table class="fields_adjustment_dpc widefat" id="elex_discount_per_country_options">
         <input type="hidden" name="nounce_verify" value="<?php echo esc_attr( $nonce ); ?>">
+            <input type="hidden" name="nounce_verify" value="<?php echo esc_attr( $nonce ); ?>">
             <thead>
+                <th class="table_header" >&nbsp;<i class="fas fa-toggle-off"></i></th>
+                <th class="table_header"  ><?php esc_html_e( 'Shipping State/Country', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header" ><?php esc_html_e( 'Discount(%)', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header" ><?php esc_html_e( 'From date', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header" ><?php esc_html_e( 'To date', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header" ><?php esc_html_e( 'Status', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header_remove" ><?php esc_html_e( 'Actions', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header table_col_1_dpc">&nbsp;<i class="fas fa-toggle-off"></i></th>
+                <th class="table_header table_col_2_dpc">
+                    <?php esc_html_e( 'Shipping State/Country', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_type_dpc">
+                    <?php esc_html_e( 'Discount type', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_3_dpc">
+                    <?php esc_html_e( 'Percentage / fixed amount', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_label_dpc">
+                    <?php esc_html_e( 'Discount label', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_5_dpc">
+                    <?php esc_html_e( 'From date', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_6_dpc"><?php esc_html_e( 'To date', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_4_dpc"><?php esc_html_e( 'Enable', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header_remove remove_icon_discount_dpc">
+                    <?php esc_html_e( 'Remove', 'elex-discount-per-country' ); ?>
+                </th>
             </thead>
             <tbody id='elex_dpc_table_body'>
 …
                 foreach ( $repo->get_items() as $key => $discount_per_country ) {
                     ?>
+                        <tr id='<?php echo esc_attr( $discount_per_country->country_code ); ?>' class='<?php echo esc_attr( $discount_per_country->country_name ); ?>'>
+                        <td  class='table_col_1_dpc' ></td>
+                        <td  class='table_col_2_dpc'>
+                            <input type='hidden'  name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][country_code]' value='<?php echo esc_attr( $discount_per_country->country_code ); ?>' />
+                            <input type='hidden' class='order' name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][country_name]' value='<?php echo esc_attr( $discount_per_country->country_name ); ?>' />
+                            <span class="bold_span" ><?php echo esc_html( $discount_per_country->country_name ); ?></span>
+                        </td>
+                        <td class='table_col_3_dpc' title='<?php esc_html_e( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' ); ?>' >
+                            <input type='number'  min='0' max='100' step="any" class='order' name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][discount]' value='<?php echo esc_attr( $discount_per_country->discount ); ?>' required>
+                        </td>
+                        <td class='table_col_5_dpc'    title="<?php esc_html_e( 'Start Date from which discount will be applied,Leave blank if you do not restrict based on  date', 'elex-discount-per-country' ); ?>">
+                        <input type='datetime-local'  class='elex_discount_per_country_from_date' name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][start_date]' value='<?php echo esc_attr( $discount_per_country->start_date ); ?>' >
+                        </td>
+                        <td class='table_col_6_dpc'  title="<?php esc_html_e( 'Discount will not be applied after this date,Leave blank if you do not restrict based on date', 'elex-discount-per-country' ); ?>">
+                        <input type='datetime-local'  class='elex_discount_per_country_to_date' name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][end_date]' value='<?php echo esc_attr( $discount_per_country->end_date ); ?>' >
+                        </td>
+                            <td class='table_col_4_dpc' >
+                                <label title='<?php esc_html_e( 'Click here to disable the discount.', 'elex-discount-per-country' ); ?>' class='switch'>
+                                    <input
+                                        type='checkbox'
+                                        class='checkbox_click'
+                                        <?php echo esc_html( $discount_per_country->is_enabled() ? 'checked' : '' ); ?>
+                                        name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][status]'
+                                        value= 'yes' />
+                                    <span class='slider round'></span>
+                                </label>
+                            </td>
+                            <td class='remove_icon_discount_dpc' title='<?php esc_html_e( 'Click here to remove the discount.', 'elex-discount-per-country' ); ?>'></td>
+                        </tr>
+                        <?php
+                    <tr id='<?php echo esc_attr( $discount_per_country->country_code ); ?>'
+                        class='<?php echo esc_attr( $discount_per_country->country_name ); ?>'>
+                        <td class='table_col_1_dpc'></td>
+                        <td class='table_col_2_dpc'>
+                            <input type='hidden'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][country_code]'
+                                value='<?php echo esc_attr( $discount_per_country->country_code ); ?>' />
+                            <input type='hidden' class='order'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][country_name]'
+                                value='<?php echo esc_attr( $discount_per_country->country_name ); ?>' />
+                            <span class="bold_span"><?php echo esc_html( $discount_per_country->country_name ); ?></span>
+                        </td>
+                        <td class='table_col_type_dpc'>
+                            <select
+                                name="elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][discount_type]">
+                                <option value="percentage" <?php selected( $discount_per_country->discount_type, 'percentage' ); ?>><?php esc_html_e( 'Percentage', 'elex-discount-per-country' ); ?>
+                                </option>
+                                <option value="fixed" <?php selected( $discount_per_country->discount_type, 'fixed' ); ?>>
+                                    <?php esc_html_e( 'Fixed Amount', 'elex-discount-per-country' ); ?>
+                                </option>
+                            </select>
+                        </td>
+                        <td class='table_col_3_dpc'
+                            title='<?php esc_html_e( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' ); ?>'>
+                            <input type='number' min='0' max='100' step="any" class='order dpc-discount-input'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][discount]'
+                                value='<?php echo esc_attr( $discount_per_country->discount ); ?>' required>
+                        </td>
+                        <td class='table_col_label_dpc'>
+                            <input type='text'
+                                placeholder="<?php esc_html_e( 'Discount label', 'elex-discount-per-country' ); ?>"
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][label]'
+                                value='<?php echo esc_attr( $discount_per_country->label ); ?>'>
+                        </td>
+                        <td class='table_col_5_dpc'
+                            title="<?php esc_html_e( 'Start Date from which discount will be applied,Leave blank if you do not restrict based on  date', 'elex-discount-per-country' ); ?>">
+                            <input type='datetime-local' class='elex_discount_per_country_from_date'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][start_date]'
+                                value='<?php echo esc_attr( $discount_per_country->start_date ); ?>'>
+                        </td>
+                        <td class='table_col_6_dpc'
+                            title="<?php esc_html_e( 'Discount will not be applied after this date,Leave blank if you do not restrict based on date', 'elex-discount-per-country' ); ?>">
+                            <input type='datetime-local' class='elex_discount_per_country_to_date'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][end_date]'
+                                value='<?php echo esc_attr( $discount_per_country->end_date ); ?>'>
+                        </td>
+                        <td class='table_col_4_dpc'>
+                            <label
+                                title='<?php esc_html_e( 'Click here to disable the discount.', 'elex-discount-per-country' ); ?>'
+                                class='switch'>
+                                <input type='checkbox' class='checkbox_click' <?php echo esc_html( $discount_per_country->is_enabled() ? 'checked' : '' ); ?>
+                                    name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][status]'
+                                    value='yes' />
+                                <span class='slider round'></span>
+                            </label>
+                        </td>
+                        <td class='remove_icon_discount_dpc'
+                            title='<?php esc_html_e( 'Click here to remove the discount.', 'elex-discount-per-country' ); ?>'>
+                            <span class="remove-btn-circle"><i class="fas fa-minus"></i></span>
+                        </td>
+                    </tr>
+                    <?php
+                }
                 if ( empty( $repo->get_items() ) ) {
                     ?>
                     <tr id='nodiscount-dpc' class='nodiscount-dpc'>
+                    <td class='table_col_1_dpc'></td>
+                    <td class='table_col_2_dpc'>
+                        <span class='wc-country-name' id='no_discount_available_dpc'><?php esc_html_e( 'No  discounts have been specified. Select a country from the drop-down to set up a discount.', 'elex-discount-per-country' ); ?></span>
+                    </td>
+                    <td class='table_col_3_dpc'></td>
+                    <td class='table_col_5_dpc'></td>
+                    <td class='table_col_6_dpc'></td>
+                    <td class='table_col_4_dpc'></td>
+                        <td colspan="9" style="text-align: center; padding: 24px 0;">
+                            <span
+                                id='no_discount_available_dpc'><?php esc_html_e( 'No  discounts have been specified. Select a country from the drop-down to set up a discount.', 'elex-discount-per-country' ); ?></span>
+                            <div class="no-payments-btn">
+                                <script>document.write(elexdpc_translations['tooltip']['nodiscount-dpc']);</script>
+                            </div>
+                        </td>
                     </tr>
                     <?php
+                }
                 ?>
             </tbody>
+            <br><br>
+            <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+            <tr  class="table_input_raw_dpc">
+                <td></td>
+                <td>
+                <select title='<?php esc_html_e( 'Select zone for which you want to apply discount', 'elex-discount-per-country' ); ?>'  multiple="multiple" data-attribute="zone_locations" id="zone_locations" name="zone_locations" data-placeholder="<?php esc_attr_e( 'Select region', 'elex-discount-per-country' ); ?>" class="wc-shipping-zone-region-select chosen_select">
+                        <?php
+                        foreach ( $shipping_continents as $continent_code => $continent ) {
+                            $countries = array_intersect( array_keys( $allowed_countries ), $continent['countries'] );
+                            foreach ( $countries as $country_code ) {
+                            $flag = 1;
+                            $discount_per_country = $repo->find( $country_code );
+            <tfoot>
+                <tr>
+                    <td colspan="9" style="text-align: center; padding: 16px 0;">
+                        <button type="button" id="elex_dpc_add_field_discount" class="elex-add-new-btn">
+                            <span class="icon-circle">+</span>
+                            <span
+                                class="btn-text"><?php esc_html_e( 'Add New Discount', 'elex-discount-per-country' ); ?></span>
+                        </button>
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
+        <div id="elex_dpc_add_new_discount_template" style="display: none;">
+            <select
+                title='<?php esc_html_e( 'Select zone for which you want to apply discount', 'elex-discount-per-country' ); ?>'
+                multiple="multiple" data-attribute="zone_locations" id="zone_locations_template"
+                name="zone_locations_template"
+                data-placeholder="<?php esc_attr_e( 'Select region', 'elex-discount-per-country' ); ?>"
+                class="wc-shipping-zone-region-select" style="width: 100%;">
+                <?php
+                foreach ( $shipping_continents as $continent_code => $continent ) {
+                    $countries = array_intersect( array_keys( $allowed_countries ), $continent['countries'] );
+                    foreach ( $countries as $country_code ) {
+                        $flag = 1;
+                        $discount_per_country = $repo->find( $country_code );
+                        if ( $discount_per_country ) {
+                            $flag = 0;
+                        }
+                        if ( 1 === $flag ) {
+                            echo '<option  value="' . esc_attr( $country_code ) . '"' . wc_selected( "country:$country_code", $locations ) . '>' . esc_html( '&nbsp;&nbsp; ' . $allowed_countries[ $country_code ] ) . '</option>';
+                        }
+                        $states = WC()->countries->get_states( $country_code );
+                        if ( $states ) {
+                            foreach ( $states as $state_code => $state_name ) {
+                                $country_with_state = $country_code . ':' . $state_code;
+                                $discount_per_country = $repo->find( $country_with_state );
+                                $flag = 1;
                                 if ( $discount_per_country ) {
                                     $flag = 0;
+                                }
                                 if ( 1 === $flag ) {
+                                    echo '<option  value="' . esc_attr( $country_code ) . '"' . wc_selected( "country:$country_code", $locations ) . '>' . esc_html( '&nbsp;&nbsp; ' . $allowed_countries[ $country_code ] ) . '</option>';
+                                    echo '<option value="' . esc_attr( $country_code . ':' . $state_code ) . '"' . wc_selected( "state:$country_code:$state_code", $locations ) . '>' . esc_html( '&nbsp;&nbsp;&nbsp;&nbsp; ' . $state_name . ', ' . $allowed_countries[ $country_code ] ) . '</option>';
+                                }
-                                    $states = WC()->countries->get_states( $country_code );
-                                if ( $states ) {
-                                    foreach ( $states as $state_code => $state_name ) {
-                                        $country_with_state   = $country_code . ':' . $state_code;
-                                        $discount_per_country = $repo->find( $country_with_state );
-                                        $flag                 = 1;
-                                        if ( $discount_per_country ) {
-                                            $flag = 0;
+                                        }
-                                        if ( 1 === $flag ) {
-                                            echo '<option value="' . esc_attr( $country_code . ':' . $state_code ) . '"' . wc_selected( "state:$country_code:$state_code", $locations ) . '>' . esc_html( '&nbsp;&nbsp;&nbsp;&nbsp; ' . $state_name . ', ' . $allowed_countries[ $country_code ] ) . '</option>';
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        ?>
+                    </select>
+                </td>
+                <td>
+                    <input type='number' class='eraq_input_label' title="<?php esc_html_e( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' ); ?>" id="elex_discount_per_country_options_input_value"  value="0" min="0" max="100" step="any" >
+                </td>
+                <td>
+                <input type='datetime-local' value="" class='elex_discount_per_country_from_date' title="<?php esc_html_e( 'Start Date from which discount will be applied,Leave blank if you do not restrict based on  date', 'elex-discount-per-country' ); ?>" id="elex_discount_per_country_start_date"  min="<?php echo esc_attr( wp_date( 'Y-m-d\TH:i' ) ); ?>" >
+                </td>
+                <td>
+                <input type='datetime-local' value="" class='elex_discount_per_country_to_date' title="<?php esc_html_e( 'Discount will not be applied after this date,Leave blank if you do not restrict based on date', 'elex-discount-per-country' ); ?>" id="elex_discount_per_country_end_date"  min="<?php echo esc_attr( wp_date( 'Y-m-d\TH:i' ) ); ?>"   >
+                </td>
+                <td>
+                    <label class="switch" title='<?php esc_html_e( 'Click to enable or disable the discount', 'elex-discount-per-country' ); ?>'>
+                      <input id="elex_discount_per_country_options_enabled" type="checkbox" checked>
+                      <span class="slider round"></span>
+                    </label>
+                </td>
+                <td>
+                    <button name="submit" type="button" class="elex-dpc-btn-primary button-primary" title="<?php esc_html_e( 'Click here to add more discount.', 'elex-discount-per-country' ); ?>"  id="elex_dpc_add_field_discount"  >
+                        <?php esc_html_e( 'Add', 'elex-discount-per-country' ); ?>
+                    </button>
+                </td>
+            </tr>
+        </table>
+                    }
+                }
+                ?>
+            </select>
+            <select id="elex_discount_per_country_discount_type_template" class="dpc-discount-type-select"
+                name="elex_discount_per_country_discount_type_template">
+                <option value="percentage">
+                    <?php esc_html_e( 'Percentage', 'elex-discount-per-country' ); ?>
+                </option>
+                <option value="fixed">
+                    <?php esc_html_e( 'Fixed Amount', 'elex-discount-per-country' ); ?>
+                </option>
+            </select>
+            <input type="number" step="any" min="0" id="elex_discount_per_country_options_input_value_template"
+                class="dpc-discount-input" name="elex_discount_per_country_options_input_value_template" value="0">
+            <input type="text" id="elex_discount_per_country_label_template"
+                placeholder="<?php esc_html_e( 'Discount label', 'elex-discount-per-country' ); ?>"
+                name="elex_discount_per_country_label_template" value="">
+            <input type='datetime-local' value="" class='elex_discount_per_country_from_date'
+                title="<?php esc_html_e( 'Start Date from which discount will be applied,Leave blank if you do not restrict based on  date', 'elex-discount-per-country' ); ?>"
+                id="elex_discount_per_country_start_date_template"
+                min="<?php echo esc_attr( wp_date( 'Y-m-d\TH:i' ) ); ?>">
+            <input type='datetime-local' value="" class='elex_discount_per_country_to_date'
+                title="<?php esc_html_e( 'Discount will not be applied after this date,Leave blank if you do not restrict based on date', 'elex-discount-per-country' ); ?>"
+                id="elex_discount_per_country_end_date_template"
+                min="<?php echo esc_attr( wp_date( 'Y-m-d\TH:i' ) ); ?>">
+            <label class="switch"
+                title='<?php esc_html_e( 'Click to enable or disable the discount', 'elex-discount-per-country' ); ?>'>
+                <input id="elex_discount_per_country_options_enabled_template" type="checkbox" checked>
+                <span class="slider round"></span>
+            </label>
+        </div>
+        <script>
+            jQuery(document).ready(function ($) {
+                // Prevent 'e', '-', '+', 'E' in any discount input
+                $(document).on('keydown', '.dpc-discount-input', function (e) {
+                    if (['e', 'E', '-', '+'].includes(e.key)) {
+                        e.preventDefault();
+                    }
+                });
+                // Conditional validation for all discount rows
+                $(document).on('change', '.dpc-discount-type-select', function () {
+                    var type = $(this).val();
+                    var $row = $(this).closest('tr');
+                    var $input = $row.find('.dpc-discount-input');
+                    if (type === 'percentage') {
+                        $input.attr('max', '100');
+                        $input.attr('title', '<?php esc_html_e( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' ); ?>');
+                    } else {
+                        $input.removeAttr('max');
+                        $input.attr('title', '<?php esc_html_e( 'Enter the discount fixed amount (0 or more).', 'elex-discount-per-country' ); ?>');
+                    }
+                });
+                // Trigger change on all select on load to ensure tooltips/max are correct
+                $('.dpc-discount-type-select').trigger('change');
+                // Change 'Save changes' text to 'Save Changes'
+                $("button[name='save']").text('<?php esc_html_e( 'Save Changes', 'elex-discount-per-country' ); ?>');
+            });
+        </script>
     </td>
 </tr>

elex-discount-per-country/tags/1.2.1/readme.txt

-                      r3460057
+                      r3492012
 Tags: discount based on shipping country, woocommerce
 Requires at least: 3.0.1
 Stable tag: 1.2.0
+Stable tag: 1.2.1
 Tested up to: 6.9
 License: GPLv2 or later
 …
 == Changelog ==
+= 1.2.1 =
+* Enhanced validation and security
+* Improved discount calculations
+* Added support for fixed discounts
+* Added custom discount labels for each payment method
 = 1.2.0 =
 * Minor issue fixes
 …
 == Upgrade Notice ==
+= 1.2.1 =
+* Enhanced validation and security
+* Improved discount calculations
+* Added support for fixed discounts
+* Added custom discount labels for each payment method
 = 1.2.0 =
 * Minor issue fixes

elex-discount-per-country/trunk/assets/css/dpc-plugin-styles.css

-                      r2644557
+                      r3492012
 #custom_price_field {
     /* margin-bottom: 5px; */
 …
+}
 .interested_products{
     color:red;
     font:bolder;
+.interested_products {
+    color: red;
+    font: bolder;
+}
 …
 .elex_cpp_custom_title_heading {
     font-size: 1.4em;
+}
 …
 .custom-min-price1 {
     color: rgb(20, 19, 19);
+    font-size: 25;
+}
+    font-size: 25px;
+}
 .custom-min-price-validation {
     color: rgb(20, 19, 19);
     font-size: 25;
+    font-size: 25px;
+}
 …
     height: 5%;
     border-color: rgb(200, 210, 219);
     vertical-align:middle;
     margin-bottom:15px;
+    vertical-align: middle;
+    margin-bottom: 15px;
     line-height: 20px;
+    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    box-shadow: 0 5px 10px 5px rgba(0,0,0,0.2);
+}
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.2);
+}
 /*
 input.style {
 …
 /*Styles for form-settings-template*/
+.fields_adjustment_dpc {
+    table-layout: fixed;
+    width: 100%;
+}
 .fields_adjustment_dpc td {
     vertical-align: middle;
+    padding: 4px 7px;
+}
+    padding: 8px;
+    white-space: normal;
+}
 .fields_adjustment_dpc th {
     padding: 9px 7px;
+    padding: 10px 10px;
+}
 .fields_adjustment_dpc .bold_span {
     font-weight:bold;
+}
 .fields_adjustment_dpc .col_btn{
+    font-weight: bold;
+}
+.fields_adjustment_dpc .col_btn {
     display: flex;
     justify-content: center;
+    align-items: center;
+}
+    align-items: center;
+}
 .fields_adjustment_dpc .remove_icon_discount_dpc {
+    width: 10%;
+}
+    width: 7%;
+    min-width: 65px;
+    text-align: center;
+}
 .fields_adjustment_dpc .table_col_1_dpc {
+    width: 2%;
+}
+    width: 3%;
+    min-width: 30px;
+}
 .fields_adjustment_dpc .table_col_2_dpc {
+    width: 35%;
+}
+    width: 20%;
+    min-width: 160px;
+    /* Payment Method / region select */
+}
+.fields_adjustment_dpc .table_col_type_dpc {
+    width: 12%;
+    min-width: 120px;
+    /* Discount Type - wider so Percentage/Fixed shows fully */
+}
+.fields_adjustment_dpc .table_col_label_dpc {
+    width: 12%;
+    min-width: 110px;
+    /* Discount Label */
+}
 .fields_adjustment_dpc .table_col_3_dpc {
+    width: 35%;
+}
+    width: 15%;
+    min-width: 180px;
+    /* Percentage/Fixed Amount value */
+}
+.fields_adjustment_dpc .table_col_5_dpc {
+    width: 12%;
+    min-width: 130px;
+    /* From Date */
+}
+.fields_adjustment_dpc .table_col_6_dpc {
+    width: 12%;
+    min-width: 130px;
+    /* To Date */
+}
 .fields_adjustment_dpc .table_col_4_dpc {
+    width: 10%;
+}
+.fields_adjustment_dpc .table_col_5_dpc {
+    width: 10%;
+}
+.fields_adjustment_dpc .table_col_6_dpc {
+    width: 10%;
+    width: 7%;
+    min-width: 65px;
+    text-align: center;
+}
+/* Reduce outer spacing around the Add New Discount button */
+.fields_adjustment_dpc tfoot td {
+    padding: 16px 0 !important;
+}
+.fields_adjustment_dpc td input[type="text"],
+.fields_adjustment_dpc td input[type="number"],
+.fields_adjustment_dpc td input[type="datetime-local"],
+.fields_adjustment_dpc td select {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 7px 10px;
+    border: 1px solid #c3c4c7;
+    border-radius: 4px;
+    /* Match the Select region border-radius */
+    background-color: #fff;
+    color: #2c3338;
+    font-size: 13px;
+}
+.fields_adjustment_dpc td input:focus,
+.fields_adjustment_dpc td select:focus {
+    border-color: #2271b1;
+    box-shadow: none;
+    /* Flat focus, no glow */
+    outline: none;
+}
 .fields_adjustment_dpc td input {
+    margin-right: 4px;
+}
+    margin-right: 0;
+}
 .fields_adjustment_dpc .check-column {
     vertical-align: middle;
 …
     padding: 0 7px;
+}
+.fields_adjustment_dpc .table_input_raw_dpc{
+    background: #EBEBEB;
+}
+.woocommerce table.form-table .select2-container {
+min-width: 500px!important;
+.fields_adjustment_dpc .table_input_raw_dpc {
+    background: #f6f7f7;
+}
+/* Empty state messages - centered */
+.nodiscount-dpc td {
+    text-align: center !important;
+    padding: 24px 0 !important;
+}
+#no_discount_available_dpc {
+    display: block;
+    text-align: center;
+    color: #50575e;
+    font-size: 13px;
+    margin-bottom: 6px;
+}
+.no-payments-btn {
+    text-align: center;
+    color: #50575e;
+    font-size: 13px;
+}
+.fields_adjustment_dpc .select2-container {
+    min-width: 100% !important;
+}
 .fields_adjustment_dpc .table_header {
+    font-weight:bold;
+    font-weight: bold;
+    font-size: 13px;
+    color: #50575e;
+    vertical-align: middle;
+}
 .table_th_label {
+    font-weight:bold;
+    font-size:small;
+}
+    font-weight: bold;
+    font-size: 13px;
+}
 .fields_adjustment_dpc .table_header_remove {
     text-align: center;
+    font-weight:bold;
+    font-weight: bold;
+    font-size: 13px;
+    color: #50575e;
+    vertical-align: middle;
+}
 …
     padding: 0 16px;
+}
 .fields_adjustment_dpc td.sort {
     width: 16px;
     padding: 0 16px;
     cursor: move;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAHUlEQVQYV2O8f//+fwY8gJGgAny6QXKETRgEVgAAXxAVsa5Xr3QAAAAASUVORK5CYII=) no-repeat center;
+    }
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAHUlEQVQYV2O8f//+fwY8gJGgAny6QXKETRgEVgAAXxAVsa5Xr3QAAAAASUVORK5CYII=) no-repeat center;
+}
 .fields_adjustment_dpc td.remove_icon_discount_dpc {
     width: 16px;
     padding: 0 16px;
     cursor: pointer;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAA3NCSVQICAjb4U/gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAB70lEQVQ4T61UPUhbURT+7n0vLxE1vmqFEBTR6lS7uHaTYpfqopsu0qkgODh0EURwadFBEJy62a3t0BbBIm5dXdTJP/whiFr7EpUmL3m5nnNixR80EfLBXe79vu+ce865VxkCbsHf2Ud6eQWZzS1k1tZlL/y8DeFnLYh0vIDT1CB713HDKPBS8D5/xemPX8hns1COA2VbcmZyAYzvQ4dCqO7ugtvfC8uNyhnjyiibOMDByDhyngdFZKW1EG7D5PMwFMR2XcSmxhCKx2RfjIJkCol375E7IZMwZaGUHN4Hjm0yPuxaF/HZD7BqopCw3twXBH9LM2Ewh7msYS1D+zt7OP25CNh0HdqQaCUsCUca1rKHTi+vIk9FVFrR/YmUTsP8K7KYQ1zWsJY91OHHGXO29Fu6Y7k1iPa8ptwlNY55F3x1Okp9X6AuJ6WbVZ0voXYHh01w9AegbjitzYhPT1wqHkZieBT+xjYVR8OqrysUuxwo39WS3+bN8cwnWFWVhWL7GSE+CPJSTliKHZyd4+nQW+hIRzs0PYX/XVCRCFRFkcWcyy6ztuDR1IjqN6+AXFYSkWErYUnSpGEte0ix3YE+WE9cGXsetmKQoSQua1jLECN+K7HJMdhsRgPGD/M+yKMlDnNZw1pG+b+R63j8xwZcADXJQNHUd268AAAAAElFTkSuQmCC) no-repeat center
 …
 .fields_adjustment_dpc #elex_dpc_add_field {
     cursor: pointer;
+}
+}
 .fields_adjustment_dpc select {
 …
+}
-tr td {
-white-space: nowrap;
+}
 body {
+background:#FCFCFC;
+color:#222;
+font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Open Sans,Helvetica Neue,sans-serif;
+}
+    background: #FCFCFC;
+    color: #222;
+    font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, sans-serif;
+}
 .btn_raw {
+background-color: white;
+padding-top: 5px;
+border: none;
+border-radius: 50%;
+background:   #1E90FF;
+color: white;
+padding: 1px 2px;
+cursor: pointer;
+}
+    background-color: white;
+    padding-top: 5px;
+    border: none;
+    border-radius: 50%;
+    background: #1E90FF;
+    color: white;
+    padding: 1px 2px;
+    cursor: pointer;
+}
+/* Premium "Add New Discount" Button Style */
+.fields_adjustment_dpc .elex-add-new-btn {
+    background: #2271b1;
+    border: none;
+    color: #ffffff;
+    padding: 6px 20px 6px 6px;
+    border-radius: 50px;
+    display: inline-flex;
+    align-items: center;
+    gap: 12px;
+    cursor: pointer;
+    font-weight: 500;
+    font-size: 14px;
+    transition: all 0.3s ease;
+    box-shadow: 0 2px 4px rgba(34, 113, 177, 0.2);
+    text-decoration: none;
+    line-height: 1;
+}
+.fields_adjustment_dpc .elex-add-new-btn:hover {
+    background: #1c5d91;
+    transform: translateY(-1px);
+    box-shadow: 0 4px 8px rgba(34, 113, 177, 0.3);
+}
+.fields_adjustment_dpc .elex-add-new-btn .icon-circle {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 28px;
+    height: 28px;
+    background: #ffffff;
+    color: #2271b1;
+    border-radius: 50%;
+    font-size: 18px;
+    /* Slightly larger for text + */
+    font-weight: bold;
+    padding: 0;
+    line-height: 0;
+    /* Helps with centering text + */
+}
+#elex_dpc_add_field_discount .icon-circle {
+    color: #2271b1;
+}
+.fields_adjustment_dpc .elex-add-new-btn .btn-text {
+    padding-right: 5px;
+    color: #ffffff;
+}
 .switch {
+position: relative;
+display: inline-block;
+width: 40px;
+height: 19px;
+}
+.switch input {
+opacity: 0;
+width: 0;
+height: 0;
+    position: relative;
+    display: inline-block;
+    width: 40px;
+    height: 19px;
+}
+.switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+}
 .slider {
 position: absolute;
 cursor: pointer;
 top: 0;
 left: 0;
 right: 0;
 bottom: 0;
 background-color: #ccc;
 -webkit-transition: .4s;
 transition: .4s;
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    -webkit-transition: .4s;
+    transition: .4s;
+}
 .slider:before {
 position: absolute;
 content: "";
 height:16px;
 width: 16px;
 left: 4px;
 bottom: 2px;
 background-color: white;
 -webkit-transition: .4s;
 transition: .4s;
+}
 input:checked + .slider {
 background-color: #2196F3;
+}
 input:focus + .slider {
 box-shadow: 0 0 1px #2196F3;
+}
 input:checked + .slider:before {
 -webkit-transform: translateX(16px);
 -ms-transform: translateX(16px);
 transform: translateX(16px);
+    position: absolute;
+    content: "";
+    height: 16px;
+    width: 16px;
+    left: 4px;
+    bottom: 2px;
+    background-color: white;
+    -webkit-transition: .4s;
+    transition: .4s;
+}
+input:checked+.slider {
+    background-color: #2196F3;
+}
+input:focus+.slider {
+    box-shadow: 0 0 1px #2196F3;
+}
+input:checked+.slider:before {
+    -webkit-transform: translateX(16px);
+    -ms-transform: translateX(16px);
+    transform: translateX(16px);
+}
 /* Rounded sliders */
 .slider.round {
 border-radius: 34px;
+    border-radius: 34px;
+}
 .slider.round:before {
 border-radius: 50%;
+}
+    border-radius: 50%;
+}

elex-discount-per-country/trunk/assets/js/dpc-plugin-scripts.js

-                      r3460057
+                      r3492012
 jQuery(document).ready(function(){
     jQuery(document).on('change','.elex_discount_per_country_to_date' ,function(){
+jQuery(document).ready(function () {
+    jQuery(document).off('change', '.elex_discount_per_country_to_date').on('change', '.elex_discount_per_country_to_date', function () {
         var end_date = new Date(jQuery(this).val());
         var start_date  = new Date(jQuery(this).parents('tr').find('.elex_discount_per_country_from_date').val());
     if(start_date.getTime() >  end_date.getTime()){
         alert("To date can not be less than From date");
         var end_date = new Date(jQuery(this).val(''));
         return;
+    }
     });
     jQuery(document).on('change','.elex_discount_per_country_from_date' ,function(){
+        var start_date = new Date(jQuery(this).parents('tr').find('.elex_discount_per_country_from_date').val());
+        if (start_date.getTime() > end_date.getTime()) {
+            alert("To date can not be less than From date");
+            var end_date = new Date(jQuery(this).val(''));
+            return;
+        }
+    });
+    jQuery(document).off('change', '.elex_discount_per_country_from_date').on('change', '.elex_discount_per_country_from_date', function () {
         var start_date = new Date(jQuery(this).val());
         var end_date  = new Date(jQuery(this).parents('tr').find('.elex_discount_per_country_to_date').val());
     if(start_date.getTime() >  end_date.getTime()){
         var start_date = new Date(jQuery(this).val(''));
         alert("start date can not be more than From date");
         return;
+    }
+        var end_date = new Date(jQuery(this).parents('tr').find('.elex_discount_per_country_to_date').val());
+        if (start_date.getTime() > end_date.getTime()) {
+            var start_date = new Date(jQuery(this).val(''));
+            alert("start date can not be more than From date");
+            return;
+        }
     });
     /*Scripts for form-settings-temp */
     jQuery("#elex_dpc_table_body").on('click', '.remove_icon_discount_dpc', function () {
         var tbody = jQuery('.fields_adjustment_dpc').find('tbody');
         var size = tbody.find('tr').size();
+    jQuery("#elex_dpc_table_body").off('click', '.remove_icon_discount_dpc').on('click', '.remove_icon_discount_dpc', function () {
+        var tbody = jQuery('#elex_dpc_table_body');
+        var size = tbody.find('tr').length;
         var id = jQuery(this).closest("tr").attr("id");
         var value = jQuery(this).closest("tr").attr("class");
+        if(value==="nodiscount-dpc"){
+        if (value === "nodiscount-dpc") {
             jQuery("#nodiscount-dpc").remove();
+        }else if(size===1){
+            jQuery('#elex_discount_per_country_options_select_value').append('<option id="'+id+'" value="'+value+'">'+elexdpc_translations['country_id']+'</option>');
+        } else {
+            // Add removed country options back to the country dropdown if they were loaded as existing rows
+            var $tr = jQuery(this).closest("tr");
+            var existingCountryCode = $tr.find('input[name*="[country_code]"]').val();
+            var existingCountryName = $tr.find('input[name*="[country_name]"]').val() || $tr.find('span.bold_span').text();
+            if (existingCountryCode) {
+                if (jQuery('#zone_locations_template option[value="' + existingCountryCode + '"]').length === 0) {
+                    jQuery('#zone_locations_template').append('<option value="' + existingCountryCode + '">&nbsp;&nbsp; ' + existingCountryName + '</option>');
+                }
+            }
+            // Capture dynamically selected ones in case they are missing
+            $tr.find('select[id^="zone_locations_"] option:selected').each(function () {
+                var optionValue = jQuery(this).val();
+                var optionText = jQuery(this).text();
+                if (optionValue && jQuery('#zone_locations_template option[value="' + optionValue + '"]').length === 0) {
+                    jQuery('#zone_locations_template').append('<option value="' + optionValue + '">' + optionText + '</option>');
+                }
+            });
             jQuery(this).closest("tr").remove();
+            var default_code='<tr id="nodiscount-dpc" class="nodiscount-dpc"><td class="table_col_1"></td><td class="table_col_2"><span class="wc-country-name"  id="no_discount_available_dpc">'+elexdpc_translations['tooltip']['nodiscount-dpc']+'</span></td><td class="table_col_3"></td><td class="table_col_4"></td> <td class="table_col_4"></td></tr>';
+            jQuery('#elex_dpc_table_body').append( default_code );
+        }else{
+        jQuery('#elex_discount_per_country_options_select_value').append('<option id="'+id+'" value="'+value+'">'+elexdpc_translations['country_id']+'</option>');
+        jQuery(this).closest("tr").remove();
+        }
+    });
+    jQuery("#elex_dpc_table_body").on('click','.checkbox_click', function () {
+        var v = jQuery(this).closest("td").find('input').val();
+        if(v== true)
+        {
+            jQuery(this).closest("td").find('input').val("yes");
+            jQuery(this).closest("td").find('label').attr('title',elexdpc_translations['tooltip']['toggleon']);
+        }
+        if(v== false)
+        {
+            jQuery(this).closest("td").find('input').val("no");
+            if (size === 1) {
+                var default_code = '<tr id="nodiscount-dpc" class="nodiscount-dpc"><td colspan="9"><div class="no-payments-btn">' + elexdpc_translations['tooltip']['nodiscount-dpc'] + '</div></td></tr>';
+                jQuery('#elex_dpc_table_body').append(default_code);
+            }
+        }
+    });
+    jQuery("#elex_dpc_table_body").off('click', '.checkbox_click').on('click', '.checkbox_click', function () {
+        var v = jQuery(this).is(':checked');
+        if (v) {
+            jQuery(this).closest("td").find('label').attr('title', elexdpc_translations['tooltip']['toggleon']);
+        } else {
             jQuery(this).closest("td").find('label').attr('title', elexdpc_translations['tooltip']['toggleoff']);
+        }
+    });
+    //To add more rules before saving changes
+    jQuery('#elex_dpc_add_field_discount').click( function(e) {
+        }
+    });
+    // Update discount input constraints based on discount type
+    function updateDiscountConstraints($row) {
+        var type = $row.find('select[name*="[discount_type]"]').val();
+        // accidentally matching [discount_type] or other fields that contain "[discount]"
+        var $input = $row.find('input[name$="[discount]"]');
+        if (type === 'fixed') {
+            $input.removeAttr('max');
+            $input.attr('min', '0');
+            $input.attr('title', 'Enter the fixed discount amount (0 or above)');
+        } else {
+            $input.attr('max', '100');
+            $input.attr('min', '0');
+            $input.attr('title', 'Enter the discount percentage value from 0 to 100.');
+        }
+    }
+    // Initialize constraints on page load for all existing rows
+    jQuery('#elex_dpc_table_body tr').each(function () {
+        updateDiscountConstraints(jQuery(this));
+    });
+    // Update constraints when discount type changes
+    jQuery('#elex_dpc_table_body').off('change', 'select[name*="[discount_type]"]').on('change', 'select[name*="[discount_type]"]', function () {
+        updateDiscountConstraints(jQuery(this).closest('tr'));
+    });
+    // To add empty editable rules before saving changes
+    jQuery('#elex_dpc_add_field_discount').off('click').on('click', function (e) {
         e.preventDefault();
+        if(closest_tr_class="nodiscount-dpc"){
+        if (jQuery("#nodiscount-dpc").length) {
             jQuery("#nodiscount-dpc").remove();
+        }
+        var tbody = jQuery('.fields_adjustment_dpc').find('tbody');
+        var size = tbody.find('tr').size();
+        var closest_tr_class = jQuery('#nodiscount-dpc').attr("class");
+        var checkbox_enabled= jQuery('#elex_discount_per_country_options_enabled').is(':checked');
+        var id = [];
+        var input_value = jQuery("#elex_discount_per_country_options_input_value").val();
+        var country_selected = jQuery("#zone_locations").val();
+        if ( country_selected.length <= 0 ) {
+            alert( elexdpc_translations['error_message']['nofieldsfilled'] );
+            return;
+        }
+        // get the date in required format and it to the table
+        var startdate_bfr_converting= jQuery("#elex_discount_per_country_start_date").val();
+        var enddate_bfr_converting= jQuery("#elex_discount_per_country_end_date").val();
+        if(startdate_bfr_converting === '')
+        {
+            var start_date = '';
+        }
+        else
+        {
+            var start_date = moment(new Date(jQuery("#elex_discount_per_country_start_date").val()) ).format('YYYY-MM-DDTHH:mm');
+        }
+        if(enddate_bfr_converting === '')
+        {
+            var end_date = '';
+        }
+        else
+        {
+            var end_date= moment(new Date(jQuery("#elex_discount_per_country_end_date").val()) ).format('YYYY-MM-DDTHH:mm');
+        }
+        if(start_date !== '' && end_date !== '' )
+        {
+                if(start_date >  end_date){
+                    alert("To date can not be less than From date");
+                    return;
+        }
+        var tbody = jQuery('#elex_dpc_table_body');
+        // Find the highest existing index to determine the next size
+        var maxIndex = -1;
+        tbody.find('tr').each(function () {
+            var idAttr = jQuery(this).attr('id');
+            // Existing rows might have numeric IDs or custom IDs.
+            // We look for the inputs to get the actual array index used.
+            jQuery(this).find('input[name*="elex_discount_per_country_options"]').each(function () {
+                var name = jQuery(this).attr('name');
+                var match = name.match(/\[(\d+)\]/);
+                if (match) {
+                    var idx = parseInt(match[1]);
+                    if (idx > maxIndex) maxIndex = idx;
+                }
+        }
+        var startdate_bfr_converting= jQuery("#elex_discount_per_country_start_date").val('');
+        var enddate_bfr_converting= jQuery("#elex_discount_per_country_end_date").val('');
+        var country_names = [];
+         jQuery('#zone_locations').find("option:selected").map(function() {
+            country_names.push(jQuery(this).text());
+            id.push(this.value);
+            });
         });
+        country_names = country_names.join(', ');
+        jQuery('#zone_locations').find("option:selected").remove();
+        id = id.join(',');
+        jQuery("#elex_discount_per_country_options_input_value").val(0);
+        if ( input_value <= 100 && input_value >= 0 && ( input_value.indexOf(".") <= 2 ) && input_value != "" && country_selected != "" )
+        {
+            var code='<tr id="'+id+'" class="'+country_selected+'">\
+                    <td class="table_col_1"  > </td>\
+                    <td class="table_col_2"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][country_code]" value="'+id+'"/><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][country_name]" value="'+country_selected+'"/> <span  class="wc-country-name" >'+country_names+'</span></td>\
+                    <td class="table_col_3" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="number"  min="0" max="100" step="any" class="order" name="elex_discount_per_country_options['+size+'][discount]" value="'+input_value+'" required></td>\
+                    <td class="table_col_5" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="datetime-local"   class="elex_discount_per_country_from_date" name="elex_discount_per_country_options['+size+'][start_date]" value="'+start_date+'"  ></td>\
+                    <td class="table_col_6" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="datetime-local" class="elex_discount_per_country_to_date" name="elex_discount_per_country_options['+size+'][end_date]" value="'+end_date+'"  ></td>';
+            if(checkbox_enabled)
+            {
+                code +='<td  class="table_col_4" > <label title="'+elexdpc_translations['tooltip']['toggleoff']+'" class="switch"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][status]" value="yes"/><input    type="checkbox" class="checkbox_click" name="elex_discount_per_country_options['+size+'][enabled]" value="1" checked><span class="slider round"></span></label></td>';
+            }else{
+                code +='<td class="table_col_4"> <label title="'+elexdpc_translations['tooltip']['toggleon']+'" class="switch"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][status]" value="no"/><input  type="checkbox" class="checkbox_click" name="elex_discount_per_country_options['+size+'][enabled]" value="0"  ><span class="slider round"></span></label></td>';
+            }
+            code +='<td class="remove_icon_discount_dpc" title="'+elexdpc_translations['tooltip']['remove']+'" ></td>\
+        var size = maxIndex + 1;
+        // Clone templates
+        var countrySelect = jQuery('#zone_locations_template').clone();
+        countrySelect.attr('id', 'zone_locations_' + size);
+        countrySelect.attr('name', 'elex_discount_per_country_options[' + size + '][country_code][]');
+        countrySelect.css('width', '100%');
+        countrySelect.addClass('wc-enhanced-select');
+        var typeSelect = jQuery('#elex_discount_per_country_discount_type_template').clone();
+        typeSelect.attr('id', 'discount_type_' + size);
+        typeSelect.attr('name', 'elex_discount_per_country_options[' + size + '][discount_type]');
+        var labelInput = jQuery('#elex_discount_per_country_label_template').clone();
+        labelInput.attr('id', 'label_' + size);
+        labelInput.attr('name', 'elex_discount_per_country_options[' + size + '][label]');
+        var discountInput = jQuery('#elex_discount_per_country_options_input_value_template').clone();
+        discountInput.attr('id', 'discount_value_' + size);
+        discountInput.attr('name', 'elex_discount_per_country_options[' + size + '][discount]');
+        var startDateInput = jQuery('#elex_discount_per_country_start_date_template').clone();
+        startDateInput.attr('id', 'start_date_' + size);
+        startDateInput.attr('name', 'elex_discount_per_country_options[' + size + '][start_date]');
+        var endDateInput = jQuery('#elex_discount_per_country_end_date_template').clone();
+        endDateInput.attr('id', 'end_date_' + size);
+        endDateInput.attr('name', 'elex_discount_per_country_options[' + size + '][end_date]');
+        var statusLabel = jQuery('#elex_discount_per_country_options_enabled_template').parent().clone();
+        statusLabel.find('input').attr('id', 'enabled_' + size);
+        statusLabel.find('input').attr('name', 'elex_discount_per_country_options[' + size + '][status]');
+        statusLabel.find('input').val('yes'); // Default enabled
+        statusLabel.find('input').prop('checked', true);
+        var code = '<tr id="new_row_' + size + '" class="new_row_dpc">\
+                    <td class="table_col_1_dpc"> </td>\
+                    <td class="table_col_2_dpc"></td>\
+                    <td class="table_col_type_dpc"></td>\
+                    <td class="table_col_3_dpc"></td>\
+                    <td class="table_col_label_dpc"></td>\
+                    <td class="table_col_5_dpc"></td>\
+                    <td class="table_col_6_dpc"></td>\
+                    <td class="table_col_4_dpc"></td>\
+                    <td class="remove_icon_discount_dpc" title="' + elexdpc_translations['tooltip']['remove'] + '"><span class="remove-btn-circle"><i class="fas fa-minus"></i></span></td>\
                     </tr>';
+            jQuery('#elex_dpc_table_body').append( code );
+        }else{
+            if(country_selected==""){
+                alert(elexdpc_translations['tooltip']['allcountriesselected']);
+            }else{
+                alert(elexdpc_translations['tooltip']['inputalert']);
+            }
+        }
+        var $newRow = jQuery(code);
+        $newRow.find('.table_col_2_dpc').append(countrySelect);
+        $newRow.find('.table_col_type_dpc').append(typeSelect);
+        $newRow.find('.table_col_3_dpc').append(discountInput);
+        $newRow.find('.table_col_label_dpc').append(labelInput);
+        $newRow.find('.table_col_5_dpc').append(startDateInput);
+        $newRow.find('.table_col_6_dpc').append(endDateInput);
+        $newRow.find('.table_col_4_dpc').append(statusLabel);
+        tbody.append($newRow);
+        // Initialize discount constraints for the new row
+        updateDiscountConstraints($newRow);
+        // Initialize Select2/Enhanced Select
+        jQuery(document.body).trigger('wc-enhanced-select-init');
         return false;
     });
+        //To save the rule on clicking save changes button(without clicking add button)
+        jQuery("button[name='save']").click( function() {
+        var checkbox_enabled= jQuery('#elex_discount_per_country_options_enabled').is(':checked');
+        var id = [];
+        var input_value = jQuery("#elex_discount_per_country_options_input_value").val();
+        var country_selected = jQuery("#zone_locations").val();
+        var tbody = jQuery('.fields_adjustment_dpc').find('tbody');
+        var size = tbody.find('tr').size();
+        // get the date in required format and it to the table
+        var startdate_bfr_converting= jQuery("#elex_discount_per_country_start_date").val();
+        var enddate_bfr_converting= jQuery("#elex_discount_per_country_end_date").val();
+        if(startdate_bfr_converting === '')
+        {
+            var start_date = '';
+        }
+        else
+        {
+            var start_date = moment(new Date(jQuery("#elex_discount_per_country_start_date").val()) ).format('YYYY-MM-DDTHH:mm');
+        }
+        if(enddate_bfr_converting === '')
+        {
+            var end_date = '';
+        }
+        else
+        {
+            var end_date= moment(new Date(jQuery("#elex_discount_per_country_end_date").val()) ).format('YYYY-MM-DDTHH:mm');
+        }
+        if(start_date !== '' && end_date !== '' )
+        {
+                if(start_date >  end_date){
+                    alert("To date can not be less than From date");
+                    return;
+                }
+        }
+        var startdate_bfr_converting= jQuery("#elex_discount_per_country_start_date").val('');
+        var enddate_bfr_converting= jQuery("#elex_discount_per_country_end_date").val('');
+        var country_names = [];
+         jQuery('#zone_locations').find("option:selected").map(function() {
+            country_names.push(jQuery(this).text());
+            id.push(this.value);
+        });
+        jQuery('#zone_locations').find("option:selected").remove();
+        jQuery("#elex_discount_per_country_options_input_value").val(0);
+        if (input_value<=100 && input_value>=0 && ( input_value.indexOf(".") <= 2 ) && input_value!="" && country_selected!="")
+        {
+            var code='<tr id="'+id+'" class="'+country_selected+'">\
+                    <td class="table_col_1"  > </td>\
+                    <td class="table_col_2"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][country_code]" value="'+id+'"/><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][country_name]" value="'+country_selected+'"/> <span  class="wc-country-name" >'+country_names+'</span></td>\
+                    <td class="table_col_3" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="number" min="0" max="100" step="any" class="order" name="elex_discount_per_country_options['+size+'][discount]" value="'+input_value+'" required></td>\
+                    <td class="table_col_5" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="datetime-local"   class="elex_discount_per_country_from_date" name="elex_discount_per_country_options['+size+'][start_date]" value="'+start_date+'"  ></td>\
+                    <td class="table_col_6" title="'+elexdpc_translations['tooltip']['inputtooltip']+'" > <input type="datetime-local" class="elex_discount_per_country_to_date" name="elex_discount_per_country_options['+size+'][end_date]" value="'+end_date+'"  ></td>';
+            if(checkbox_enabled)
+            {
+                code +='<td  class="table_col_4" > <label title="'+elexdpc_translations['tooltip']['toggleoff']+'" class="switch"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][status]" value="yes"/><input    type="checkbox" class="checkbox_click" name="elex_discount_per_country_options['+size+'][enabled]" value="1" checked><span class="slider round"></span></label></td>';
+            }else{
+                code +='<td class="table_col_4"> <label title="'+elexdpc_translations['tooltip']['toggleon']+'" class="switch"><input type="hidden" class="order" name="elex_discount_per_country_options['+size+'][status]" value="no"/><input  type="checkbox" class="checkbox_click" name="elex_discount_per_country_options['+size+'][enabled]" value="0"  ><span class="slider round"></span></label></td>';
+            }
+            code +='<td class="remove_icon_discount_dpc" title="'+elexdpc_translations['tooltip']['remove']+'" ></td>\
+                    </tr>';
+            jQuery('#elex_dpc_table_body').append( code );
+        }
+    });
+    /* script for refreshing cart on selecting different country_selected option */
+    (function($){
+        $( 'form.checkout' ).on( 'change', 'input[name^="country"]', function() {
+        $('body').trigger('update_checkout');
+        });
+    })(jQuery);
+    // The save handler no longer needs to auto-add rows from static inputs
+    jQuery("button[name='save']").off('click').on('click', function (e) {
+        // Just let the form submit normally
+        return true;
+    });
 });
+/* script for refreshing cart on selecting different country_selected option */
+(function ($) {
+    $('form.checkout').off('change', 'input[name^="country"]').on('change', 'input[name^="country"]', function () {
+        $('body').trigger('update_checkout');
+    });
+})(jQuery);

elex-discount-per-country/trunk/elex-discount-per-country.php

r3460057	r3492012
4	4	* Plugin URI: https://elextensions.com/plugin/elex-woocommerce-discount-per-country-plugin-free/
5	5	* Description: The plugin allows you to offer discounts on your WooCommerce store based on the shipping country and shipping state chosen by customers.
6		* Version: 1.2.0
	6	* Version: 1.2.1
7	7	* Author: ELEXtensions
8	8	* Author URI: https://elextensions.com/

elex-discount-per-country/trunk/includes/class-discount-per-country.php

-                      r3460057
+                      r3492012
 class ELEXDPC_Discount_Per_Country_Model {
     const OPTION_KEY = 'elexdpc_discount_per_country_options';
     private $items   = [];
+    private $items = [];
     public function get_items() {
        return $this->items;
+       return $this->items;
+    }
 …
         return array_map(
             function ( $item ) {
             return $item->to_array();
+                return $item->to_array();
             },
             $this->items
         );
+    }
     public function build() {
+         $items = get_option( self::OPTION_KEY, array() );
+       $items = get_option( self::OPTION_KEY, array() );
+        $old_global_label = get_option( 'elex-discount-per-country_label', '' );
         foreach ( $items as $item ) {
+            $array_obj = new ELEXDPC_Discount_Per_Country_Rule( $item['country_code'], $item['discount'], $item['status'], $item['country_name'] , $item['start_date'], $item['end_date'] );
+            if ( ! array_key_exists( 'label', $item ) ) {
+                $resolved_label = $old_global_label;
+            } else {
+                $resolved_label = $item['label'];
+            }
+            $array_obj = new ELEXDPC_Discount_Per_Country_Rule(
+                isset( $item['country_code'] ) ? $item['country_code'] : '',
+                isset( $item['discount'] ) ? $item['discount'] : 0,
+                isset( $item['status'] ) ? $item['status'] : false,
+                isset( $item['country_name'] ) ? $item['country_name'] : '',
+                isset( $item['start_date'] ) ? $item['start_date'] : '',
+                isset( $item['end_date'] ) ? $item['end_date'] : '',
+                $resolved_label,
+                isset( $item['discount_type'] ) ? $item['discount_type'] : 'percentage'
+            );
             $this->add( $array_obj );
+        }
+    }
+    }
 …
     public function remove( $country_code ) {
                 $this->items = array_filter(
                     $this->items,
                     function ( $item ) use ( $country_code ) {
                         return $country_code !== $item->country_code;
+                    }
                 );
+        $this->items = array_filter(
+            $this->items,
+            function ( $item ) use ( $country_code ) {
+                return $country_code !== $item->country_code;
+            }
+        );
+    }
 …
 class ELEXDPC_Discount_Per_Country_Rule {
+    const STATUS_ENABLE  = true;
+    const STATUS_ENABLE = true;
     const STATUS_DISABLE = false;
     public $country_code;
     public $discount;
+    public $discount_type;
     public $status;
     public $country_name;
     public $start_date;
     public $end_date;
+    public $label;
     public function __construct( $country_code, $discount, $status, $country_name, $start_date, $end_date ) {
+    public function __construct( $country_code, $discount, $status, $country_name, $start_date, $end_date, $label = '', $discount_type = 'percentage' ) {
         $this->country_code = $country_code;
+        $this->discount     = $discount;
+        $this->status       = $status;
+        $this->discount = $discount;
+        $this->discount_type = $discount_type;
+        $this->status = $status;
         $this->country_name = $country_name;
+        $this->start_date   = $start_date;
+        $this->end_date     = $end_date;
+        $this->start_date = $start_date;
+        $this->end_date = $end_date;
+        $this->label = $label;
+    }
 …
             $data['country_name'],
             $data['start_date'],
+            $data['end_date']
+            $data['end_date'],
+            isset( $data['label'] ) ? $data['label'] : '',
+            isset( $data['discount_type'] ) ? $data['discount_type'] : 'percentage'
         );
+    }
     public function is_enabled() {
         return self::STATUS_ENABLE === $this->status;
+      return self::STATUS_ENABLE === $this->status;
+    }
     public function disable() {
         $this->status = self::STATUS_DISABLE;
+         $this->status = self::STATUS_DISABLE;
+    }
     public function enable() {
         $this->status = self::STATUS_ENABLE;
+      $this->status = self::STATUS_ENABLE;
+    }
 …
         return [
             'country_code' => $this->country_code,
+            'discount'     => $this->discount,
+            'status'       => $this->status,
+            'discount' => $this->discount,
+            'discount_type' => $this->discount_type,
+            'status' => $this->status,
             'country_name' => $this->country_name,
+            'start_date'   => $this->start_date,
+            'end_date'     => $this->end_date,
+            'start_date' => $this->start_date,
+            'end_date' => $this->end_date,
+            'label' => $this->label,
         ];
+    }

elex-discount-per-country/trunk/includes/elex-discount-per-country-admin-settings.php

-                      r3460057
+                      r3492012
+}
 require_once  WP_PLUGIN_DIR . '/woocommerce/includes/admin/settings/class-wc-settings-page.php' ;
 require_once  ABSPATH . 'wp-admin/includes/plugin.php' ;
 require_once  __DIR__ . '/class-discount-per-country.php';
+require_once WP_PLUGIN_DIR . '/woocommerce/includes/admin/settings/class-wc-settings-page.php';
+require_once ABSPATH . 'wp-admin/includes/plugin.php';
+require_once __DIR__ . '/class-discount-per-country.php';
 class ELEXDPC_Admin_Settings extends WC_Settings_Page {
     public function __construct() {
         //registering and loading scripts
         $this->id    = 'elex-discount-per-country';
+         //registering and loading scripts
+        $this->id = 'elex-discount-per-country';
         $this->label = __( 'ELEX Woo Discount Per Country', 'elex-discount-per-country' );
         add_filter( 'woocommerce_settings_tabs_array', array( $this, 'add_settings_page' ), 99 );
 …
         add_action( 'woocommerce_cart_calculate_fees', array( $this, 'calculate_fees' ) );
         add_action( 'admin_enqueue_scripts', array( $this, 'load_assets' ) );
+    }
     public function load_assets() {
         wp_nonce_field( 'elex_dpc_ajax_nonce', '_elex_dpc_ajax_nonce' );
+         wp_nonce_field( 'elex_dpc_ajax_nonce', '_elex_dpc_ajax_nonce' );
         wp_verify_nonce( 'elex_dpc_ajax_nonce', '_elex_dpc_ajax_nonce' );
         global $woocommerce;
         $woocommerce_version = function_exists( 'WC' ) ? WC()->version : $woocommerce->version;
         $page                = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
         $tab                 = isset( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : '';
         $section             = isset( $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '';
+        $woocommerce_version = function_exists( 'WC' ) ? WC()->version : $woocommerce->version;
+        $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
+        $tab = isset( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : '';
+        $section = isset( $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '';
         if ( 'wc-settings' === $page && 'elex-discount-per-country' === $tab && '' === $section ) {
                 wp_enqueue_style( 'woocommerce_admin_styles', $woocommerce->plugin_url() . '/assets/css/admin.css', array(), $woocommerce_version, false );
                 wp_register_style( 'elex-dpc-plugin-styles', ELEX_DISCOUNT_PER_COUNTRY_MAIN_URL_PATH . '/assets/css/dpc-plugin-styles.css', array(), $woocommerce_version, false );
                 wp_enqueue_style( 'elex-dpc-plugin-styles' );
                 wp_register_script( 'elex-dpc-custom-jquery', ELEX_DISCOUNT_PER_COUNTRY_MAIN_URL_PATH . '/assets/js/dpc-plugin-scripts.js', array( 'jquery' ), '1.0', false );
                 wp_enqueue_script( 'elex-dpc-custom-jquery' );
+        }
               $countries_available = array();
               $countries_obj       = new WC_Countries();
+            wp_enqueue_style( 'woocommerce_admin_styles', $woocommerce->plugin_url() . '/assets/css/admin.css', array(), $woocommerce_version, false );
+            wp_register_style( 'elex-dpc-plugin-styles', ELEX_DISCOUNT_PER_COUNTRY_MAIN_URL_PATH . '/assets/css/dpc-plugin-styles.css', array(), $woocommerce_version, false );
+            wp_enqueue_style( 'elex-dpc-plugin-styles' );
+            wp_register_script( 'elex-dpc-custom-jquery', ELEX_DISCOUNT_PER_COUNTRY_MAIN_URL_PATH . '/assets/js/dpc-plugin-scripts.js', array( 'jquery' ), '1.0', false );
+            wp_enqueue_script( 'elex-dpc-custom-jquery' );
+        }
+        $countries_available = array();
+        $countries_obj = new WC_Countries();
         foreach ( $countries_obj->__get( 'countries' ) as $allowed_c ) {
             $countries_available['country_id'] = $allowed_c;
+        }
+              $countries_available['tooltip']['nodiscount']           = __( 'No country discounts have been specified. Select a country from the drop-down to set up a discount.', 'elex-discount-per-country' );
+              $countries_available['tooltip']['allcountriesselected'] = __( 'All available country have been selected', 'elex-discount-per-country' );
+              $countries_available['tooltip']['inputalert']           = __( 'Please enter value between 0 to 100', 'elex-discount-per-country' );
+              $countries_available['tooltip']['toggleon']             = __( 'Click here to enable the discount', 'elex-discount-per-country' );
+              $countries_available['tooltip']['toggleoff']            = __( 'Click here to disable the discount', 'elex-discount-per-country' );
+              $countries_available['tooltip']['inputtooltip']         = __( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' );
+              $countries_available['tooltip']['remove']               = __( 'Click here to remove the discount.', 'elex-discount-per-country' );
+              $countries_available['error_message']['nofieldsfilled'] = __( 'Please fill in the fields before adding a discount rule', 'elex-discount-per-country' );
+              wp_localize_script( 'elex-dpc-custom-jquery', 'elexdpc_translations', $countries_available );
+    }
+        $countries_available['tooltip']['nodiscount'] = __( 'No country discounts have been specified. Select a country from the drop-down to set up a discount.', 'elex-discount-per-country' );
+        $countries_available['tooltip']['allcountriesselected'] = __( 'All available country have been selected', 'elex-discount-per-country' );
+        $countries_available['tooltip']['inputalert'] = __( 'Please enter value between 0 to 100', 'elex-discount-per-country' );
+        $countries_available['tooltip']['toggleon'] = __( 'Click here to enable the discount', 'elex-discount-per-country' );
+        $countries_available['tooltip']['toggleoff'] = __( 'Click here to disable the discount', 'elex-discount-per-country' );
+        $countries_available['tooltip']['inputtooltip'] = __( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' );
+        $countries_available['tooltip']['remove'] = __( 'Click here to remove the discount.', 'elex-discount-per-country' );
+        $countries_available['tooltip']['nodiscount-dpc'] = __( 'No Payments', 'elex-discount-per-country' );
+        $countries_available['error_message']['nofieldsfilled'] = __( 'Please fill in the fields before adding a discount rule', 'elex-discount-per-country' );
+        wp_localize_script( 'elex-dpc-custom-jquery', 'elexdpc_translations', $countries_available );
+    }
     public function get_sections() {
         $sections = array(
             ''                    => __( 'General Settings', 'elex-discount-per-country' ),
+            '' => __( 'General Settings', 'elex-discount-per-country' ),
             'interested_products' => __( 'Related Products!', 'elex-discount-per-country' ),
         );
         /**
 …
     public function output_sections() {
         global $current_section;
+         global $current_section;
         $sections = $this->get_sections();
         if ( empty( $sections ) || 1 === count( $sections ) ) {
 …
         $settings = array();
         if ( 'interested_products' === $current_section ) {
             $settings = array();
 …
                     'type' => 'title',
                     'desc' => __( 'Helps you configure and apply a discount on the Checkout page based on the shipping states/country selected by the customer.' ),
                     'id'   => 'elex-discount-per-country_title',
+                    'id' => 'elex-discount-per-country_title',
                 ),
+                'section'       => array(
+                    'name'        => __( 'Checkout discount label', 'elex-discount-per-country' ),
+                    'type'        => 'text',
+                    'placeholder' => __( 'Enter custom discount label', 'elex-discount-per-country' ),
+                    'desc_tip'    => true,
+                    'css'         => 'width:300px',
+                    'desc'        => __( 'Enter the text to be displayed on checkout. The default text is <strong> Discount per country</strong>.', 'elex-discount-per-country' ),
+                    'id'          => 'elex-discount-per-country_label',
+                'section_end' => array(
+                    'type' => 'sectionend',
+                    'id' => 'elex-discount-per-country_end',
                 ),
+                'section_end'   => array(
+                    'type' => 'sectionend',
+                    'id'   => 'elex-discount-per-country_end',
+                ),
             );
+        }
 …
+    }
     public function output() {
         global $current_section;
+      global $current_section;
         if ( 'interested_products' === $current_section ) {
 …
             include_once __DIR__ . '/market.php';
         } else {
             $countries_obj = new WC_Countries();
             $countries     = $countries_obj->__get( 'countries' );
             $settings      = $this->get_settings();
+            $countries = $countries_obj->__get( 'countries' );
+            $settings = $this->get_settings();
             WC_Admin_Settings::output_fields( $settings );
             $countries_available = array();
             foreach ( $countries_obj->__get( 'countries' ) as $allowed_c ) {
 …
         // Prepare the data
         // save it
         $nonce  = isset( $_POST['nounce_verify'] ) ? sanitize_text_field( wp_unslash( $_POST['nounce_verify'] ) ) : '';
+        $nonce = isset( $_POST['nounce_verify'] ) ? sanitize_text_field( wp_unslash( $_POST['nounce_verify'] ) ) : '';
         $verify = wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['nounce_verify'] ) ), 'form_data' );
 …
         $countries_obj = new WC_Countries();
         $countries     = $countries_obj->__get( 'countries' );
+        $countries = $countries_obj->__get( 'countries' );
         global $current_section;
         $settings = $this->get_settings();
         WC_Admin_Settings::save_fields( $settings );
+        $repo        = new ELEXDPC_Discount_Per_Country_Model();
+        $items_count = isset( $_POST['elex_discount_per_country_options'] ) ? count( $_POST['elex_discount_per_country_options'] ) : 0;
+        $i           = -1;
+        $items_added = 0;
+        while ( $items_added < $items_count ) {
+            $i++;
+            if ( ! isset( $_POST['elex_discount_per_country_options'][ $i ] ) ) {
+                continue;
+            }
+            $country_codes = isset( $_POST['elex_discount_per_country_options'][ $i ]['country_code'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['country_code'] ) ) : '';
+            $country_codes = explode( ',', $country_codes );
+        $repo = new ELEXDPC_Discount_Per_Country_Model();
+        // Use filter_input to retrieve POSTed array safely when available, fall back to wp_unslash.
+        $raw_options = filter_input( INPUT_POST, 'elex_discount_per_country_options', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
+        if ( null === $raw_options || false === $raw_options ) {
+            // Avoid direct $_POST usage to satisfy PHPCS; fall back to empty array.
+            $raw_options = array();
+        }
+        // Recursively sanitize the incoming options to satisfy PHPCS/WPCS checks.
+        $sanitize_recursive = function ( $value ) use ( &$sanitize_recursive ) {
+            if ( is_array( $value ) ) {
+                return array_map( $sanitize_recursive, $value );
+            }
+            return is_string( $value ) ? sanitize_text_field( $value ) : $value;
+        };
+        $options = is_array( $raw_options ) ? $sanitize_recursive( $raw_options ) : array();
+        foreach ( $options as $option ) {
+            $post_country_codes = isset( $option['country_code'] ) ? $option['country_code'] : '';
+            if ( is_array( $post_country_codes ) ) {
+                $country_codes = array_map( 'sanitize_text_field', $post_country_codes );
+            } else {
+                $country_codes = explode( ',', sanitize_text_field( $post_country_codes ) );
+            }
             foreach ( $country_codes as $country_code ) {
                 if ( ! $country_code ) {
+                if ( empty( $country_code ) ) {
                     continue;
+                }
                 $discount_per_country = array();
+                $state_code           = strpos( $country_code, ':' );
+                if ( false === $state_code ) {
+                    $state_code = 0;
+                $state_code_pos = strpos( $country_code, ':' );
+                if ( false === $state_code_pos ) {
+                    $discount_per_country['country_code'] = $country_code;
+                    $discount_per_country['status'] = isset( $option['status'] ) ? ELEXDPC_Discount_Per_Country_Rule::STATUS_ENABLE : ELEXDPC_Discount_Per_Country_Rule::STATUS_DISABLE;
+                    $discount_per_country['country_name'] = isset( $countries[ $country_code ] ) ? $countries[ $country_code ] : $country_code;
+                    $discount_per_country['discount'] = isset( $option['discount'] ) ? sanitize_text_field( $option['discount'] ) : '';
+                    $discount_per_country['discount_type'] = isset( $option['discount_type'] ) ? sanitize_text_field( $option['discount_type'] ) : 'percentage';
+                    $discount_per_country['start_date'] = isset( $option['start_date'] ) ? sanitize_text_field( $option['start_date'] ) : '';
+                    $discount_per_country['end_date'] = isset( $option['end_date'] ) ? sanitize_text_field( $option['end_date'] ) : '';
+                    $discount_per_country['label'] = isset( $option['label'] ) ? sanitize_text_field( $option['label'] ) : '';
+                    $repo->add( ELEXDPC_Discount_Per_Country_Rule::build( $discount_per_country ) );
                 } else {
+                   $state_code = substr( $country_code, strpos( $country_code, ':' ) + 1 );
+                    $state_code = substr( $country_code, $state_code_pos + 1 );
+                    $countrycode = substr( $country_code, 0, $state_code_pos );
+                    $states = WC()->countries->get_states( $countrycode );
+                    $statename = isset( $states[ $state_code ] ) ? $states[ $state_code ] : $state_code;
+                    $discount_per_country['country_code'] = $countrycode . ':' . $state_code;
+                    $discount_per_country['status'] = isset( $option['status'] ) ? ELEXDPC_Discount_Per_Country_Rule::STATUS_ENABLE : ELEXDPC_Discount_Per_Country_Rule::STATUS_DISABLE;
+                    $discount_per_country['country_name'] = $statename . ', ' . ( isset( $countries[ $countrycode ] ) ? $countries[ $countrycode ] : $countrycode );
+                    $discount_per_country['discount'] = isset( $option['discount'] ) ? sanitize_text_field( $option['discount'] ) : '';
+                    $discount_per_country['discount_type'] = isset( $option['discount_type'] ) ? sanitize_text_field( $option['discount_type'] ) : 'percentage';
+                    $discount_per_country['start_date'] = isset( $option['start_date'] ) ? sanitize_text_field( $option['start_date'] ) : '';
+                    $discount_per_country['end_date'] = isset( $option['end_date'] ) ? sanitize_text_field( $option['end_date'] ) : '';
+                    $discount_per_country['label'] = isset( $option['label'] ) ? sanitize_text_field( $option['label'] ) : '';
+                    $repo->add( ELEXDPC_Discount_Per_Country_Rule::build( $discount_per_country ) );
+                }
+                if ( 0 !== $state_code ) {
+                    $countrycode                          = substr( $country_code, 0, strpos( $country_code, ':' ) );
+                    $states                               = WC()->countries->get_states( $countrycode );
+                    $statename                            = $states[ $state_code ];
+                    $discount_per_country['country_code'] = $countrycode . ':' . $state_code;
+                    $discount_per_country['status']       = isset( $_POST['elex_discount_per_country_options'][ $i ]['status'] ) ? ELEXDPC_Discount_Per_Country_Rule::STATUS_ENABLE : ELEXDPC_Discount_Per_Country_Rule::STATUS_DISABLE;
+                    $discount_per_country['country_name'] = $statename . ',' . $countries[ $countrycode ];
+                    $discount_per_country['discount']     = isset( $_POST['elex_discount_per_country_options'][ $i ]['discount'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['discount'] ) ) : '';
+                    $discount_per_country['start_date']   = isset( $_POST['elex_discount_per_country_options'][ $i ]['start_date'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['start_date'] ) ) : '';
+                    $discount_per_country['end_date']     = isset( $_POST['elex_discount_per_country_options'][ $i ]['end_date'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['end_date'] ) ) : '';
+                    $repo->add( ELEXDPC_Discount_Per_Country_Rule::build( $discount_per_country ) );
+                } else {
+                    $discount_per_country['country_code'] = $country_code;
+                    $discount_per_country['status']       = isset( $_POST['elex_discount_per_country_options'][ $i ]['status'] ) ? ELEXDPC_Discount_Per_Country_Rule::STATUS_ENABLE : ELEXDPC_Discount_Per_Country_Rule::STATUS_DISABLE;
+                    $discount_per_country['country_name'] = $countries[ $country_code ];
+                    $discount_per_country['discount']     = isset( $_POST['elex_discount_per_country_options'][ $i ]['discount'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['discount'] ) ) : '';
+                    $discount_per_country['start_date']   = isset( $_POST['elex_discount_per_country_options'][ $i ]['start_date'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['start_date'] ) ) : '';
+                    $discount_per_country['end_date']     = isset( $_POST['elex_discount_per_country_options'][ $i ]['end_date'] ) ? sanitize_text_field( wp_unslash( $_POST['elex_discount_per_country_options'][ $i ]['end_date'] ) ) : '';
+                    $repo->add( ELEXDPC_Discount_Per_Country_Rule::build( $discount_per_country ) );
+                }
+            }
+            $items_added++;
+        }
+            }
+        }
         $repo->save();
         if ( $current_section ) {
             /**
 …
+        }
         $order_date                  = strtotime( wp_date( 'd-m-Y\TH:i' ) );
         $PWD_Selected_Country_id     = WC()->customer->get_shipping_country();
         $shipping_state              = WC()->customer->get_shipping_state();
+        $order_date = strtotime( wp_date( 'd-m-Y\TH:i' ) );
+        $PWD_Selected_Country_id = WC()->customer->get_shipping_country();
+        $shipping_state = WC()->customer->get_shipping_state();
         $selected_country_with_state = $PWD_Selected_Country_id . ':' . $shipping_state;
         if ( empty( $PWD_Selected_Country_id ) ) {
             return 0;
 …
         $repo = new ELEXDPC_Discount_Per_Country_Model();
         $repo->build();
+        $PWD_subtotal      = $PWD_cart->subtotal;
+        $PWD_label_default = 'Discount per country';
+        $PWD_label            = ! empty( get_option( 'elex-discount-per-country_label' ) ) ? get_option( 'elex-discount-per-country_label' ) : $PWD_label_default;
+        $PWD_subtotal = $PWD_cart->subtotal;
         $discount_per_country = $repo->find( $PWD_Selected_Country_id );
+        $country_with_state   = $repo->find( $selected_country_with_state );
+        if ( $discount_per_country ) {
+            if ( ( $discount_per_country && $discount_per_country->is_enabled() &&
+            $order_date >= strtotime( $discount_per_country->start_date ) &&
+            $order_date <= strtotime( $discount_per_country->end_date ) ) ||
+            ( $discount_per_country && $discount_per_country->is_enabled() &&
+             '' === $discount_per_country->start_date && '' === $discount_per_country->end_date ) ||
+             ( $discount_per_country && $discount_per_country->is_enabled() &&
+              ( '' === $discount_per_country->start_date && $order_date <= strtotime( $discount_per_country->end_date ) ) ||
+             ( '' === $discount_per_country->end_date && $order_date >= strtotime( $discount_per_country->start_date ) ) ) ) {
+                if ( $country_with_state && $country_with_state->is_enabled() ) {
+                    if ( ( $country_with_state && $country_with_state->is_enabled() &&
+                    $order_date >= strtotime( $country_with_state->start_date ) &&
+                    $order_date <= strtotime( $country_with_state->end_date ) ) ||
+                    ( $country_with_state && $country_with_state->is_enabled() &&
+                 '' === $country_with_state->start_date && '' === $country_with_state->end_date ) ||
+                 ( $country_with_state && $country_with_state->is_enabled() &&
+                  ( '' === $country_with_state->start_date && $order_date <= strtotime( $country_with_state->end_date ) ) ||
+                 ( '' === $country_with_state->end_date && $order_date >= strtotime( $country_with_state->start_date ) ) ) ) {
+                        $PWD_discount = ( $country_with_state->discount ) * $PWD_subtotal / 100;
+                        $PWD_cart -> add_fee( $PWD_label, -$PWD_discount );
+                    } else {
+                        $PWD_discount = ( $discount_per_country->discount ) * $PWD_subtotal / 100;
+                        $PWD_cart -> add_fee( $PWD_label, -$PWD_discount );
+                    }
+                } else {
+                    $PWD_discount = ( $discount_per_country->discount ) * $PWD_subtotal / 100;
+                    $PWD_cart->add_fee( $PWD_label, -$PWD_discount );
+                }
+            }
+        }
+        if ( $country_with_state && $country_with_state->is_enabled() ) {
+            if ( ( $country_with_state && $country_with_state->is_enabled() &&
+            $order_date >= strtotime( $country_with_state->start_date ) &&
+            $order_date <= strtotime( $country_with_state->end_date ) ) ||
+            ( $country_with_state && $country_with_state->is_enabled() &&
+             '' === $country_with_state->start_date && '' === $country_with_state->end_date ) ||
+             ( $country_with_state && $country_with_state->is_enabled() &&
+              ( '' === $country_with_state->start_date && $order_date <= strtotime( $country_with_state->end_date ) ) ||
+             ( '' === $country_with_state->end_date && $order_date >= strtotime( $country_with_state->start_date ) ) ) ) {
+                        $PWD_discount = ( $country_with_state->discount ) * $PWD_subtotal / 100;
+                        $PWD_cart -> add_fee( __( $PWD_label, 'elex-discount-per-country' ), -$PWD_discount );
+            }
+        }
+    }
+        $country_with_state = $repo->find( $selected_country_with_state );
+        $rule_to_apply = null;
+        $is_valid_rule = function ( $rule, $order_date ) {
+            if ( ! $rule || ! $rule->is_enabled() ) {
+                return false;
+            }
+            $start = strtotime( $rule->start_date );
+            $end = strtotime( $rule->end_date );
+            if ( ! empty( $rule->start_date ) && ! empty( $rule->end_date ) ) {
+                return ( $order_date >= $start && $order_date <= $end );
+            } elseif ( ! empty( $rule->start_date ) ) {
+                return ( $order_date >= $start );
+            } elseif ( ! empty( $rule->end_date ) ) {
+                return ( $order_date <= $end );
+            }
+            return true;
+        };
+        // Prioritize country+state specific rule over a general country rule
+        if ( $is_valid_rule( $country_with_state, $order_date ) ) {
+            $rule_to_apply = $country_with_state;
+        } elseif ( $is_valid_rule( $discount_per_country, $order_date ) ) {
+            $rule_to_apply = $discount_per_country;
+        }
+        if ( $rule_to_apply ) {
+            // build() already resolved the per-row label → old global label → ''
+            // Just use it directly; fall back to 'Discount per country' if still empty.
+            $label_text = trim( $rule_to_apply->label );
+            if ( '' === $label_text ) {
+                $label_text = __( 'Discount per country', 'elex-discount-per-country' );
+            }
+            $label = $label_text;
+            if ( 'fixed' === $rule_to_apply->discount_type ) {
+                $PWD_discount = floatval( $rule_to_apply->discount );
+            } else {
+                $PWD_discount = ( floatval( $rule_to_apply->discount ) * $PWD_subtotal ) / 100;
+            }
+            // Ensure discount doesn't exceed the subtotal negatively
+            if ( $PWD_subtotal < $PWD_discount ) {
+                $PWD_discount = $PWD_subtotal;
+            }
+            // Yoda conditions preferred by WPCS for literal comparisons.
+            if ( 0 < $PWD_discount ) {
+                $PWD_cart->add_fee( __( $label, 'elex-discount-per-country' ), -$PWD_discount );
+            }
+        }
+    }
     public function add_action_links( $links ) {
 …
         return array_merge( $plugin_links, $links );
+    }
+}

elex-discount-per-country/trunk/includes/form-settings-template-dpc.php

-                      r3460057
+                      r3492012
  */
 require_once  __DIR__ . '/class-discount-per-country.php';
+require_once __DIR__ . '/class-discount-per-country.php';
 $repo = new ELEXDPC_Discount_Per_Country_Model();
 $repo->build();
 …
 global $woocommerce;
 $allowed_countries   = WC()->countries->get_shipping_countries();
+$allowed_countries = WC()->countries->get_shipping_countries();
 $shipping_continents = WC()->countries->get_shipping_continents();
 $zone                = new WC_Shipping_Zone();
 $locations           = array();
 $postcodes           = array();
+$zone = new WC_Shipping_Zone();
+$locations = array();
+$postcodes = array();
 foreach ( $zone->get_zone_locations() as $location ) {
 …
 ?>
 <tr valign="top" >
+<tr valign="top">
     <td class="forminp" colspan="3" style="padding-left:0px">
         <table class="fields_adjustment_dpc widefat" id="elex_discount_per_country_options">
         <input type="hidden" name="nounce_verify" value="<?php echo esc_attr( $nonce ); ?>">
+            <input type="hidden" name="nounce_verify" value="<?php echo esc_attr( $nonce ); ?>">
             <thead>
+                <th class="table_header" >&nbsp;<i class="fas fa-toggle-off"></i></th>
+                <th class="table_header"  ><?php esc_html_e( 'Shipping State/Country', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header" ><?php esc_html_e( 'Discount(%)', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header" ><?php esc_html_e( 'From date', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header" ><?php esc_html_e( 'To date', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header" ><?php esc_html_e( 'Status', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header_remove" ><?php esc_html_e( 'Actions', 'elex-discount-per-country' ); ?></th>
+                <th class="table_header table_col_1_dpc">&nbsp;<i class="fas fa-toggle-off"></i></th>
+                <th class="table_header table_col_2_dpc">
+                    <?php esc_html_e( 'Shipping State/Country', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_type_dpc">
+                    <?php esc_html_e( 'Discount type', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_3_dpc">
+                    <?php esc_html_e( 'Percentage / fixed amount', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_label_dpc">
+                    <?php esc_html_e( 'Discount label', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_5_dpc">
+                    <?php esc_html_e( 'From date', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_6_dpc"><?php esc_html_e( 'To date', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header table_col_4_dpc"><?php esc_html_e( 'Enable', 'elex-discount-per-country' ); ?>
+                </th>
+                <th class="table_header_remove remove_icon_discount_dpc">
+                    <?php esc_html_e( 'Remove', 'elex-discount-per-country' ); ?>
+                </th>
             </thead>
             <tbody id='elex_dpc_table_body'>
 …
                 foreach ( $repo->get_items() as $key => $discount_per_country ) {
                     ?>
+                        <tr id='<?php echo esc_attr( $discount_per_country->country_code ); ?>' class='<?php echo esc_attr( $discount_per_country->country_name ); ?>'>
+                        <td  class='table_col_1_dpc' ></td>
+                        <td  class='table_col_2_dpc'>
+                            <input type='hidden'  name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][country_code]' value='<?php echo esc_attr( $discount_per_country->country_code ); ?>' />
+                            <input type='hidden' class='order' name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][country_name]' value='<?php echo esc_attr( $discount_per_country->country_name ); ?>' />
+                            <span class="bold_span" ><?php echo esc_html( $discount_per_country->country_name ); ?></span>
+                        </td>
+                        <td class='table_col_3_dpc' title='<?php esc_html_e( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' ); ?>' >
+                            <input type='number'  min='0' max='100' step="any" class='order' name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][discount]' value='<?php echo esc_attr( $discount_per_country->discount ); ?>' required>
+                        </td>
+                        <td class='table_col_5_dpc'    title="<?php esc_html_e( 'Start Date from which discount will be applied,Leave blank if you do not restrict based on  date', 'elex-discount-per-country' ); ?>">
+                        <input type='datetime-local'  class='elex_discount_per_country_from_date' name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][start_date]' value='<?php echo esc_attr( $discount_per_country->start_date ); ?>' >
+                        </td>
+                        <td class='table_col_6_dpc'  title="<?php esc_html_e( 'Discount will not be applied after this date,Leave blank if you do not restrict based on date', 'elex-discount-per-country' ); ?>">
+                        <input type='datetime-local'  class='elex_discount_per_country_to_date' name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][end_date]' value='<?php echo esc_attr( $discount_per_country->end_date ); ?>' >
+                        </td>
+                            <td class='table_col_4_dpc' >
+                                <label title='<?php esc_html_e( 'Click here to disable the discount.', 'elex-discount-per-country' ); ?>' class='switch'>
+                                    <input
+                                        type='checkbox'
+                                        class='checkbox_click'
+                                        <?php echo esc_html( $discount_per_country->is_enabled() ? 'checked' : '' ); ?>
+                                        name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][status]'
+                                        value= 'yes' />
+                                    <span class='slider round'></span>
+                                </label>
+                            </td>
+                            <td class='remove_icon_discount_dpc' title='<?php esc_html_e( 'Click here to remove the discount.', 'elex-discount-per-country' ); ?>'></td>
+                        </tr>
+                        <?php
+                    <tr id='<?php echo esc_attr( $discount_per_country->country_code ); ?>'
+                        class='<?php echo esc_attr( $discount_per_country->country_name ); ?>'>
+                        <td class='table_col_1_dpc'></td>
+                        <td class='table_col_2_dpc'>
+                            <input type='hidden'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][country_code]'
+                                value='<?php echo esc_attr( $discount_per_country->country_code ); ?>' />
+                            <input type='hidden' class='order'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][country_name]'
+                                value='<?php echo esc_attr( $discount_per_country->country_name ); ?>' />
+                            <span class="bold_span"><?php echo esc_html( $discount_per_country->country_name ); ?></span>
+                        </td>
+                        <td class='table_col_type_dpc'>
+                            <select
+                                name="elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][discount_type]">
+                                <option value="percentage" <?php selected( $discount_per_country->discount_type, 'percentage' ); ?>><?php esc_html_e( 'Percentage', 'elex-discount-per-country' ); ?>
+                                </option>
+                                <option value="fixed" <?php selected( $discount_per_country->discount_type, 'fixed' ); ?>>
+                                    <?php esc_html_e( 'Fixed Amount', 'elex-discount-per-country' ); ?>
+                                </option>
+                            </select>
+                        </td>
+                        <td class='table_col_3_dpc'
+                            title='<?php esc_html_e( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' ); ?>'>
+                            <input type='number' min='0' max='100' step="any" class='order dpc-discount-input'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][discount]'
+                                value='<?php echo esc_attr( $discount_per_country->discount ); ?>' required>
+                        </td>
+                        <td class='table_col_label_dpc'>
+                            <input type='text'
+                                placeholder="<?php esc_html_e( 'Discount label', 'elex-discount-per-country' ); ?>"
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][label]'
+                                value='<?php echo esc_attr( $discount_per_country->label ); ?>'>
+                        </td>
+                        <td class='table_col_5_dpc'
+                            title="<?php esc_html_e( 'Start Date from which discount will be applied,Leave blank if you do not restrict based on  date', 'elex-discount-per-country' ); ?>">
+                            <input type='datetime-local' class='elex_discount_per_country_from_date'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][start_date]'
+                                value='<?php echo esc_attr( $discount_per_country->start_date ); ?>'>
+                        </td>
+                        <td class='table_col_6_dpc'
+                            title="<?php esc_html_e( 'Discount will not be applied after this date,Leave blank if you do not restrict based on date', 'elex-discount-per-country' ); ?>">
+                            <input type='datetime-local' class='elex_discount_per_country_to_date'
+                                name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][end_date]'
+                                value='<?php echo esc_attr( $discount_per_country->end_date ); ?>'>
+                        </td>
+                        <td class='table_col_4_dpc'>
+                            <label
+                                title='<?php esc_html_e( 'Click here to disable the discount.', 'elex-discount-per-country' ); ?>'
+                                class='switch'>
+                                <input type='checkbox' class='checkbox_click' <?php echo esc_html( $discount_per_country->is_enabled() ? 'checked' : '' ); ?>
+                                    name='elex_discount_per_country_options[<?php echo esc_attr( $key ); ?>][status]'
+                                    value='yes' />
+                                <span class='slider round'></span>
+                            </label>
+                        </td>
+                        <td class='remove_icon_discount_dpc'
+                            title='<?php esc_html_e( 'Click here to remove the discount.', 'elex-discount-per-country' ); ?>'>
+                            <span class="remove-btn-circle"><i class="fas fa-minus"></i></span>
+                        </td>
+                    </tr>
+                    <?php
+                }
                 if ( empty( $repo->get_items() ) ) {
                     ?>
                     <tr id='nodiscount-dpc' class='nodiscount-dpc'>
+                    <td class='table_col_1_dpc'></td>
+                    <td class='table_col_2_dpc'>
+                        <span class='wc-country-name' id='no_discount_available_dpc'><?php esc_html_e( 'No  discounts have been specified. Select a country from the drop-down to set up a discount.', 'elex-discount-per-country' ); ?></span>
+                    </td>
+                    <td class='table_col_3_dpc'></td>
+                    <td class='table_col_5_dpc'></td>
+                    <td class='table_col_6_dpc'></td>
+                    <td class='table_col_4_dpc'></td>
+                        <td colspan="9" style="text-align: center; padding: 24px 0;">
+                            <span
+                                id='no_discount_available_dpc'><?php esc_html_e( 'No  discounts have been specified. Select a country from the drop-down to set up a discount.', 'elex-discount-per-country' ); ?></span>
+                            <div class="no-payments-btn">
+                                <script>document.write(elexdpc_translations['tooltip']['nodiscount-dpc']);</script>
+                            </div>
+                        </td>
                     </tr>
                     <?php
+                }
                 ?>
             </tbody>
+            <br><br>
+            <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+            <tr  class="table_input_raw_dpc">
+                <td></td>
+                <td>
+                <select title='<?php esc_html_e( 'Select zone for which you want to apply discount', 'elex-discount-per-country' ); ?>'  multiple="multiple" data-attribute="zone_locations" id="zone_locations" name="zone_locations" data-placeholder="<?php esc_attr_e( 'Select region', 'elex-discount-per-country' ); ?>" class="wc-shipping-zone-region-select chosen_select">
+                        <?php
+                        foreach ( $shipping_continents as $continent_code => $continent ) {
+                            $countries = array_intersect( array_keys( $allowed_countries ), $continent['countries'] );
+                            foreach ( $countries as $country_code ) {
+                            $flag = 1;
+                            $discount_per_country = $repo->find( $country_code );
+            <tfoot>
+                <tr>
+                    <td colspan="9" style="text-align: center; padding: 16px 0;">
+                        <button type="button" id="elex_dpc_add_field_discount" class="elex-add-new-btn">
+                            <span class="icon-circle">+</span>
+                            <span
+                                class="btn-text"><?php esc_html_e( 'Add New Discount', 'elex-discount-per-country' ); ?></span>
+                        </button>
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
+        <div id="elex_dpc_add_new_discount_template" style="display: none;">
+            <select
+                title='<?php esc_html_e( 'Select zone for which you want to apply discount', 'elex-discount-per-country' ); ?>'
+                multiple="multiple" data-attribute="zone_locations" id="zone_locations_template"
+                name="zone_locations_template"
+                data-placeholder="<?php esc_attr_e( 'Select region', 'elex-discount-per-country' ); ?>"
+                class="wc-shipping-zone-region-select" style="width: 100%;">
+                <?php
+                foreach ( $shipping_continents as $continent_code => $continent ) {
+                    $countries = array_intersect( array_keys( $allowed_countries ), $continent['countries'] );
+                    foreach ( $countries as $country_code ) {
+                        $flag = 1;
+                        $discount_per_country = $repo->find( $country_code );
+                        if ( $discount_per_country ) {
+                            $flag = 0;
+                        }
+                        if ( 1 === $flag ) {
+                            echo '<option  value="' . esc_attr( $country_code ) . '"' . wc_selected( "country:$country_code", $locations ) . '>' . esc_html( '&nbsp;&nbsp; ' . $allowed_countries[ $country_code ] ) . '</option>';
+                        }
+                        $states = WC()->countries->get_states( $country_code );
+                        if ( $states ) {
+                            foreach ( $states as $state_code => $state_name ) {
+                                $country_with_state = $country_code . ':' . $state_code;
+                                $discount_per_country = $repo->find( $country_with_state );
+                                $flag = 1;
                                 if ( $discount_per_country ) {
                                     $flag = 0;
+                                }
                                 if ( 1 === $flag ) {
+                                    echo '<option  value="' . esc_attr( $country_code ) . '"' . wc_selected( "country:$country_code", $locations ) . '>' . esc_html( '&nbsp;&nbsp; ' . $allowed_countries[ $country_code ] ) . '</option>';
+                                    echo '<option value="' . esc_attr( $country_code . ':' . $state_code ) . '"' . wc_selected( "state:$country_code:$state_code", $locations ) . '>' . esc_html( '&nbsp;&nbsp;&nbsp;&nbsp; ' . $state_name . ', ' . $allowed_countries[ $country_code ] ) . '</option>';
+                                }
-                                    $states = WC()->countries->get_states( $country_code );
-                                if ( $states ) {
-                                    foreach ( $states as $state_code => $state_name ) {
-                                        $country_with_state   = $country_code . ':' . $state_code;
-                                        $discount_per_country = $repo->find( $country_with_state );
-                                        $flag                 = 1;
-                                        if ( $discount_per_country ) {
-                                            $flag = 0;
+                                        }
-                                        if ( 1 === $flag ) {
-                                            echo '<option value="' . esc_attr( $country_code . ':' . $state_code ) . '"' . wc_selected( "state:$country_code:$state_code", $locations ) . '>' . esc_html( '&nbsp;&nbsp;&nbsp;&nbsp; ' . $state_name . ', ' . $allowed_countries[ $country_code ] ) . '</option>';
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        ?>
+                    </select>
+                </td>
+                <td>
+                    <input type='number' class='eraq_input_label' title="<?php esc_html_e( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' ); ?>" id="elex_discount_per_country_options_input_value"  value="0" min="0" max="100" step="any" >
+                </td>
+                <td>
+                <input type='datetime-local' value="" class='elex_discount_per_country_from_date' title="<?php esc_html_e( 'Start Date from which discount will be applied,Leave blank if you do not restrict based on  date', 'elex-discount-per-country' ); ?>" id="elex_discount_per_country_start_date"  min="<?php echo esc_attr( wp_date( 'Y-m-d\TH:i' ) ); ?>" >
+                </td>
+                <td>
+                <input type='datetime-local' value="" class='elex_discount_per_country_to_date' title="<?php esc_html_e( 'Discount will not be applied after this date,Leave blank if you do not restrict based on date', 'elex-discount-per-country' ); ?>" id="elex_discount_per_country_end_date"  min="<?php echo esc_attr( wp_date( 'Y-m-d\TH:i' ) ); ?>"   >
+                </td>
+                <td>
+                    <label class="switch" title='<?php esc_html_e( 'Click to enable or disable the discount', 'elex-discount-per-country' ); ?>'>
+                      <input id="elex_discount_per_country_options_enabled" type="checkbox" checked>
+                      <span class="slider round"></span>
+                    </label>
+                </td>
+                <td>
+                    <button name="submit" type="button" class="elex-dpc-btn-primary button-primary" title="<?php esc_html_e( 'Click here to add more discount.', 'elex-discount-per-country' ); ?>"  id="elex_dpc_add_field_discount"  >
+                        <?php esc_html_e( 'Add', 'elex-discount-per-country' ); ?>
+                    </button>
+                </td>
+            </tr>
+        </table>
+                    }
+                }
+                ?>
+            </select>
+            <select id="elex_discount_per_country_discount_type_template" class="dpc-discount-type-select"
+                name="elex_discount_per_country_discount_type_template">
+                <option value="percentage">
+                    <?php esc_html_e( 'Percentage', 'elex-discount-per-country' ); ?>
+                </option>
+                <option value="fixed">
+                    <?php esc_html_e( 'Fixed Amount', 'elex-discount-per-country' ); ?>
+                </option>
+            </select>
+            <input type="number" step="any" min="0" id="elex_discount_per_country_options_input_value_template"
+                class="dpc-discount-input" name="elex_discount_per_country_options_input_value_template" value="0">
+            <input type="text" id="elex_discount_per_country_label_template"
+                placeholder="<?php esc_html_e( 'Discount label', 'elex-discount-per-country' ); ?>"
+                name="elex_discount_per_country_label_template" value="">
+            <input type='datetime-local' value="" class='elex_discount_per_country_from_date'
+                title="<?php esc_html_e( 'Start Date from which discount will be applied,Leave blank if you do not restrict based on  date', 'elex-discount-per-country' ); ?>"
+                id="elex_discount_per_country_start_date_template"
+                min="<?php echo esc_attr( wp_date( 'Y-m-d\TH:i' ) ); ?>">
+            <input type='datetime-local' value="" class='elex_discount_per_country_to_date'
+                title="<?php esc_html_e( 'Discount will not be applied after this date,Leave blank if you do not restrict based on date', 'elex-discount-per-country' ); ?>"
+                id="elex_discount_per_country_end_date_template"
+                min="<?php echo esc_attr( wp_date( 'Y-m-d\TH:i' ) ); ?>">
+            <label class="switch"
+                title='<?php esc_html_e( 'Click to enable or disable the discount', 'elex-discount-per-country' ); ?>'>
+                <input id="elex_discount_per_country_options_enabled_template" type="checkbox" checked>
+                <span class="slider round"></span>
+            </label>
+        </div>
+        <script>
+            jQuery(document).ready(function ($) {
+                // Prevent 'e', '-', '+', 'E' in any discount input
+                $(document).on('keydown', '.dpc-discount-input', function (e) {
+                    if (['e', 'E', '-', '+'].includes(e.key)) {
+                        e.preventDefault();
+                    }
+                });
+                // Conditional validation for all discount rows
+                $(document).on('change', '.dpc-discount-type-select', function () {
+                    var type = $(this).val();
+                    var $row = $(this).closest('tr');
+                    var $input = $row.find('.dpc-discount-input');
+                    if (type === 'percentage') {
+                        $input.attr('max', '100');
+                        $input.attr('title', '<?php esc_html_e( 'Enter the discount percentage value from 0 to 100.', 'elex-discount-per-country' ); ?>');
+                    } else {
+                        $input.removeAttr('max');
+                        $input.attr('title', '<?php esc_html_e( 'Enter the discount fixed amount (0 or more).', 'elex-discount-per-country' ); ?>');
+                    }
+                });
+                // Trigger change on all select on load to ensure tooltips/max are correct
+                $('.dpc-discount-type-select').trigger('change');
+                // Change 'Save changes' text to 'Save Changes'
+                $("button[name='save']").text('<?php esc_html_e( 'Save Changes', 'elex-discount-per-country' ); ?>');
+            });
+        </script>
     </td>
 </tr>

elex-discount-per-country/trunk/readme.txt

-                      r3460057
+                      r3492012
 Tags: discount based on shipping country, woocommerce
 Requires at least: 3.0.1
 Stable tag: 1.2.0
+Stable tag: 1.2.1
 Tested up to: 6.9
 License: GPLv2 or later
 …
 == Changelog ==
+= 1.2.1 =
+* Enhanced validation and security
+* Improved discount calculations
+* Added support for fixed discounts
+* Added custom discount labels for each payment method
 = 1.2.0 =
 * Minor issue fixes
 …
 == Upgrade Notice ==
+= 1.2.1 =
+* Enhanced validation and security
+* Improved discount calculations
+* Added support for fixed discounts
+* Added custom discount labels for each payment method
 = 1.2.0 =
 * Minor issue fixes

Plugin Directory

Context Navigation

Legend:

elex-discount-per-country/tags/1.2.1/assets/css/dpc-plugin-styles.css

elex-discount-per-country/tags/1.2.1/assets/js/dpc-plugin-scripts.js

elex-discount-per-country/tags/1.2.1/elex-discount-per-country.php

elex-discount-per-country/tags/1.2.1/includes/class-discount-per-country.php

elex-discount-per-country/tags/1.2.1/includes/elex-discount-per-country-admin-settings.php

elex-discount-per-country/tags/1.2.1/includes/form-settings-template-dpc.php

elex-discount-per-country/tags/1.2.1/readme.txt

elex-discount-per-country/trunk/assets/css/dpc-plugin-styles.css

elex-discount-per-country/trunk/assets/js/dpc-plugin-scripts.js

elex-discount-per-country/trunk/elex-discount-per-country.php

elex-discount-per-country/trunk/includes/class-discount-per-country.php

elex-discount-per-country/trunk/includes/elex-discount-per-country-admin-settings.php

elex-discount-per-country/trunk/includes/form-settings-template-dpc.php

elex-discount-per-country/trunk/readme.txt

Download in other formats: