Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/addorder.js

@@ -668,11 +668,12 @@ $(function() {
     e.preventDefault();
     $("#oqs_loading_wrapper").show();
     var table_id   = $('#table_id').text();
+    var customer_id   = $('#customer_id').text();
     var booking_id = $('#booking_id').text();
     if (!booking_id.length > 0) {
       
       var params = {'order_source': "cashier", 'order_type': "dine_in",
-                  'customer_id': "", 'guest_info': "",'booking_id':booking_id,
+                  'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id,
                   'table_id': table_id, 
                   'order_items': order_items };
     }
@@ -682,7 +683,7 @@ $(function() {
     var ajax_url = '../addorders/create'; 
     
     var params = {'order_source': "cashier", 'order_type': "dine_in",
-                  'customer_id': "", 'guest_info': "",
+                  'customer_id': customer_id, 'guest_info': "",
                   'table_id': table_id, 
                   'order_items': order_items };
     $.ajax({

app/controllers/origami/addorders_controller.rb

@@ -58,6 +58,9 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
        items_arr.push(items)
      }
 
+puts "sssssssssss"
+puts params[:customer_id]
+puts params.to_json
     # begin
     @order = Order.new
     @order.source = params[:order_source]

app/views/origami/addorders/detail.html.erb

@@ -38,6 +38,8 @@
              <p class="hidden" id="table_id"><%=@table_id%></p>
              <p class="hidden" id="table_type"><%=@table.type%></p>
              <p class="hidden" id="booking_id"><%=@booking_id%></p>
+             <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
+
           </div>
         </div>
         <div class="card-block">