WordPress.org
Get WordPress

Plugin Directory

Changeset 3147211


Ignore:
Timestamp:
09/05/2024 04:43:20 PM (19 months ago)
Author:
wordpresschef
Message:

Update trunk - version 10.9.3

Location:
salon-booking-system/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • salon-booking-system/trunk/js/salon.js

    r3142993 r3147211  
    20882088    var datetimepicker = $(".sln_timepicker div").data("datetimepicker");
    20892089
    2090     var DtHours = datetimepicker.viewDate.getUTCHours();
    2091     DtHours = DtHours >= 10 ? DtHours : "0" + DtHours;
    2092     var DtMinutes = datetimepicker.viewDate.getUTCMinutes();
    2093     DtMinutes = DtMinutes >= 10 ? DtMinutes : "0" + DtMinutes;
    2094     var DtTime = DtHours + ":" + DtMinutes;
     2090    if (salon.time_format.includes('H:iip')) {
     2091        var DtHours = datetimepicker.viewDate.getUTCHours();
     2092        var DtHoursOld = DtHours;
     2093        var DtHours = DtHours >= 13 ? DtHours % 12 : DtHours;
     2094        DtHours = DtHours >= 10 ? DtHours : "0" + DtHours;
     2095        var DtMinutes = datetimepicker.viewDate.getUTCMinutes();
     2096        DtMinutes = DtMinutes >= 10 ? DtMinutes : "0" + DtMinutes;
     2097        var DtTime = DtHours + ":" + DtMinutes;
     2098        DtTime = DtHoursOld >= 12 ? DtTime + "pm" : DtTime + "am";
     2099    } else {
     2100        var DtHours = datetimepicker.viewDate.getUTCHours();
     2101        DtHours = DtHours >= 10 ? DtHours : "0" + DtHours;
     2102        var DtMinutes = datetimepicker.viewDate.getUTCMinutes();
     2103        DtMinutes = DtMinutes >= 10 ? DtMinutes : "0" + DtMinutes;
     2104        var DtTime = DtHours + ":" + DtMinutes;
     2105    }
    20952106    let dateString = $('#sln_timepicker_viewdate').text().split('|')[0] + ' | ' + DtTime;
    20962107    $("#sln_timepicker_viewdate").text(dateString);

  • salon-booking-system/trunk/readme.txt

    r3145954 r3147211  
    55Tested up to: 6.5
    66Requires PHP: 7.4.8
    7 Stable tag: 10.9.2
     7Stable tag: 10.9.3
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    396396== Changelog ==
    397397
     39805.09.2024
     399
     400* Fixed issue with holidays rules
     401
    39840202.09.2024
    399403

  • salon-booking-system/trunk/salon.php

    r3145954 r3147211  
    44Plugin Name: Salon Booking Wordpress Plugin - Free Version
    55Description: Let your customers book you services through your website. Perfect for hairdressing salons, barber shops and beauty centers.
    6 Version: 10.9.2
     6Version: 10.9.3
    77Plugin URI: http://salonbookingsystem.com/
    88Author: Salon Booking System
    … …  
    4444define('SLN_PLUGIN_DIR', untrailingslashit(dirname(__FILE__)));
    4545define('SLN_PLUGIN_URL', untrailingslashit(plugins_url('', __FILE__)));
    46 define('SLN_VERSION', '10.9.2');
     46define('SLN_VERSION', '10.9.3');
    4747define('SLN_STORE_URL', 'https://salonbookingsystem.com');
    4848define('SLN_AUTHOR', 'Salon Booking');

  • salon-booking-system/trunk/src/SLN/Shortcode/Salon/DetailsStep.php

    r3030174 r3147211  
    260260
    261261    public function getTitleKey(){
    262         if(!is_user_logged_in()){
     262        if(!is_user_logged_in() && !isset($this->getPlugin()->getSEttings()->get('custom_texts')['Checkout'])){
    263263            if($this->getPlugin()->getSettings()->get('enabled_force_guest_checkout')){
    264264                return 'Returning customer?';

  • salon-booking-system/trunk/views/settings/_tab_booking_holiday_rules.php

    r3145954 r3147211  
    1717?>
    1818<div id="sln-holidays_days" class="sln-box sln-box--main sln-booking-holiday-rules sln-box--haspanel">
    19         <h2 class="sln-box-title sln-box__paneltitle"><?php echo esc_attr($label); ?> <span class="block"><?php echo $block ?></span></h2>
    20          <div class="collapse sln-box__panelcollapse">
    21 <div class="row">
    22     <div class="sln-booking-holiday-rules-wrapper">
    23         <?php $n = 0;
    24 foreach ($holidays as $k => $row): $n++;?>
    25                                 <?php echo $plugin->loadView(
    26         'settings/_holiday_row',
    27         array(
    28             'prefix' => esc_attr($base) . "[$k]",
    29             'row' => esc_attr($row),
    30             'rulenumber' => esc_attr($n),
    31         )
    32     ); ?>
    33                             <?php endforeach?>
    34     </div>
    35     <div class="col-xs-12 sln-box__actions">
    36         <button data-collection="addnewholiday"
    37                 class="sln-btn sln-btn--main sln-btn--big sln-btn--icon sln-icon--file"><?php esc_html_e(
    38     'Add new',
    39     'salon-booking-system'
    40 )?>
    41         </button>
    42     </div>
    43     <div data-collection="prototype" data-count="<?php echo count($holidays) ?>">
    44         <?php echo $plugin->loadView(
    45     'settings/_holiday_row',
    46     array(
    47         'prefix' => $base . "[__new__]",
    48         'row' => array(),
    49         'rulenumber' => 'New',
    50     )
    51 ); ?>
    52     </div>
    53 </div>
    54 </div>
     19    <h2 class="sln-box-title sln-box__paneltitle"><?php echo esc_attr($label); ?> <span class="block"><?php echo $block ?></span></h2>
     20    <div class="collapse sln-box__panelcollapse">
     21        <div class="row">
     22            <div class="sln-booking-holiday-rules-wrapper">
     23            <?php $n = 0;
     24                foreach ($holidays as $k => $row):
     25                    $n++;
     26                    echo $plugin->loadView(
     27                                        'settings/_holiday_row',
     28                                        array(
     29                                            'prefix' => esc_attr($base) . "[$k]",
     30                                            'row' => $row,
     31                                            'rulenumber' => esc_attr($n),
     32                                        )
     33                    );
     34                endforeach;
     35            ?>
     36            </div>
     37            <div class="col-xs-12 sln-box__actions">
     38                <button data-collection="addnewholiday"
     39                        class="sln-btn sln-btn--main sln-btn--big sln-btn--icon sln-icon--file"><?php esc_html_e('Add new','salon-booking-system')?>
     40                </button>
     41            </div>
     42            <div data-collection="prototype" data-count="<?php echo count($holidays) ?>">
     43                <?php echo $plugin->loadView(
     44                                            'settings/_holiday_row',
     45                                            array(
     46                                                'prefix' => $base . "[__new__]",
     47                                                'row' => array(),
     48                                                'rulenumber' => 'New',
     49                                            )
     50                ); ?>
     51            </div>
     52        </div>
     53    </div>
    5554</div>
    5655
Note: See TracChangeset for help on using the changeset viewer.