Changeset 1666661
- Timestamp:
- 05/29/2017 07:28:43 PM (9 years ago)
- Location:
- redi-restaurant-reservation/branches/andrew
- Files:
-
- 3 edited
-
js/restaurant.js (modified) (3 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
r1666078 r1666661 337 337 var step1buttons_html = ''; 338 338 jQuery('#step1buttons_html').html(step1buttons_html).hide(); 339 var savedMenu = null; 340 savedMenu = jQuery('#menu').val(); 341 jQuery('#menu').find('option').remove(); 342 for(var menu in response['menus']){ 343 jQuery('#menu').append(jQuery('<option>', { value : '{"title":"'+response['menus'][menu]['title']+'","duration":'+response['menus'][menu]['duration']+'}' }).text(response['menus'][menu]['title'])); 344 } 345 jQuery('#menu').val(savedMenu); 346 if(jQuery('#menu').val() === null){ 347 for(var menu in response['menus']){ 348 if(response['menus'][menu]['default'] === true){ 349 jQuery('#menu').val('{"title":"'+response['menus'][menu]['title']+'","duration":'+response['menus'][menu]['duration']+'}'); 350 } 351 } 352 } 339 353 for (var availability in response) { 340 354 if (response[availability]['Name'] !== undefined) { … … 358 372 359 373 var b = response[availability]['Availability'][current_button_index]; 360 var menu = jQuery('#menu').val();361 362 var selmenu = jQuery.grep(response['menus'], function(a){return a.title ===menu })[0];374 375 var menu = jQuery.parseJSON( jQuery('#menu').val()); 376 var selmenu = jQuery.grep(response['menus'], function(a){return a.title ===menu.title})[0]; 363 377 var disabled = false; 364 378 if(selmenu !== undefined){ … … 408 422 jQuery('#step1buttons').html(step1buttons_html).show(); 409 423 display_all_busy(all_busy); 410 } 411 412 var savedMenu = null; 413 savedMenu = jQuery('#menu').val(); 414 jQuery('#menu').find('option').remove(); 415 for(var menu in response['menus']){ 416 jQuery('#menu').append(jQuery('<option>', { value : '{"title":"'+response['menus'][menu]['title']+'","duration":'+response['menus'][menu]['duration']+'}' }).text(response['menus'][menu]['title'])); 417 } 418 jQuery('#menu').val(savedMenu); 424 } 419 425 break; 420 426 } -
redi-restaurant-reservation/branches/andrew/redi-restaurant-reservation.php
r1666078 r1666661 1734 1734 $menu['duration'] = $custom_fields['duration'][0]; 1735 1735 } 1736 1737 if(isset($custom_fields['default'])){ 1738 $menu['default'] = true; 1739 } 1736 1740 $menus[] = $menu; 1737 1741 } -
redi-restaurant-reservation/branches/andrew/templates/frontend.php
r1666078 r1666661 83 83 <select name="menu" id="menu" class="redi-reservation-select"> 84 84 <?php foreach($menus as $menu):?> 85 <option value='{"title":"<?php echo $menu['title'] ?>","duration":<?php echo $menu['duration'] ?>}'><?php echo $menu['title'] ?></option>85 <option <?php if(isset($menu['default'])):?>selected="selected"<?php endif ?> value='{"title":"<?php echo $menu['title'] ?>","duration":<?php echo $menu['duration'] ?>}'><?php echo $menu['title'] ?></option> 86 86 <?php endforeach ?> 87 87 </select>
Note: See TracChangeset
for help on using the changeset viewer.