Changeset 1930330
- Timestamp:
- 08/25/2018 11:10:56 PM (8 years ago)
- Location:
- salon-booking/trunk
- Files:
-
- 3 edited
-
readme.txt (modified) (2 diffs)
-
salon.php (modified) (3 diffs)
-
src/data/booking-data.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
salon-booking/trunk/readme.txt
r1930029 r1930330 4 4 Requires at least: 4.0 5 5 Tested up to: 4.9.7 6 Stable tag: 1.8.1 16 Stable tag: 1.8.12 7 7 License: GPLv2 or later 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 74 74 75 75 == Changelog == 76 = 1.8.12 = 77 * Fixed show warning message by "count" function(PHP7.2.X) 78 76 79 = 1.8.11 = 77 80 * Fixed display staff members -
salon-booking/trunk/salon.php
r1930029 r1930330 4 4 Plugin URI: http://salon.mallory.jp 5 5 Description: Salon Booking enables the reservation to one-on-one business between a client and a staff member. 6 Version: 1.8.1 06 Version: 1.8.12 7 7 Author: tanaka-hisao 8 8 Author URI: http://salon.mallory.jp … … 10 10 Domain Path: /languages/ 11 11 */ 12 define( 'SL_VERSION', '1.8.1 1' );12 define( 'SL_VERSION', '1.8.12' ); 13 13 define( 'SL_DOMAIN', 'salon-booking' ); 14 14 define( 'SL_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); … … 1654 1654 $sp_dates = unserialize($d1['sp_dates']); 1655 1655 //$k2 = YYYY 1656 if ( count($sp_dates) > 0 && is_array($sp_dates)) {1656 if (is_array($sp_dates) && count($sp_dates) > 0 ) { 1657 1657 foreach ($sp_dates as $k2 => $d2) { 1658 1658 //$k3 = YYYYMMDD -
salon-booking/trunk/src/data/booking-data.php
r1727804 r1930330 61 61 //24時越は現状未対応 62 62 if (2400 < +$branch_datas["close_time"]) { 63 return null;63 return array(); 64 64 } 65 65 //出退勤連動も未対応 66 66 if ($this->getConfigData('SALON_CONFIG_STAFF_HOLIDAY_SET') == Salon_Config::SET_STAFF_REVERSE) { 67 return null;67 return array(); 68 68 } 69 69 global $wpdb;
Note: See TracChangeset
for help on using the changeset viewer.