Changeset 1660405
- Timestamp:
- 05/18/2017 06:42:44 PM (9 years ago)
- Location:
- redi-restaurant-reservation/branches/andrew
- Files:
-
- 3 edited
-
redi-restaurant-reservation.php (modified) (5 diffs)
-
templates/admin.php (modified) (1 diff)
-
templates/frontend.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
redi-restaurant-reservation/branches/andrew/redi-restaurant-reservation.php
r1658007 r1660405 428 428 } 429 429 430 $reservationTime = (int) self::GetPost( 'ReservationTime' );431 if ( $reservationTime <= 0 ) {432 $errors[] = __( 'Reservation time should be greater than 0', 'redi-restaurant-reservation' );433 $form_valid = false;434 }430 // $reservationTime = (int) self::GetPost( 'ReservationTime' ); 431 // if ( $reservationTime <= 0 ) { 432 // $errors[] = __( 'Reservation time should be greater than 0', 'redi-restaurant-reservation' ); 433 // $form_valid = false; 434 // } 435 435 $place = array( 436 436 'place' => array( … … 512 512 $this->options['MinTimeBeforeReservation'] = $MinTimeBeforeReservation; 513 513 $this->options['DateFormat'] = $dateFormat; 514 $this->options['ReservationTime'] = $reservationTime;514 // $this->options['ReservationTime'] = $reservationTime; 515 515 $this->options['Hidesteps'] = $hidesteps; 516 516 $this->options['MinPersons'] = $minPersons; … … 1630 1630 } 1631 1631 1632 private function getReservationTime( $persons = 0 ) {1633 echo 'getReservationTime';1634 $filename = plugin_dir_path( __FILE__ ) . 'reservationtime.json';1635 1636 if ( file_exists( $filename ) && $persons ) {1637 $json = json_decode( file_get_contents( $filename ), true );1638 if ( $json !== null ) {1639 if ( array_key_exists( $persons, $json ) ) {1640 return (int) $json[ $persons ];1641 }1642 }1643 }1644 1645 if ( isset( $this->options['ReservationTime'] ) && $this->options['ReservationTime'] > 0 ) {1646 return (int) $this->options['ReservationTime'];1647 }1648 1649 return 3 * 60;1650 }1651 1652 1632 private function object_to_array( $object ) { 1653 1633 return json_decode( json_encode( $object ), true ); … … 1686 1666 'numberposts' => -1, 1687 1667 'post_status' => 'publish', 1688 'post_type' => ' duration',1668 'post_type' => 'reservation-duration', 1689 1669 'order' => 'ASC', 1690 1670 'orderby' => 'meta_value_num', //or 'meta_value_num' … … 1715 1695 'numberposts' => -1, 1716 1696 'post_status' => 'publish', 1717 'post_type' => ' menu',1697 'post_type' => 'reservation-menu', 1718 1698 'meta_query' => array( 1719 1699 'relation' => 'OR', -
redi-restaurant-reservation/branches/andrew/templates/admin.php
r1654604 r1660405 159 159 </p> 160 160 </td> 161 </tr> 162 <tr> 163 <th scope="row"> 164 <label for="ReservationTime"> 165 <?php _e('Reservation time', 'redi-restaurant-reservation'); ?> <span class="redi_required">*</span> 166 </label> 167 </th> 168 <td style="vertical-align: top;"> 169 <input id="ReservationTime" type="text" value="<?php echo $reservationTime ?>" name="ReservationTime"/> 170 </td> 171 <td style="width:75%"> 172 <p class="description"> 173 <?php _e('Duration of reservation in minutes. This is the time allocated for each reservation.', 'redi-restaurant-reservation'); ?> 174 </p> 175 </td> 176 </tr> 161 </tr> 177 162 <tr> 178 163 <th scope="row"> -
redi-restaurant-reservation/branches/andrew/templates/frontend.php
r1658007 r1660405 86 86 <?php endforeach ?> 87 87 </select> 88 </div> 89 <br/> 90 <div> 88 91 <label for="duration"> 89 92 <?php _e('Duration', 'redi-restaurant-reservation')?>:<span class="redi_required"> *</span>
Note: See TracChangeset
for help on using the changeset viewer.