Changeset 1666078
- Timestamp:
- 05/28/2017 08:13:36 PM (9 years ago)
- Location:
- redi-restaurant-reservation/branches/andrew
- Files:
-
- 3 edited
-
js/restaurant.js (modified) (6 diffs)
-
redi-restaurant-reservation.php (modified) (1 diff)
-
templates/frontend.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
redi-restaurant-reservation/branches/andrew/js/restaurant.js
r1661856 r1666078 183 183 return false; 184 184 } 185 var menu = jQuery.parseJSON( jQuery('#menu').val()); 185 186 var data = { 186 187 action: 'redi_restaurant-submit', … … 192 193 UserEmail: jQuery('#UserEmail').val(), 193 194 UserComments: jQuery('#UserComments').val(), 194 Menu: jQuery('#menu').val(),195 duration: jQuery('#redi-restaurant-durationHidden').val(),195 Menu: menu.title, 196 duration: menu.duration, 196 197 UserPhone: jQuery('#UserPhone').val(), 197 198 placeID: jQuery('#placeID').val(), … … 290 291 jQuery('#step1errors').hide('slow'); 291 292 jQuery('#step1times').hide(); 292 293 var menu = jQuery.parseJSON( jQuery('#menu').val()); 293 294 var data = { 294 295 action: 'redi_restaurant-submit', … … 298 299 startDateISO: jQuery('#redi-restaurant-startDateISO').val(), 299 300 persons: jQuery('#persons').val(), 300 duration: jQuery('#redi-restaurant-durationHidden').val(),301 duration: menu.duration, 301 302 lang: locale, 302 303 timeshiftmode: timeshiftmode, … … 413 414 jQuery('#menu').find('option').remove(); 414 415 for(var menu in response['menus']){ 415 jQuery('#menu').append(jQuery('<option>', { value : response['menus'][menu]['title']}).text(response['menus'][menu]['title']));416 jQuery('#menu').append(jQuery('<option>', { value : '{"title":"'+response['menus'][menu]['title']+'","duration":'+response['menus'][menu]['duration']+'}' }).text(response['menus'][menu]['title'])); 416 417 } 417 418 jQuery('#menu').val(savedMenu); … … 558 559 }); 559 560 560 jQuery(document).on('click', '.redi-restaurant-duration-button', function(event){561 console.log('duration click');562 event.preventDefault();563 jQuery('#redi-restaurant-durationHidden').val(jQuery(this).val());564 565 jQuery('.redi-restaurant-duration-button').each(function () {566 jQuery(this).removeAttr('select');567 });568 569 jQuery(this).attr('select', 'select');570 571 var day1 = jQuery('#redi-restaurant-startDate').datepicker('getDate').getDate();572 var month1 = jQuery('#redi-restaurant-startDate').datepicker('getDate').getMonth() + 1;573 var year1 = jQuery('#redi-restaurant-startDate').datepicker('getDate').getFullYear();574 var fullDate = year1 + '-' + zeroFill(month1) + '-' + zeroFill(day1);575 step1call(fullDate);576 });577 578 561 jQuery(document).on('change', '#menu', function(event){ 579 562 event.preventDefault(); -
redi-restaurant-reservation/branches/andrew/redi-restaurant-reservation.php
r1661858 r1666078 1731 1731 } 1732 1732 1733 if(isset($custom_fields['duration'])){ 1734 $menu['duration'] = $custom_fields['duration'][0]; 1735 } 1733 1736 $menus[] = $menu; 1734 1737 } -
redi-restaurant-reservation/branches/andrew/templates/frontend.php
r1661856 r1666078 83 83 <select name="menu" id="menu" class="redi-reservation-select"> 84 84 <?php foreach($menus as $menu):?> 85 <option value= "<?php echo $menu['title'] ?>"><?php echo $menu['title'] ?></option>85 <option value='{"title":"<?php echo $menu['title'] ?>","duration":<?php echo $menu['duration'] ?>}'><?php echo $menu['title'] ?></option> 86 86 <?php endforeach ?> 87 87 </select> 88 88 </div> 89 <br/> 90 <div> 91 <label for="duration"> 92 <?php _e('Duration', 'redi-restaurant-reservation')?>:<span class="redi_required"> *</span> 93 </label> 94 <?php foreach($durations as $duration):?> 95 <button <?php if($defaultDuration ===$duration['minutes']):?>select="select"<?php endif ?> class="redi-restaurant-duration-button button" value="<?php echo $duration['minutes'] ?>"><?php echo $duration['title'] ?></button> 96 <?php endforeach ?> 97 <input type="hidden" id="redi-restaurant-durationHidden" value="<?php echo $defaultDuration ?> "/> 98 </div> 89 99 90 <br/><br/> 100 91 <?php if ( $timeshiftmode === 'byshifts' || $hidesteps): ?>
Note: See TracChangeset
for help on using the changeset viewer.