Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

2017-08-30 18:22:42 +06:30
parent bf9f0cdbe7 5a0ca4b39d
commit 2f0a7c11ad
44 changed files with 1046 additions and 583 deletions
--- a/app/views/settings/promotions/new.html.erb
+++ b/app/views/settings/promotions/new.html.erb
@@ -13,5 +13,4 @@
 $("#promotion_promo_code").val(Math.random().toString(36).slice(5) + Math.random().toString(36).slice(5));
 // $( "#fromtime" ).timepicker();
 // $( "#totime" ).timepicker({ 'scrollDefault': 'now' });
-$('#scrollDefaultExample').timepicker({ 'scrollDefault': 'now' });
 </script>