Pull from master

app/assets/javascripts/channels/check_new_order.js

@@ -19,7 +19,9 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', {
       });
 
       // alert(order_lists);
-      checkNewOrderAlert(shop_code, order_lists);
+      if (typeof checkNewOrderAlert !== 'undefined' && $.isFunction(checkNewOrderAlert)) {
+        checkNewOrderAlert(shop_code, order_lists);
+      }
       // $("#notify_new_order_lists").text(order_lists);
       // if($("#"+shop_code+"_notify_new_order").hasClass("hidden")){
         // $("#"+shop_code+"_notify_new_order").removeClass("hidden");

app/assets/javascripts/channels/check_order_ready_to_delivery.js

@@ -19,7 +19,9 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe
       });
 
       // alert(order_lists);
-      checkOrderReadyToKitchenAlert(shop_code, order_lists);
+      if (typeof checkOrderReadyToKitchenAlert !== 'undefined' && $.isFunction(checkOrderReadyToKitchenAlert)) {
+        checkOrderReadyToKitchenAlert(shop_code, order_lists);
+      }
       // $("#notify_order_ready_to_delivery_lists").text(order_lists);
       // if($("#notify_order_ready_to_delivery").hasClass("hidden")){
         // $("#"+shop_code+"_notify_order_ready_to_delivery").removeClass("hidden");

app/assets/javascripts/channels/check_order_send_to_kitchen.js

@@ -19,7 +19,9 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend
       });
 
       // alert(order_lists);
-      checkOrderSendToKitchen(shop_code, order_lists);
+      if (typeof checkOrderSendToKitchen !== 'undefined' && $.isFunction(checkOrderSendToKitchen)) {
+        checkOrderSendToKitchen(shop_code, order_lists);
+      }
       // $("#notify_order_send_to_kitchen_lists").text(order_lists);
       // if($("#notify_order_send_to_kitchen").hasClass("hidden")){
         // $("#"+shop_code+"_notify_order_send_to_kitchen").removeClass("hidden");

app/assets/javascripts/order_reservation.js

@@ -308,13 +308,26 @@ function show_order_detail(url,sr_no){
               item_price = items[i].unit_price;
             }
             var total = items[i].qty * item_price;
+            if(items[i].options!='[]'){
+            row = '<tr>'
+                 +'<td width ="70%" class="body-td align-left">'+items[i].item_name
+                  +' <br>'
+                  +' <i><span class="font-12">'+items[i].options+'</span></i><br>'+
+                  '<span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
+                +'</td>'
+                +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
+              +'</tr>';
+            }else{
               row = '<tr>'
-                     +'<td width ="70%" class="body-td align-left">'+items[i].item_name
-                      +' <br><span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
-                    +'</td>'
-                    +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
-                  +'</tr>';
-                $('.summary-items').append(row);
+                 +'<td width ="70%" class="body-td align-left">'+items[i].item_name
+                  +' <br>'+
+                  '<span class="font-13">'+items[i].qty+ '<span class="col-blue"> <b>X</b>'+items[i].unit_price+'</span></span>'
+                +'</td>'
+                +'<td width ="30%" class="body-td align-right">'+ total +'</td>'
+              +'</tr>';
+            }
+            
+            $('.summary-items').append(row);
           }
 
           if(data.discount_amount > 0){
@@ -565,5 +578,5 @@ function getOrderMonth(month){
 
 function getOrderDay(day){
   var DAYS = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"];
-  return DAYS[day];
+  return DAYS[day - 1];
 }