add order button disable enable

app/assets/javascripts/addorder.js

@@ -1085,6 +1085,8 @@ $(function() {
 
   // Create Order
   $("#create_order").on('click', function(e){
+    $(this).prop("disabled", true);
+    $("#create_pay_order").prop("disabled", true);
     e.preventDefault();
     name_list = ''
     count = 0;
@@ -1113,17 +1115,17 @@ $(function() {
         }, function (isConfirm) {
           if (isConfirm) {
             create_order($(this))
+          }else{
+            $("#create_order").prop("disabled", false);
+            $("#create_pay_order").prop("disabled", false);
           }
       });
-
-
     } else {
       create_order($(this))
     }
   });
 
   function create_order(data) {
-    data.attr('disabled', 'disabled');
     $("#oqs_loading_wrapper").show();
     var cashier_type = $("#link_type").val();
     localStorage.setItem('cashier_type',cashier_type);
@@ -1180,6 +1182,12 @@ $(function() {
         if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){
           customer_display_view(null,"reload");
         }
+      },
+      error: function(XMLHttpRequest, textStatus, errorThrown) {
+        $("#oqs_loading_wrapper").hide();
+        $("#create_order").prop("disabled", false);
+        $("#create_pay_order").prop("disabled", false);
+        swal("Error", "Status: " + textStatus, "error");
       }
     });
   }
@@ -1187,9 +1195,10 @@ $(function() {
 
   // Pay Discount for Payment
   $("#create_pay_order").on('click', function(e){
+    $(this).prop("disabled", true);
+    $("#create_order").prop("disabled", true);
     $("#sxModal").show();
     $("#sxModal").attr('data-for', 'member');
-    $(this).attr('disabled', 'disabled');
     e.preventDefault();
     getCardNo();
   });
@@ -1197,6 +1206,7 @@ $(function() {
   $("#sxModal .btn_cancel").on('click',function(){
     if ($("#order-items-table tr").length > 1){
       $("#create_pay_order").prop("disabled", false);
+      $("#create_order").prop("disabled", false);
     }
     $("#sxModal").hide();
   });

app/assets/javascripts/foodcourt/addorder.js

@@ -124,7 +124,13 @@ function update_sale(membership_id, customer_id, customer_name, sale_id) {
     confirmButtonText: "Yes!",
     cancelButtonClass: 'btn btn-danger customer_assign_cancel',
     closeOnConfirm: true,
-  }, function () {
+  }, function (inputValue) {
+    if (inputValue===false) {
+      if ($("#order-items-table tr").length > 1){
+        $("#create_pay_order").prop("disabled", false);
+        $("#create_order").prop("disabled", false);
+      }
+    } else {
       $("#oqs_loading_wrapper").show();
       $.ajax({
         type: "POST",
@@ -143,5 +149,6 @@ function update_sale(membership_id, customer_id, customer_name, sale_id) {
           }
         }
       });
+    }
   });
 }

app/controllers/foodcourt/orders_controller.rb

@@ -260,12 +260,15 @@ class Foodcourt::OrdersController < BaseFoodcourtController
           sale_id = booking.sale_id
         end
       end
-    else
+
-      @status = false
+      respond_to do |format|
-      @error_message = "No Current Open Shift for This Employee"
+        format.json { render :json => { :status => @status, :sale_id => sale_id } }
+      end
+    else
+      respond_to do |format|
+        format.json { 
+          render :json => { :status => false, :error_message => "No Current Open Shift for This Employee" } }
       end
-    if ["quick_service", "food_court"].include? order.source
-      render :json => { :status => true, :sale_id => sale_data.sale_id }
     end
     #
   end