change select box for item attribute in menu item instance and button UI for CRM/Queue

app/controllers/origami/shifts_controller.rb

@@ -48,30 +48,16 @@ class Origami::ShiftsController < BaseOrigamiController
 
       unique_code = "CloseCashierPdf"
       shop_details = Shop.find(1)
-      puts "shop details"
-      p shop_details
       #get tax
       shift_obj      = ShiftSale.where('id =?',@shift.id)
-      puts "shift obj"
-      p shift_obj
       @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
-      puts "sale taxes"
-      p @sale_taxes
       #other payment details for mpu or visa like card
       @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
-      puts "other payment"
-      p @other_payment
 
       # Calculate price_by_accounts
       @total_amount_by_account    = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
-      puts "total amount by account"
-      p @total_amount_by_account
       @total_discount_by_account  = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
-      puts "total_discount_by_account"
-      p @total_discount_by_account
       @total_member_discount      = ShiftSale.get_total_member_discount(@shift)
-      puts "total_member_discount"
-      p @total_member_discount
       # get printer info
       print_settings = PrintSetting.find_by_unique_code(unique_code)
 

app/controllers/settings/menu_item_instances_controller.rb

@@ -105,9 +105,9 @@ class Settings::MenuItemInstancesController < ApplicationController
     end
     
     respond_to do |format|
-
       if @settings_menu_item_instances.update(settings_menu_item_instance_params)
-        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+        #@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split(" ")
         @settings_menu_item_instances.save
         format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_menu_item_instances }

app/views/crm/dining_queues/index.html.erb

@@ -100,8 +100,8 @@
     <%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block', 'data-no-turbolink' => true %>
     <hr>
 
-    <button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button>
+    <button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" style="font-size: 11px" disabled>Assign</button>
-    <button type="button" id="cancel" class="btn btn-danger btn-block btn-lg waves-effect" disabled>Cancel</button>
+    <button type="button" id="cancel" class="btn btn-danger btn-block btn-lg waves-effect" style="font-size: 11px" disabled>Cancel</button>
    <!--  <a href="<%= dashboard_path %>" class="btn btn-default btn-block waves-effect" role="button" aria-haspopup="true" aria-expanded="false"> Back </a> -->
   </div>
 </div>

app/views/crm/home/index.html.erb

@@ -118,7 +118,7 @@
     </button> -->
      <!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button> -->
      <button id="assign" value="" disabled="disabled" data-type="assign" class="btn assign btn-primary btn-lg btn-block">ASSIGN</button>
-     <button id="cancel" value="" disabled="disabled" data-type="cancel" class="btn btn-danger cancel btn-lg btn-block">CANCLE</button>
+     <button id="cancel" value="" disabled="disabled" data-type="cancel" class="btn btn-danger cancel btn-lg btn-block">CANCEL</button>
 
   </div>
 </div>

app/views/settings/menu_item_instances/_form.html.erb

@@ -11,7 +11,7 @@
             <%= f.input :item_instance_name %>
             <%= f.input :price %>
 
-            <%= f.input :item_attributes, collection: @item.item_attributes, input_html: { multiple: true } %>
+            <%= f.input :item_attributes, collection: @item.item_attributes%>
 
             <%= f.input :is_on_promotion %>
             <%= f.input :promotion_price %>