WordPress.org
Get WordPress

Plugin Directory

Changeset 3736443


Ignore:
Timestamp:
10/09/2026 10:52:21 AM (2 weeks ago)
Author:
rajeshsingh520
Message:

ui change

Location:
conditional-extra-fees-for-woocommerce
Files:
175 added
11 edited

Legend:

Unmodified
Added
Removed

  • conditional-extra-fees-for-woocommerce/trunk/README.txt

    r3734325 r3736443  
    55Requires at least: 5.3
    66Tested up to: 7.1
    7 Stable tag: 1.1.69
     7Stable tag: 1.1.70
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    344344== Changelog ==
    345345
     346= 1.1.70 =
     347* re-arrangement of the fields
     348
    346349= 1.1.69 =
    347350* Review v2

  • conditional-extra-fees-for-woocommerce/trunk/admin/additional-charges/template/weight-based-charges.php

    r3647143 r3736443  
    11<?php
    22if ( ! defined( 'ABSPATH' ) ) { exit; }
     3
     4$weight_unit = get_option( 'woocommerce_weight_unit', 'kg' );
    35?>
    46<script>
    … …  
    3840        <tr>
    3941            <th><?php esc_html_e('Category', 'conditional-extra-fees-woocommerce'); ?></th>
    40             <th class="pi-min-col"><?php esc_html_e('Min Weight', 'conditional-extra-fees-woocommerce'); ?></th>
    41             <th class="pi-min-col"><?php esc_html_e('Max Weight', 'conditional-extra-fees-woocommerce'); ?></th>
     42            <th class="pi-min-col"><?php esc_html_e('Min Weight', 'conditional-extra-fees-woocommerce'); echo ' ('.$weight_unit.')'; ?></th>
     43            <th class="pi-min-col"><?php esc_html_e('Max Weight', 'conditional-extra-fees-woocommerce'); echo ' ('.$weight_unit.')'; ?></th>
    4244            <th class="pi-fee-col"><?php esc_html_e('Fees', 'conditional-extra-fees-woocommerce'); ?> <?php pisol_cefw_help::inline('weight_short_code_help', 'Using short code'); ?></th>
    4345            <th></th>

  • conditional-extra-fees-for-woocommerce/trunk/admin/css/admin.css

    r3734403 r3736443  
    12071207}
    12081208
    1209 .pi-step-content:has(.pi-step-header.bg-dark) {
     1209.pi-step-content:has(> .pi-step-header.bg-dark) {
    12101210  border: 2px solid var(--dark);
    12111211}
    … …  
    12191219}
    12201220
    1221 .pi-step-content[open] .pi-step-header, .pi-step-container:not(.pi-closed) .pi-step-header {
     1221.pi-step-content[open] + .pi-step-header {
    12221222  border-bottom: 1px solid #fff;
    12231223}

  • conditional-extra-fees-for-woocommerce/trunk/admin/css/scss/steps-form.scss

    r3690630 r3736443  
    5050}
    5151
    52 .pi-step-content:has(.pi-step-header.bg-dark) {
     52.pi-step-content:has( > .pi-step-header.bg-dark) {
    5353    border:2px solid var(--dark);
    5454}
    … …  
    6363}
    6464
    65 .pi-step-content[open] .pi-step-header, .pi-step-container:not(.pi-closed) .pi-step-header{
     65.pi-step-content[open] + .pi-step-header{
    6666    border-bottom:1px solid #fff;
    6767}

  • conditional-extra-fees-for-woocommerce/trunk/admin/partials/addfeesRule.php

    r3690630 r3736443  
    6060                <div class="col-12 col-sm-5">
    6161                    <label for="pi_is_taxable" class="h6"><?php echo esc_html__('Fee type','conditional-extra-fees-woocommerce'); ?></label>
    62                     <br><i>Choose how the fee is calculated — Fixed amount or Percentage of cart total.</i>
     62                    <br><i>Choose how the fee is calculated — Fixed amount or Percentage of cart syb-total.</i>
    6363                </div>
    6464                <div class="col-12 col-sm">
    … …  
    8080            </div>
    8181
     82            <!-- Is optional fees -->
     83            <div class="row py-3 border-bottom align-items-center">
     84                <div class="col-12 col-sm-5">
     85                    <label for="pi_is_optional_fees" class="h6"><?php echo esc_html__('Is this fee optional','conditional-extra-fees-woocommerce'); ?> <span class="text-primary">*</span></label><br>
     86                    <i><?php echo esc_html__('Customer will be having the option to select this fee or not','conditional-extra-fees-woocommerce'); ?></i>
     87                    <?php pisol_cefw_help::image(CONDITIONAL_FEES_RULE_WOOCOMMERCE_PLUGIN_FOLDER_URL."admin/img/optional-fee.png"); ?>
     88                </div>
     89                <div class="col-12 col-sm">
     90                    <select class="form-control" name="pi_is_optional_fees" id="pi_is_optional_fees">
     91                        <option value="no" <?php selected( $data['pi_is_optional_fees'], "no" ); ?>><?php esc_html_e('No','conditional-extra-fees-woocommerce'); ?></option>
     92                        <option value="yes" <?php selected( $data['pi_is_optional_fees'], "yes" ); ?>><?php esc_html_e('Yes','conditional-extra-fees-woocommerce'); ?></option>
     93                    </select>
     94                </div>
     95            </div>
     96
    8297            <!-- IS Taxable -->
    8398            <div class="row py-3 border-bottom align-items-center">
    … …  
    86101                    <br><i>Should this fee be considered taxable?</i>
    87102                </div>
    88                 <div class="col-12 col-sm">
     103                <div class="col-12 col-sm-2">
    89104                    <select class="form-control" name="pi_fees_taxable" id="pi_fees_taxable">
    90105                        <option value="no" <?php selected( $data['pi_fees_taxable'], "no" ); ?>><?php echo esc_html__('No','conditional-extra-fees-woocommerce'); ?></option>
    … …  
    92107                    </select>
    93108                </div>
    94             </div>
    95 
    96             <!-- Tax Class -->
    97             <div class="row py-3 border-bottom align-items-center" id="row_pi_fees_tax_class">
    98                 <div class="col-12 col-sm-5">
    99                     <label for="pi_fees_tax_class" class="h6"><?php echo esc_html__('Select tax class','conditional-extra-fees-woocommerce'); ?> <span class="text-primary">*</span></label>
    100                     <br><i><?php echo esc_html__('Select the tax class for this fee. If you are not sure, leave it as Standard.','conditional-extra-fees-woocommerce'); ?></i>
    101                 </div>
    102                 <div class="col-12 col-sm">
    103                     <select class="form-control" name="pi_fees_tax_class" id="pi_fees_tax_class">
    104                    
     109                <div class="col-12 col-sm-3" id="row_pi_fees_tax_class">
     110                    <select class="form-control" name="pi_fees_tax_class" id="pi_fees_tax_class" title="Tax class decide the tax rate applied on this fee amount">
    105111                    <?php
    106                     echo '<option value="standard" '.selected( $data['pi_fees_tax_class'], 'standard', true ).' >Standard</option>';
     112                    echo '<option value="standard" '.selected( $data['pi_fees_tax_class'], 'standard', true ).' >Tax class: Standard</option>';
    107113                    if(!empty($data['tax_classes']) && is_array($data['tax_classes'])){
    108114                        foreach($data['tax_classes'] as $tax_class){
    109                             echo '<option value="'.esc_attr($tax_class->slug).'" '.selected( $data['pi_fees_tax_class'], $tax_class->slug, true ).' >'.esc_html($tax_class->name).'</option>';
     115                            echo '<option value="'.esc_attr($tax_class->slug).'" '.selected( $data['pi_fees_tax_class'], $tax_class->slug, true ).' >Tax class: '.esc_html($tax_class->name).'</option>';
    110116                        }
    111117                    }
    … …  
    115121            </div>
    116122
    117 
    118             <!-- Roundoff -->
    119             <div class="row py-3 border-bottom align-items-center">
    120                 <div class="col-12 col-sm-5">
    121                     <label for="pi_cost" class="h6"><?php echo esc_html__('Round off to integer','conditional-extra-fees-woocommerce'); ?></label><?php pisol_cefw_help::tooltip('If the fee amount is a floating number then you can round off final fee amount to integer'); ?>
    122                     <br><i><?php echo esc_html__('Round the calculated fee to the nearest whole number.','conditional-extra-fees-woocommerce'); ?></i>
    123                 </div>
    124                 <div class="col-12 col-sm">
    125                     <select name="round_off" class="form-control">
    126                         <option value=""><?php echo esc_html__('No','conditional-extra-fees-woocommerce'); ?></option>
    127                         <option value="yes" <?php selected( $data['round_off'], "yes" ); ?> title="E.g: 2.7 = 3, 2.1 = 2, 2.5 = 3"><?php echo esc_html__('Nearest integer','conditional-extra-fees-woocommerce'); ?></option>   
    128                         <option value="ceil" <?php selected( $data['round_off'], "ceil" ); ?> title="E.g: 2.7 = 3, 2.1 = 3" disabled="disabled"><?php echo esc_html__('Nearest higher integer (PRO)','conditional-extra-fees-woocommerce'); ?></option>
    129                         <option value="floor" <?php selected( $data['round_off'], "floor" ); ?> title="E.g: 2.7 = 2, 2.1 = 2" disabled="disabled"><?php echo esc_html__('Nearest lower integer (PRO)','conditional-extra-fees-woocommerce'); ?></option>
    130                     </select>
    131                 </div>
    132             </div>
    133 
    134             <!-- Is optional fees -->
    135             <div class="row py-3 border-bottom align-items-center">
    136                 <div class="col-12 col-sm-5">
    137                     <label for="pi_is_optional_fees" class="h6"><?php echo esc_html__('Is this fee optional','conditional-extra-fees-woocommerce'); ?> <span class="text-primary">*</span></label><br>
    138                     <i><?php echo esc_html__('Customer will be having the option to select this fee or not','conditional-extra-fees-woocommerce'); ?></i>
    139                 </div>
    140                 <div class="col-12 col-sm">
    141                     <select class="form-control" name="pi_is_optional_fees" id="pi_is_optional_fees">
    142                         <option value="no" <?php selected( $data['pi_is_optional_fees'], "no" ); ?>><?php esc_html_e('No','conditional-extra-fees-woocommerce'); ?></option>
    143                         <option value="yes" <?php selected( $data['pi_is_optional_fees'], "yes" ); ?>><?php esc_html_e('Yes','conditional-extra-fees-woocommerce'); ?></option>
    144                     </select>
    145                 </div>
    146             </div>
    147 
    148             <!-- Optional Fees Title -->
    149             <div class="row py-3 border-bottom align-items-center free-version" id="row_pi_optional_title">
    150                 <div class="col-12 col-sm-5">
    151                     <label for="pi_checkbox_title" class="h6"><?php echo esc_html__('Text shown next to the optional fee checkbox','conditional-extra-fees-woocommerce'); ?></label>
    152                     <br><i><?php echo esc_html__('If left blank then Fee title will be used in the checkbox','conditional-extra-fees-woocommerce'); ?></i>
    153                 </div>
    154                 <div class="col-12 col-sm-7">
    155                     <input type="text" value="" class="form-control" name="pi_checkbox_title" id="pi_checkbox_title">
    156                 </div>
    157             </div>
    158 
    159             <!-- Auto selected fees -->
    160             <div class="row py-3 border-bottom align-items-center free-version" id="row_pi_selected_by_default">
    161                 <div class="col-12 col-sm-5">
    162                     <label for="pi_selected_by_default" class="h6"><?php echo esc_html__('Auto selected the fees by default','conditional-extra-fees-woocommerce'); ?></label>
    163                     <br><i><?php echo esc_html__('When the fee is optional, The fee checkbox will be auto selected on the checkout page initially, if customer don\'t want to pay for that fee they can unselect that checkbox and remove that fee','conditional-extra-fees-woocommerce'); ?></i>
    164                 </div>
    165                 <div class="col-12 col-sm">
    166                     <select class="form-control" name="pi_selected_by_default" id="pi_selected_by_default">
    167                         <option value="no"><?php esc_html_e('No','conditional-extra-fees-woocommerce'); ?></option>
    168                         <option value="yes"><?php esc_html_e('Yes','conditional-extra-fees-woocommerce'); ?></option>
    169                     </select>
    170                 </div>
    171             </div>
    172 
    173             <!-- Tool tip -->
    174             <div class="row py-3 border-bottom align-items-center free-version" id="row_pi_tooltip">
    175                 <div class="col-12 col-sm-5">
    176                     <label for="pi_tooltip" class="h6"><?php echo esc_html__('Tool tip shown next to the fee amount','conditional-extra-fees-woocommerce'); ?> </label>
    177                     <br><i><?php echo esc_html__('Plain text (no HTML) tooltip shown beside the fee on the frontend.','conditional-extra-fees-woocommerce'); ?></i>
    178                 </div>
    179                 <div class="col-12 col-sm-7">
    180                     <input type="text" value="" class="form-control" name="pi_tooltip" id="pi_tooltip">
    181                 </div>
    182             </div>
    183 
    184             <!-- currency -->
    185             <div class="row py-4 border-bottom align-items-center">
    186                 <div class="col-12 col-sm-5">
    187                     <label for="pi_currency" class="h6"><?php echo esc_html__('Apply for currency (useful for multi currency website only)','conditional-extra-fees-woocommerce'); ?></label><br><i><?php echo esc_html__('Restrict this fee to a specific currency. Leave empty to apply to all currencies.','conditional-extra-fees-woocommerce'); ?></i>
    188                 </div>
    189                 <div class="col-12 col-sm">
    190                     <select name="pi_currency[]" id="pi_currency" multiple="multiple">
    191                             <?php self::get_currency($data['pi_currency']); ?>
    192                     </select>
    193                 </div>
    194             </div>
    195 
    196             <!-- Start time -->
    197             <div class="row py-3 border-bottom align-items-center">
    198                 <div class="col-12 col-sm-5">
    199                     <label for="pi_cost" class="h6"><?php echo esc_html__('Fee Validity Period','conditional-extra-fees-woocommerce'); ?> <span class="text-primary"></span></label>
    200                     <br><i><?php echo esc_html__('Set a start and end date for this fee. If left empty, the fee will be valid indefinitely.','conditional-extra-fees-woocommerce'); ?></i>
    201                 </div>
    202                 <div class="col-12 col-sm-3">
    203                     <input type="date" value="<?php echo esc_attr($data['pi_fees_start_time']); ?>" class="form-control" name="pi_fees_start_time" id="pi_fees_start_time" autocomplete="off">
    204                     <i class="d-block mt-2">Start date</i>
    205                 </div>
    206                 <div class="col-12 col-sm-3">
    207                     <input type="date" value="<?php echo esc_attr($data['pi_fees_end_time']); ?>" class="form-control" name="pi_fees_end_time" id="pi_fees_end_time" autocomplete="off">
    208                     <i class="d-block mt-2">End date</i>
    209                 </div>
    210             </div>
     123            <div class="pi-step-container">
     124                <details class="pi-step-content">
     125                    <summary class="pi-step-header bg-dark text-light">
     126                        <div>
     127                        <strong class="pi-step-title"><?php echo esc_html__('Other basic settigns','conditional-extra-fees-woocommerce'); ?><small>(Non Required)</small></strong>
     128                        <p>Roundoff, Currency, Minimum fee, Maximum fee & Valid period</p>
     129                        </div>
     130                        <div>
     131                            <span class="dashicons dashicons-plus-alt2 mr-4"></span>
     132                            <span class="dashicons dashicons-minus mr-4"></span>
     133                        </div>
     134                    </summary>
     135                    <div class="pi-step-description">
     136                        <!-- Roundoff -->
     137                        <div class="row py-3 border-bottom align-items-center">
     138                            <div class="col-12 col-sm-5">
     139                                <label for="pi_cost" class="h6"><?php echo esc_html__('Round off to integer','conditional-extra-fees-woocommerce'); ?></label><?php pisol_cefw_help::tooltip('If the fee amount is a floating number then you can round off final fee amount to integer'); ?>
     140                                <br><i><?php echo esc_html__('Round the calculated fee to the nearest whole number.','conditional-extra-fees-woocommerce'); ?></i>
     141                            </div>
     142                            <div class="col-12 col-sm">
     143                                <select name="round_off" class="form-control">
     144                                    <option value=""><?php echo esc_html__('No','conditional-extra-fees-woocommerce'); ?></option>
     145                                    <option value="yes" <?php selected( $data['round_off'], "yes" ); ?> title="E.g: 2.7 = 3, 2.1 = 2, 2.5 = 3"><?php echo esc_html__('Nearest integer','conditional-extra-fees-woocommerce'); ?></option>   
     146                                    <option value="ceil" <?php selected( $data['round_off'], "ceil" ); ?> title="E.g: 2.7 = 3, 2.1 = 3" disabled="disabled"><?php echo esc_html__('Nearest higher integer (PRO)','conditional-extra-fees-woocommerce'); ?></option>
     147                                    <option value="floor" <?php selected( $data['round_off'], "floor" ); ?> title="E.g: 2.7 = 2, 2.1 = 2" disabled="disabled"><?php echo esc_html__('Nearest lower integer (PRO)','conditional-extra-fees-woocommerce'); ?></option>
     148                                </select>
     149                            </div>
     150                        </div>
     151
     152                        <!-- currency -->
     153                        <div class="row py-4 border-bottom align-items-center">
     154                            <div class="col-12 col-sm-5">
     155                                <label for="pi_currency" class="h6"><?php echo esc_html__('Apply for currency (useful for multi currency website only)','conditional-extra-fees-woocommerce'); ?></label><br><i><?php echo esc_html__('Restrict this fee to a specific currency. Leave empty to apply to all currencies.','conditional-extra-fees-woocommerce'); ?></i>
     156                            </div>
     157                            <div class="col-12 col-sm">
     158                                <select name="pi_currency[]" id="pi_currency" multiple="multiple">
     159                                        <?php self::get_currency($data['pi_currency']); ?>
     160                                </select>
     161                            </div>
     162                        </div>
     163
     164                        <!-- Start time -->
     165                        <div class="row py-3 border-bottom align-items-center">
     166                            <div class="col-12 col-sm-5">
     167                                <label for="pi_cost" class="h6"><?php echo esc_html__('Fee Validity Period','conditional-extra-fees-woocommerce'); ?> <span class="text-primary"></span></label>
     168                                <br><i><?php echo esc_html__('Set a start and end date for this fee. If left empty, the fee will be valid indefinitely.','conditional-extra-fees-woocommerce'); ?></i>
     169                            </div>
     170                            <div class="col-12 col-sm-3">
     171                                <input type="date" value="<?php echo esc_attr($data['pi_fees_start_time']); ?>" class="form-control" name="pi_fees_start_time" id="pi_fees_start_time" autocomplete="off">
     172                                <i class="d-block mt-2">Start date</i>
     173                            </div>
     174                            <div class="col-12 col-sm-3">
     175                                <input type="date" value="<?php echo esc_attr($data['pi_fees_end_time']); ?>" class="form-control" name="pi_fees_end_time" id="pi_fees_end_time" autocomplete="off">
     176                                <i class="d-block mt-2">End date</i>
     177                            </div>
     178                        </div>
     179
     180                        <div class="row py-4 border-bottom align-items-center free-version">
     181                            <div class="col-12 col-sm-5">
     182                                <label for="pi_min_cost" class="h6">Min fees ($) </label><br><i>Fees can't be less then it's min fees. Leave it blank if you don't want to restrict it.</i>
     183                            </div>
     184                            <div class="col-12 col-sm">
     185                                <input type="number" min="0" step="0.0001" value="" class="form-control" name="pi_min_cost" id="pi_min_cost">
     186                            </div>
     187                        </div>
     188
     189                        <div class="row py-4 border-bottom align-items-center free-version">
     190                            <div class="col-12 col-sm-5">
     191                                <label for="pi_max_cost" class="h6">Max fees ($) </label><br><i>Fees can't be more then it's max fees. Leave it blank if you don't want to restrict it. This is useful as fees can be dynamic and if you want to restrict it to certain amount you can do that using this</i>
     192                            </div>
     193                            <div class="col-12 col-sm">
     194                                <input type="number" min="0" step="0.0001" value="" class="form-control" name="pi_max_cost" id="pi_max_cost">
     195                            </div>
     196                        </div>
     197
     198                        <!-- Optional Fees Title -->
     199                        <div class="row py-3 border-bottom align-items-center free-version" id="row_pi_optional_title">
     200                            <div class="col-12 col-sm-5">
     201                                <label for="pi_checkbox_title" class="h6"><?php echo esc_html__('Text shown next to the optional fee checkbox','conditional-extra-fees-woocommerce'); ?></label>
     202                                <br><i><?php echo esc_html__('If left blank then Fee title will be used in the checkbox','conditional-extra-fees-woocommerce'); ?></i>
     203                            </div>
     204                            <div class="col-12 col-sm-7">
     205                                <input type="text" value="" class="form-control" name="pi_checkbox_title" id="pi_checkbox_title">
     206                            </div>
     207                        </div>
     208
     209                        <!-- Auto selected fees -->
     210                        <div class="row py-3 border-bottom align-items-center free-version" id="row_pi_selected_by_default">
     211                            <div class="col-12 col-sm-5">
     212                                <label for="pi_selected_by_default" class="h6"><?php echo esc_html__('Auto selected the fees by default','conditional-extra-fees-woocommerce'); ?></label>
     213                                <br><i><?php echo esc_html__('When the fee is optional, The fee checkbox will be auto selected on the checkout page initially, if customer don\'t want to pay for that fee they can unselect that checkbox and remove that fee','conditional-extra-fees-woocommerce'); ?></i>
     214                            </div>
     215                            <div class="col-12 col-sm">
     216                                <select class="form-control" name="pi_selected_by_default" id="pi_selected_by_default">
     217                                    <option value="no"><?php esc_html_e('No','conditional-extra-fees-woocommerce'); ?></option>
     218                                    <option value="yes"><?php esc_html_e('Yes','conditional-extra-fees-woocommerce'); ?></option>
     219                                </select>
     220                            </div>
     221                        </div>
     222
     223                        <!-- Tool tip -->
     224                        <div class="row py-3 border-bottom align-items-center free-version" id="row_pi_tooltip">
     225                            <div class="col-12 col-sm-5">
     226                                <label for="pi_tooltip" class="h6"><?php echo esc_html__('Tool tip shown next to the fee amount','conditional-extra-fees-woocommerce'); ?> </label>
     227                                <br><i><?php echo esc_html__('Plain text (no HTML) tooltip shown beside the fee on the frontend.','conditional-extra-fees-woocommerce'); ?></i>
     228                            </div>
     229                            <div class="col-12 col-sm-7">
     230                                <input type="text" value="" class="form-control" name="pi_tooltip" id="pi_tooltip">
     231                            </div>
     232                        </div>
     233                    </div>
     234            </div>
     235
     236
     237           
     238
     239           
     240
     241           
    211242            <!-- Basic end -->
    212243        </div>

  • conditional-extra-fees-for-woocommerce/trunk/admin/selection_rules/rules/height.php

    r3438256 r3736443  
    7474        //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
    7575        echo Pi_cefw_selection_rule_main::createNumberField($count, $this->condition, null);
     76        echo $this->unit();
    7677        die;
    7778    }
    … …  
    7980    function savedDropdown($html, $values, $count){
    8081        $html = Pi_cefw_selection_rule_main::createNumberField($count, $this->condition,  $values);
     82        $html .= $this->unit();
    8183        return $html;
     84    }
     85
     86    function unit(){
     87        $unit = get_option( 'woocommerce_dimension_unit', 'cm'  );
     88        return '<span>(Dimention unit: '.esc_html($unit).')</span>';
    8289    }
    8390
    … …  
    101108       
    102109                    $or_result = false;
    103                     $cart_max_height = $this->maxProductHeight();
     110                    $cart_max_height = (float) $this->maxProductHeight();
    104111                   
    105112                    $rule_height = (float)$values[0];

  • conditional-extra-fees-for-woocommerce/trunk/admin/selection_rules/rules/length.php

    r3438256 r3736443  
    7474        //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
    7575        echo Pi_cefw_selection_rule_main::createNumberField($count, $this->condition, null);
     76        echo $this->unit();
    7677        die;
    7778    }
    … …  
    7980    function savedDropdown($html, $values, $count){
    8081        $html = Pi_cefw_selection_rule_main::createNumberField($count, $this->condition,  $values);
     82        $html .= $this->unit();
    8183        return $html;
     84    }
     85
     86    function unit(){
     87        $unit = get_option( 'woocommerce_dimension_unit', 'cm'  );
     88        return '<span>(Dimention unit: '.esc_html($unit).')</span>';
    8289    }
    8390

  • conditional-extra-fees-for-woocommerce/trunk/admin/selection_rules/rules/weight.php

    r3438256 r3736443  
    7474        //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
    7575        echo Pi_cefw_selection_rule_main::createNumberField($count, $this->condition, null);
     76        echo $this->unit();
    7677        die;
    7778    }
    … …  
    7980    function savedDropdown($html, $values, $count){
    8081        $html = Pi_cefw_selection_rule_main::createNumberField($count, $this->condition,  $values);
     82        $html .= $this->unit();
    8183        return $html;
     84    }
     85
     86    function unit(){
     87        $unit = get_option( 'woocommerce_weight_unit', 'kg' );
     88        return '<span>(Weight unit: '.esc_html($unit).')</span>';
    8289    }
    8390

  • conditional-extra-fees-for-woocommerce/trunk/admin/selection_rules/rules/width.php

    r3438256 r3736443  
    7474        //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
    7575        echo Pi_cefw_selection_rule_main::createNumberField($count, $this->condition, null);
     76        echo $this->unit();
    7677        die;
    7778    }
    … …  
    7980    function savedDropdown($html, $values, $count){
    8081        $html = Pi_cefw_selection_rule_main::createNumberField($count, $this->condition,  $values);
     82        $html .= $this->unit();
    8183        return $html;
     84    }
     85
     86    function unit(){
     87        $unit = get_option( 'woocommerce_dimension_unit', 'cm' );
     88        return '<span>(Dimention unit: '.esc_html($unit).')</span>';
    8289    }
    8390

  • conditional-extra-fees-for-woocommerce/trunk/conditional-fees-rule-woocommerce.php

    r3734325 r3736443  
    1010 *
    1111 * @link              piwebsolution.com
    12  * @since             1.1.69
     12 * @since             1.1.70
    1313 * @package           Conditional_fees_Rule_Woocommerce
    1414 *
    … …  
    1717 * Plugin URI:        https://www.piwebsolution.com/product/conditional-cart-fee-extra-charge-rule-for-woocommerce-extra-fees-pro/
    1818 * Description:       Conditional extra fees for WooCommerce
    19  * Version:           1.1.69
     19 * Version:           1.1.70
    2020 * Author:            PI Websolution
    2121 * Author URI:        https://piwebsolution.com
    … …  
    6262/**
    6363 * Currently plugin version.
    64  * Start at version 1.1.69 and use SemVer - https://semver.org
     64 * Start at version 1.1.70 and use SemVer - https://semver.org
    6565 * Rename this for your plugin and update it as you release new versions.
    6666 */
    67 define( 'CONDITIONAL_FEES_RULE_WOOCOMMERCE_VERSION', '1.1.69' );
     67define( 'CONDITIONAL_FEES_RULE_WOOCOMMERCE_VERSION', '1.1.70' );
    6868define('PI_CEFW_BUY_URL', 'https://www.piwebsolution.com/cart/?add-to-cart=15441&variation_id=15442&utm_campaign=conditional-fee&utm_source=website&utm_medium=direct-buy');
    6969define('PI_CEFW_PRODUCT_PAGE_URL', 'https://www.piwebsolution.com/product/conditional-cart-fee-extra-charge-rule-for-woocommerce-extra-fees-pro/?utm_campaign=conditional-fee&utm_source=website&utm_medium=direct-buy');
    7070define('PI_CEFW_PRICE', '$34');
    7171define('PI_CEFW_DELETE_SETTING', false);
     72
     73define( 'CONDITIONAL_FEES_RULE_WOOCOMMERCE_PLUGIN_FOLDER_URL',  plugin_dir_url( __FILE__ ));
    7274
    7375/**

  • conditional-extra-fees-for-woocommerce/trunk/includes/help.php

    r3582713 r3736443  
    2626        $msg = '<p class="pisol-tooltip" tooltip="'.esc_html($msg).'"><span class="dashicons dashicons-editor-help"></span></p>';
    2727
    28         if($echo) echo wp_kses_post($msg);
     28        if($echo) echo ($msg);
    2929
    3030        return $msg;
Note: See TracChangeset for help on using the changeset viewer.