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

2018-03-09 09:49:33 +06:30
parent 7dd0f71894 798bf8d4a8
commit b3ec34aa64
11 changed files with 437 additions and 11 deletions
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -760,7 +760,6 @@ $(function() {
    $("#oqs_loading_wrapper").show();
    
    type = window.location.href.indexOf("quick_service");
-
    if (type != -1) {
      type = 'quick_service'
      var table_type = $('#table_type').text();