diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 54e73fe1..cad815bf 100644
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -23,9 +23,13 @@ $(document).ready(function(){
 	// setTimeout(function(){
 	//    window.location.reload(1);
 	// }, 10000);
+	$(".nav-completed").on("click", function(){
+       $("#completed").removeClass('hide')
+       
+    });
 
     $(".oqs_click").on("click", function(){
-
+       $("#completed").addClass('hide')
        var oqs_id = $(this).find(".oqs-id").text();
        var url = 'oqs/get_items/'+oqs_id;
        show_details(url); 
@@ -42,7 +46,7 @@ $(document).ready(function(){
 	    url: url, 
 	    data: {},
 	    dataType: "json",
-	    success: function(data) {
+	    success: function(data) {	    	
 	        for(var field in data) {
 	          var price = parseFloat(data[field].price).toFixed(2);
 
@@ -52,12 +56,13 @@ $(document).ready(function(){
 	           var options = data.options;
 	          }
 
-	          var date = data[field]["created_at"];
+	          var date = new Date(data[field]["created_at"]); 
+          var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 	           
 	          row ='<div class="card queue_station">'
 	                  +'<div class="card-block">'
 	                      +'<h4 class="card-title">'
-	                        +'<span class="order-zone-type">'+data[field]["zone"]+'- </span>'
+	                        +'<span class="order-zone-type">'+data[field]["type"]+'- </span>'
 	                        +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
 	                        +'<small class="pull-right">'+ data[field]["order_id"] +'- </small>'
 	                      +'</h4>'
@@ -71,7 +76,7 @@ $(document).ready(function(){
 
 	                      +'<p class="card-text">'
 	                        +'<small class="text-muted">Order at'
-	                          +'<span class="order-at">'+ date +'</span> - '
+	                          +'<span class="order-at">'+ show_date +'</span> - '
 
 	                          +'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
 	                          +'</small> '
@@ -195,10 +200,7 @@ $(document).ready(function(){
   	$(document).on('click', '#print_order_item', function(event){ 
   		var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
   		var options = $('.selected-item').children('.card-block').find('.item-options').text();
-  		var params = { 'options':options };
-  		console.log(assigned_item_id);
-  		console.log(options);
-  		console.log(params);
+  		var params = { 'options':options };  		  		  		
   		$.ajax({
 			type: 'GET',
 	     	url: '/oqs/print/print/'+assigned_item_id,
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 180901ad..ffa714a2 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -65,6 +65,7 @@ class Crm::CustomersController < BaseCrmController
 
   # GET /crm/customers/1/edit
   def edit
+    @customer        = Customer.find(params[:id])
   end
 
     # POST /crm/customers
@@ -78,7 +79,7 @@ class Crm::CustomersController < BaseCrmController
       if @crm_customers.save
         # update tax profile
         customer = Customer.find(@crm_customers.customer_id)
-        customer.update_attributes(tax_profiles: params[:customer][:tax_profiles].to_json)
+        customer.update_attributes(tax_profiles: params[:customer][:tax_profiles])
           name            = customer_params[:name]
           phone           = customer_params[:contact_no]
           email           = customer_params[:email]
@@ -195,10 +196,12 @@ end
   # PATCH/PUT /crm/customers/1
   # PATCH/PUT /crm/customers/1.json
   def update
-
+    # Remove "" default first 
+    params[:customer][:tax_profiles].delete_at(0)
     respond_to do |format|
       if @crm_customer.update(customer_params)
-
+        # update tax profile        
+        @crm_customer.update_attributes(tax_profiles: params[:customer][:tax_profiles])
         name            = customer_params[:name]
         phone           = customer_params[:contact_no]
         email           = customer_params[:email]
diff --git a/app/controllers/oqs/backhome_controller.rb b/app/controllers/oqs/backhome_controller.rb
index cef7c6b6..b09e4a2d 100644
--- a/app/controllers/oqs/backhome_controller.rb
+++ b/app/controllers/oqs/backhome_controller.rb
@@ -98,7 +98,7 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'")
+    .where("assigned_order_items.delivery_status = 0 AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'")
     .group("assigned_order_items.assigned_order_item_id")
     .order("assigned_order_items.created_at")
   end
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 0a120ce2..d25ab0ac 100644
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -101,9 +101,9 @@ class Oqs::HomeController < BaseOqsController
     if oqs_id == nil
        oqs = ''
     else
-      oqs = " and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
+      oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
     end
-    AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
+    AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
               left join orders as od ON od.order_id = assigned_order_items.order_id
@@ -112,8 +112,10 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'#{oqs}")
+    .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs}")
+    .group("assigned_order_items.assigned_order_item_id")
     .order("assigned_order_items.created_at")
+
   end
 
   # Completed Order
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 026e59e3..ec826416 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -37,14 +37,14 @@ class Origami::CustomersController < BaseOrigamiController
       @crm_customers = Customer.order("customer_id").page(params[:page])
       #@products = Product.order("name").page(params[:page]).per(5)
     else
-      @crm_customers = Customer.search(filter) 
-      
+      @crm_customers = Customer.search(filter)       
     end
     #@crm_customers  = Customer.all
     @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
     @crm_customer    = Customer.new
     @count_customer = Customer.count_customer
     
+    @taxes = TaxProfile.all.order("order_by asc")
     # if flash["errors"]
     #   @crm_customer.valid?
     # end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index c7ffec34..9f4ae9f7 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -273,28 +273,34 @@ class Sale < ApplicationRecord
     total_tax_amount = 0
     #tax_profile - list by order_by
     tax_profiles = TaxProfile.all.order("order_by asc")
+    customer = Customer.find(sale.customer_id)
 
     # #Creat new tax records
     tax_profiles.each do |tax|
-      sale_tax = SaleTax.new(:sale => sale)
-      sale_tax.tax_name = tax.name
-      sale_tax.tax_rate = tax.rate
+      customer.tax_profiles.each do |cus_tax|        
+        if cus_tax.to_i == tax.id          
+          sale_tax = SaleTax.new(:sale => sale)
+          sale_tax.tax_name = tax.name
+          sale_tax.tax_rate = tax.rate
 
-      # substract , to give after discount
-      total_tax = total_taxable - total_discount
-      #include or execulive
-      if tax.inclusive
-        sale_tax.tax_payable_amount = total_tax / 21
-      else        
-        sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+          # substract , to give after discount
+          total_tax = total_taxable - total_discount
+          #include or execulive
+          if tax.inclusive
+            rate = tax.rate
+            divided_value = (100 + rate)/rate
+            sale_tax.tax_payable_amount = total_tax / divided_value
+          else        
+            sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+            total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
+          end
+          #new taxable amount is standard rule for step by step
+          # total_taxable = total_taxable + sale_tax.tax_payable_amount
+
+          sale_tax.inclusive = tax.inclusive
+          sale_tax.save          
+        end
       end
-      #new taxable amount is standard rule for step by step
-      # total_taxable = total_taxable + sale_tax.tax_payable_amount
-
-      sale_tax.inclusive = tax.inclusive
-      sale_tax.save
-
-      total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
     end
 
     sale.total_tax = total_tax_amount
@@ -312,32 +318,37 @@ class Sale < ApplicationRecord
     #tax_profile - list by order_by
     tax_profiles = TaxProfile.all.order("order_by asc")
     
-    # #Creat new tax records
+    customer = Customer.find(self.customer_id)
+
+    # #Create new tax records
     tax_profiles.each do |tax|
-      sale_tax = SaleTax.new(:sale => self)
-      sale_tax.tax_name = tax.name
-      sale_tax.tax_rate = tax.rate
+      customer.tax_profiles.each do |cus_tax|
+        if cus_tax.to_i == tax.id
+          sale_tax = SaleTax.new(:sale => self)
+          sale_tax.tax_name = tax.name
+          sale_tax.tax_rate = tax.rate
 
-      # substract , to give after discount
-      total_tax = total_taxable - self.total_discount
-      #include or execulive
-      if tax.inclusive
-        sale_tax.tax_payable_amount = total_tax / 21
-      else        
-        sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+          # substract , to give after discount
+          total_tax = total_taxable - self.total_discount
+          #include or execulive
+          if tax.inclusive
+            rate = tax.rate
+            divided_value = (100 + rate)/rate
+            sale_tax.tax_payable_amount = total_tax / divided_value
+          else        
+            sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+            total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
+          end
+          
+          #new taxable amount is standard rule for step by step
+          # total_taxable = total_taxable + sale_tax.tax_payable_amount
+
+          sale_tax.inclusive = tax.inclusive
+          sale_tax.save          
+        end
       end
-      
-      #new taxable amount is standard rule for step by step
-      # total_taxable = total_taxable + sale_tax.tax_payable_amount
-
-      sale_tax.inclusive = tax.inclusive
-      sale_tax.save
-
-      total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
     end
-
       self.total_tax = total_tax_amount
-
   end
 
   def product_get_unit_price(item_code)
@@ -382,7 +393,6 @@ class Sale < ApplicationRecord
   end
 
   def self.search(filter,from,to)
-
     if filter.blank?
         keyword = ''
     else
@@ -399,7 +409,6 @@ class Sale < ApplicationRecord
   end
 
   def self.search_credit_sales(customer,filter,from,to)
-
     if filter.blank?
         keyword = ''
     else
@@ -518,31 +527,25 @@ class Sale < ApplicationRecord
   end
 
 def self.get_by_range_by_saleitems(from,to,status,report_type)
+  query = Sale.select("
+                      mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total,
+                      SUM(i.qty) as total_item," +
+                       " i.unit_price as unit_price,
+                       mi.name as product_name,
+                       mc.name as menu_category_name,
+                       mc.id as menu_category_id ")
+                      .group('mi.id')
+                      .order("mi.menu_category_id")
 
-      query = Sale.select("
-                          mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total,
-                          SUM(i.qty) as total_item," +
-                           " i.unit_price as unit_price,
-                           mi.name as product_name,
-                           mc.name as menu_category_name,
-                           mc.id as menu_category_id ")
-                          .group('mi.id')
-                          .order("mi.menu_category_id")
-
-      query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id
-                            JOIN menu_items mi ON i.product_code = mi.item_code" +
-                            " JOIN menu_categories mc ON mc.id = mi.menu_category_id
-                            JOIN employees ea ON ea.id = sales.cashier_id")
-
-
-      query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status)
-
-
+  query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id
+                        JOIN menu_items mi ON i.product_code = mi.item_code" +
+                        " JOIN menu_categories mc ON mc.id = mi.menu_category_id
+                        JOIN employees ea ON ea.id = sales.cashier_id")
 
 
+  query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status)
 end
 
-
 def self.get_by_shiftsales(from,to,shift)
    if !shift.blank?
      ShiftSale.where("id =?",shift.id)
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 2dca6d16..1dbea502 100644
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -237,12 +237,10 @@ class ReceiptBillPdf < Prawn::Document
        
     end
 
-    def sale_payment(sale_data,precision,delimiter)
-        
+    def sale_payment(sale_data,precision,delimiter)        
         stroke_horizontal_rule
         move_down 5
         SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment|
-
             y_position = cursor
             if payment.payment_method == "paypar"
                 bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
@@ -269,15 +267,12 @@ class ReceiptBillPdf < Prawn::Document
                 text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down 5
-        end
-        
+        end        
     end
 
     # show member information
     def member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter)
-
-        if rebate_amount != nil
-            
+        if rebate_amount != nil        
             if rebate_amount["status"] == true
                 stroke_horizontal_rule
                 total = 0
@@ -429,6 +424,5 @@ class ReceiptBillPdf < Prawn::Document
 
         move_down 5
     end
-
 end
 
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 5f1d1b46..35c3a46d 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -82,17 +82,7 @@
     <div class="form-group">
     <label>Date Of Birth</label>
      <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
-   </div>
-
-    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-      <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
-      <% flash.each do |name, msg| %>
-         <% str="[\"#{msg['card_no']}\"]"
-         str.gsub!('["', '')
-         str.gsub!('"]', '') %>
-         <span class="help-block" style="margin-top:-6px"><%= str %></span>
-      <% end %>
-    </div>
+   </div>    
 
     <div class="form-group">
     <label>Select Customer Type</label>
@@ -103,10 +93,21 @@
         <%end %>
       </select>            
     </div>
+    
     <div class="form-group">
       <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control col-md-6 tax_profiles" %>
     </div>
 
+    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+      <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
+      <% flash.each do |name, msg| %>
+         <% str="[\"#{msg['card_no']}\"]"
+         str.gsub!('["', '')
+         str.gsub!('"]', '') %>
+         <span class="help-block" style="margin-top:-6px"><%= str %></span>
+      <% end %>
+    </div>
+
     <div class="form-group">
       <label>Paypar Account No:</label>
       <div class="input-group">            
diff --git a/app/views/crm/customers/edit.json.jbuilder b/app/views/crm/customers/edit.json.jbuilder
new file mode 100644
index 00000000..60148085
--- /dev/null
+++ b/app/views/crm/customers/edit.json.jbuilder
@@ -0,0 +1,4 @@
+json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth,
+                             :membership_id, :membership_type, :membership_authentication_code,
+                             :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :tax_profiles
+json.url crm_customer_url(@crm_customer, format: :json)
\ No newline at end of file
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index b1b1272b..34aaf51e 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -1,4 +1,4 @@
-<div class="row">
+<!-- <div class="row">
   <div class="col-lg-12">
     <ol class="breadcrumb">
        <li><a href="<%= crm_root_path %>">Home</a></li>
@@ -7,17 +7,17 @@
        </li>
        <!-- <a href="<%= new_crm_customer_path%>" class="btn btn-primary pull-right">
         <i class="fa fa-plus-circle fa-lg"></i> Add Customer
-       </a> -->
+       </a> 
     </ol>
   </div>
-</div>
+</div> -->
 <div class="row">
   <div class="col-lg-7 col-md-7 col-sm-7">
-      
+
       <div class="main-box-body clearfix">
         <div class="table-responsive">
           <table class="table table-striped">
-           
+
             <thead>
 
               <tr>
@@ -25,7 +25,7 @@
                     <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
                       <div class="input-append col-md-7 form-group pull-left">
                         <input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control input-xs col-md-9">
-                        <button type="submit" class="btn btn-primary btn-md">Search</button>                        
+                        <button type="submit" class="btn btn-primary btn-md">Search</button>
                         <!-- <a href="modal-window" data-toggle= "modal" data-target="#modal-window" class="btn btn-primary btn-md" id="card_read" >Read Card</a> -->
 
                         <!-- <button type="button" class="btn btn-info btn-md" data-toggle="modal" data-target="#myModal">Open Modal</button> -->
@@ -48,12 +48,12 @@
             <tbody>
                 <% @i = 0 %>
                  <% @crm_customers.each do |crm_customer| %>
-                  
+
                     <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                      <td>
                      <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
                      <td>
-                      <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
+                      <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %>
                       <%= @i += 1 %>
                       <% end %>
                       </td>
@@ -62,15 +62,15 @@
                       <td><%= crm_customer.contact_no %></td>
                       <td><%= crm_customer.email %></td>
                       <td><%= link_to 'Show', crm_customer_path(crm_customer) %></td>
-                     
+
                     </tr>
-                    
+
                   <% end %>
-             
+
             </tbody>
           </table>
           <br>
-          
+
           <%= paginate @crm_customers %>
         </div>
       </div>
@@ -98,9 +98,9 @@ $(function() {
     $('.datepicker').css('cursor','pointer');
 
     // Read Card Reader
-    $("#member_acc_no").on('click', function(e){  
-      var cardNo = ""; 
-      $("#sxModal").show();   
+    $("#member_acc_no").on('click', function(e){
+      var cardNo = "";
+      $("#sxModal").show();
       setTimeout(function(){
         getCardNo();
         $("#sxModal").hide();
@@ -120,19 +120,20 @@ $(document).on('click',".customer_tr",function(){
               // var url = "/"+customer_id;
               update_sale(customer_id,sale_id);
             }else{
-              
-              var url = "customers/"+customer_id;
+
+              var url = "customers/" + customer_id + "/edit";
             }
-              
-              $.ajax({      
-                type: "GET",         
-                url: url, 
+
+              $.ajax({
+                type: "GET",
+                url: url,
                 data: {},
                 dataType: "json",
-                success: function(data) {                   
+                success: function(data) {  
                   // Selected for Taxes  
-                  //var taxes = JSON.stringify(data.tax_profiles);  
-                  var parse_taxes = JSON.parse(data.tax_profiles);   
+                  var taxes = JSON.stringify(data.tax_profiles);  
+                  var parse_taxes = JSON.parse(taxes); 
+                  console.log(parse_taxes);  
                   $.each(parse_taxes, function(i, value){
                     $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected");
                   });
@@ -166,7 +167,7 @@ $(document).on('click',".customer_tr",function(){
                     }else{
                       $('.mdm').prop( "checked", true )
                     }
-                   
+
                     $('.membership_authentication_code').val(data.membership_authentication_code);
 
                     $('#update_customer').removeAttr('disabled').val('');
@@ -185,7 +186,7 @@ $(document).on('click',".customer_tr",function(){
                 }
              });
           // }else{
-            
+
           // }
   })
 
@@ -194,44 +195,43 @@ $(document).on('click',".customer_tr",function(){
         title: 'Confirm!',
         content: 'Are You Sure to assign this customer!',
         buttons: {
-              
+
               cancel: function () {
-                
+
               },
               confirm: {
               text: 'Confirm',
               btnClass: 'btn-green',
               keys: ['enter', 'shift'],
               action: function(){
-                  $.ajax({      
-                        type: "POST",         
+                  $.ajax({
+                        type: "POST",
                         url: "update_sale/" ,
                         data: {customer_id:customer_id,sale_id:sale_id},
                         dataType: "json",
                         success: function(data) {
                           if(data.status == true)
-                          { 
+                          {
                             window.location.href = '/origami'
                           }else{
                             alert('Record not found!');
                             location.reload();
                           }
-                          
-                        }  
+
+                        }
                 });
                }
               }
-              
+
         }
       });
   }
 
   $('#reset').click(function() {
-    
+
     window.location.href = '/crm/customers'
 
     return false;
   });
 
 </script>
-                  
\ No newline at end of file
diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb
index 3d186efe..ace0f703 100644
--- a/app/views/crm/dining_queues/index.html.erb
+++ b/app/views/crm/dining_queues/index.html.erb
@@ -1,4 +1,4 @@
-<div class="page-header">
+<!-- <div class="page-header">
    <ul class="breadcrumb">
     <li><a href="<%=  %>">Home</a></li>
     <li>Queue</li>
@@ -6,19 +6,19 @@
       <%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-sm' %>
     </span>
   </ul>
-</div>
+</div> -->
 
 <div class="row">
  <!-- Column One -->
  <div class="col-lg-11 col-md-11 col-sm-11">
 
-   <div class="tab-content" style="max-height:670px; overflow-y:scroll">
+   <div class="tab-content" style="max-height:670px; overflow-y:auto">
 
     <!--- Panel 1 - Table Orders -->
     <div class="active" role="tabpanel">
        <div class="tab-pane" role="tabpanel">
            <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-           
+
              <% @dining_queues.each do |queue| %>
              <% if queue.status == "Assign"
                 @bg_color = "assign"
@@ -27,10 +27,10 @@
               else
                 @bg_color = "normal"
               end
-            %> 
+            %>
               <div class="card select-queue <%= @bg_color %>" data-id="<%= queue.id %>" style="width: 21.5rem;">
                  <div class="card-block">
-                      <p class="hidden queue-id"><%= queue.id  %></p> 
+                      <p class="hidden queue-id"><%= queue.id  %></p>
                       <p class="hidden queue-status"><%= queue.status  %></p>
                       <span class="card-title"><strong> Queue No : <%= queue.queue_no %></strong></span>
                       <span class="card-title pull-right"><strong> Seater : <%= queue.seater %></strong></span><br>
@@ -39,7 +39,7 @@
                       <span class="card-title"> Remark : <%= queue.remark %></span>
                  </div>
                </div>
-            
+
              <% end %>
            </div>
        </div>
@@ -48,8 +48,10 @@
 <!-- tabs - End -->
 </div>
   <div class="col-lg-1 col-md-1 col-sm-1">
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-lg btn-block' %>
+    <hr>
     <button type="button" id="assign" class="btn btn-primary btn-lg btn-block" disabled>Assign</button>
-    <button type="button" id="cancel" class="btn btn-warning btn-lg btn-block" disabled>Cancel</button>  
+    <button type="button" id="cancel" class="btn btn-warning btn-lg btn-block" disabled>Cancel</button>
     <a href="<%= dashboard_path %>" class="btn btn-primary btn-lg btn-block" role="button" aria-haspopup="true" aria-expanded="false"> Back </a>
   </div>
 </div>
@@ -71,7 +73,7 @@ $(function(){
           $("#cancel").val($(this).find(".queue-id").text());
       }); //End  Click
 
-    
+
 });
 $('#assign').click(function() {
   var id = $(this).val();
@@ -90,31 +92,31 @@ function cancel_queue(id,url) {
         title: 'Confirm!',
         content: 'Are You Sure to cancel this Queue!',
         buttons: {
-              cancel: function () { 
+              cancel: function () {
               },
               confirm: {
               text: 'Confirm',
               btnClass: 'btn-green',
               keys: ['enter', 'shift'],
               action: function(){
-                  $.ajax({      
-                        type: "POST",         
+                  $.ajax({
+                        type: "POST",
                         url: url ,
                         data: {id:id},
                         dataType: "json",
                         success: function(data) {
                           if(data.status == true)
-                          { 
+                          {
                            location.reload();
                           }
-                          
-                        }  
+
+                        }
                 });
                }
               }
-              
+
         }
     });
 }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 904749e6..bc5ce498 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,22 +8,25 @@
         <li class="navbar-nav mr-auto dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Settings</a>
           <ul class="dropdown-menu">
+              <li><%= link_to "Zones (Zone,Table,Rooms)", settings_zones_path, :tabindex =>"-1" %></li>
+              <hr class="hr_advance" />
+              <li><%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %></li>
+              <hr class="hr_advance" />
               <li><%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %></li>
-              <hr>
-              <li><%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Zones", settings_zones_path, :tabindex =>"-1" %></li>
-              <hr>
-              <li><%= link_to "Cashier Terminals ", settings_cashier_terminals_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
+              <hr class="hr_advance" />
+              <li><%= link_to "Cashier Terminals", settings_cashier_terminals_path, :tabindex =>"-1" %></li>
+              <li><%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %></li>
+              <hr class="hr_advance" />
               <li><%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Payment Method", settings_payment_method_settings_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %></li>
+              <li><%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %></li>
-              <hr>
+              <hr class="hr_advance" />
+              <li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
+              <hr class="hr_advance" />
               <li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
@@ -33,7 +36,7 @@
           <ul class="dropdown-menu">
             <li><%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %></li>
             <li><%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %></li>
-             <li><%= link_to "Credit Note ", transactions_credit_notes_path, :tabindex =>"-1" %></li> 
+             <li><%= link_to "Credit Note ", transactions_credit_notes_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
         <li class="navbar-nav mr-auto dropdown">
@@ -42,9 +45,9 @@
             <li><%= link_to "Daily Sale Report", reports_dailysale_index_path, :tabindex =>"-1" %></li>
             <li><%= link_to "Sales Item Report", reports_saleitem_index_path, :tabindex =>"-1" %></li>
             <li><%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %></li> 
-            <li><%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %></li> 
-            <li><%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %></li> 
+            <li><%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
         <li class="navbar-nav mr-auto">
@@ -57,7 +60,7 @@
           <a href="<%= crm_customers_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;CRM</a>
         </li>
 
-          
+
      </ul>
 
    </div>
@@ -66,7 +69,7 @@
           <ul class="navbar-nav mr-auto">
           <%if current_login_employee.role !="waiter" %>
             <li style="color: #959595"><%= current_login_employee.name %> </li>
-            
+
             <li style="padding-right:10px;padding-left:10px"> | </li>
             <li ><%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
             </li>
@@ -76,3 +79,9 @@
    <% end %>
 
  </nav>
+<style type="text/css">
+        hr.hr_advance {
+          margin-top: 10px !important;
+          margin-bottom: 10px !important;
+        }
+</style>
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 5642e4f7..c6c35e1c 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -3,7 +3,7 @@
   <div class="col-lg-8 col-md-8 col-sm-8">    
     <!-- Nav tabs -->
     <ul class="nav nav-tabs" role="tablist">
-      <li class="nav-item">
+      <li class="nav-item nav-completed">
         <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
       </li>
 
@@ -17,11 +17,12 @@
         <p class="hidden oqs-id"><%= qsi.id  %></p>
          <a class="nav-link" data-toggle="tab" href="" role="tab" <%= status %>>
             <%= qsi.station_name %>
-            <span class="badge badge-pill badge-default" id=""><%= qsi.assigned_order_items.count %>                
+            <span class="badge badge-pill badge-default" id=""><%= qsi.assigned_order_items.count(:delivery_status) %>                
             </span> 
             <% if qsi.auto_print %>
               <span>(ap)</span>
-            <% end %>       
+            <% end %>  
+            <%= qsi.assigned_order_items.where("delivery_status=0").count %>     
         </a>
       </li>
       <% end %>      
@@ -77,13 +78,11 @@
 
       <!-- Order Item for Queue Station -->
 
-            <!--- Order Items -->
-            <div class="card-columns oqs_append" style="padding-top:10px; column-gap: 1.2rem;">
-             
-                
-              <!--- end of Items-->
-            </div>
- 
+        <!--- Order Items -->
+        <div class="card-columns oqs_append" style="padding-top:10px; column-gap: 1.2rem;">         
+                     
+        </div>
+         <!--- end of Items-->
     </div>
   </div>
 
@@ -144,4 +143,3 @@
 
   </div>
 </div>
-
diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb
index efc8a22b..b2922f63 100644
--- a/app/views/origami/cash_ins/new.html.erb
+++ b/app/views/origami/cash_ins/new.html.erb
@@ -1,7 +1,7 @@
 
 <div class='row'>
     <div class="col-lg-11 col-md-11 col-sm-11">
-      <h2> Payment Credit </h2>
+      <h2> Cash In </h2>
       <br>
       <table class='table table-striped'>
         <tr>
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb
index 9d628f24..e4d42b89 100644
--- a/app/views/origami/cash_outs/new.html.erb
+++ b/app/views/origami/cash_outs/new.html.erb
@@ -2,7 +2,7 @@
 
 <div class='row'>
   <div class="col-lg-11 col-md-11 col-sm-11">
-    <h2>Payment Debit</h2>
+    <h2>Cash Out</h2>
       <table class='table table-striped'>
         <tr>
           <td> Payment Reference
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 3c22c2e4..6f4f53df 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -81,23 +81,7 @@
     <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
     <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
     <%= f.error_notification %>
-    <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
-    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
-      <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
-      <% flash.each do |name, msg| %>
-         <% str="[\"#{msg['name']}\"]"
-         str.gsub!('["', '')
-         str.gsub!('"]', '') %>
-         <span class="help-block" style="margin-top:-10px"><%= str %></span>
-      <% end -%>
-    </div>
-    <div class="form-group">
-      <label>Paypar Account No:</label>
-      <div class="input-group">     
-        <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
-        <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
-      </div>
-    </div>
+    <%= f.hidden_field :id, :class => "form-control col-md-6 " %>    
     <div class="form-group">
       <label>Salutation :</label><br>
        <label>Mr</label>
@@ -176,6 +160,37 @@
       <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
     </div>
 
+    <div class="form-group">
+    <label>Select Customer Type</label>
+      <select class="selectpicker form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: 40px" >
+        <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
+           <option value="<%= ct.value %>">
+          <%= ct.name %></option>
+        <%end %>
+      </select>            
+    </div>
+    
+    <div class="form-group">
+      <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true },  :class => "form-control col-md-6 tax_profiles" %>
+    </div>
+
+    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
+      <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
+      <% flash.each do |name, msg| %>
+         <% str="[\"#{msg['name']}\"]"
+         str.gsub!('["', '')
+         str.gsub!('"]', '') %>
+         <span class="help-block" style="margin-top:-10px"><%= str %></span>
+      <% end -%>
+    </div>
+    <div class="form-group">
+      <label>Paypar Account No:</label>
+      <div class="input-group">     
+        <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
+        <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
+      </div>
+    </div>
+
     <div class="form-group">
      <label>Select Member Group</label>
      <select class="selectpicker form-control col-md-12" name="member_group_id">
@@ -292,6 +307,12 @@
                 data: {},
                 dataType: "json",
                 success: function(data) {
+                  var taxes = JSON.stringify(data.tax_profiles);  
+                  var parse_taxes = JSON.parse(taxes);  
+                  $.each(parse_taxes, function(i, value){
+                    $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected");
+                  });
+                  
                    $('#customer_id').val(data.id);
                     $('#customer_name').val(data.name);
                     $('#customer_company').val(data.company);
@@ -301,7 +322,8 @@
                     $('#customer_membership_type').val(data.membership_type);
                     $('.select > option[value="'+data.membership_id+'"]').attr('selected','selected');
                     $('.membership_authentication_code').val(data.membership_authentication_code);
-
+                    $('#customer_card_no').val(data.card_no);
+                    $('#customer_type').val(data.customer_type);
                     $('#customer_salutation').val(data.salutation);
                     $('#customer_nrc_no').val(data.nrc_no);
                     $('#paypar_account_no').val(data.paypar_account_no);
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 9ca152ac..b547fcda 100644
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -2,7 +2,7 @@
 <div class="col-lg-11col-md-11 col-sm-11">
 	<div >
 			<div >
-				<% @payment_method_setting.each do |payment_method|%>
+				<% @payment_method_setting.where("is_active = true").each do |payment_method|%>
 					<div class="purple others-payment bottom left" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
 				<% end %>
 			</div>
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb
index e85a0974..53f8ff46 100644
--- a/app/views/reports/void_sale/index.html.erb
+++ b/app/views/reports/void_sale/index.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
 	<ul class="breadcrumb">
 		<li><a href="<%= dashboard_path %>">Home</a></li>
-		<li>Credit Payment List Report</li>
+		<li>Void Sale Report</li>
 	</ul>
 </div>
 
diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb
index 0dbbcfe6..b44a2dcd 100644
--- a/app/views/settings/employees/index.html.erb
+++ b/app/views/settings/employees/index.html.erb
@@ -13,8 +13,9 @@
   <table class="table table-striped">
     <thead>
       <tr>
-        <th style="width:40%">Name</th>
-        <th style="width:40%">Role</th>
+        <th style="width:20%">Name</th>
+        <th style="width:20%">Role</th>
+        <th style="width:20%">Created At</th>
         <th style="width:20%">Action</th>
       </tr>
     </thead>
@@ -24,13 +25,14 @@
         <tr>
           <td><%= link_to employee.name,settings_employee_path(employee)  %></td>
           <td><%= employee.role %></td>
+          <td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td>
-            <%= link_to 'Edit', edit_settings_employee_path(employee) %>  
+            <%= link_to 'Edit', edit_settings_employee_path(employee) %>
            <%if employee.role != "administrator"%>
-             
-           
+
+
            | <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %>
-          <%end%>  
+          <%end%>
           </td>
         </tr>
       <% end %>
diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb
index 77a189c4..d2a25a29 100644
--- a/app/views/settings/membership_settings/_form.html.erb
+++ b/app/views/settings/membership_settings/_form.html.erb
@@ -7,10 +7,10 @@
     <%= f.input :gateway_communication_type %>
     <%= f.input :gateway_url %>
     <%= f.input :auth_token %>
-    <%= f.input :discount %>
-    <%= f.input :rebate %>
-    <%= f.input :bonus %>
-    <%= f.input :point %>
+    <label><%= f.check_box :discount %>Discount</label><br/>
+    <label><%= f.check_box :rebate %>Rebate</label><br/>
+    <label><%= f.check_box :bonus %>Bonus</label><br/>
+    <label><%= f.check_box :point %>Points</label>
   </div>
 
   <div class="form-actions">
diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb
index fa3b22ba..4ce72b69 100644
--- a/app/views/settings/membership_settings/index.html.erb
+++ b/app/views/settings/membership_settings/index.html.erb
@@ -21,7 +21,7 @@
         <th>Discount</th>
         <th>Rebate</th>
         <th>Bonus</th>
-        <th>Point</th>
+        <th>Points</th>
         <th colspan="3"></th>
       </tr>
     </thead>
diff --git a/db/seeds.rb b/db/seeds.rb
index 328c9e54..8bc16f74 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -98,10 +98,9 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val
                                   {lookup_type:'customer_type', name: 'Takeaway', value: 'Takeaway'},
                                   {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}])
 
-#WALK CUSTOMER - Default CUSTOMER (take key 1)
-customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000",customer_type:"Dinein"})
-customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111",customer_type:"Takeaway"})
-
+# Default CUSTOMER
+customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]})
+customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]})
 
 #Default ZOne
 # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"})
diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake
index b0fc72a9..0acc4a1e 100644
--- a/lib/tasks/menu_osaka.rake
+++ b/lib/tasks/menu_osaka.rake
@@ -10,6 +10,7 @@ namespace :menu do
 menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"})
 food = Account.create({title: "Food", account_type: "0"})
 beverage = Account.create({title: "Beverage", account_type: "1"})
+product = Account.create({title: "Product", account_type: "2"})
 # Gyoza
 menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"})
   #Gyoza 6Pcs
@@ -19,11 +20,11 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz
   #Gyoza 12 Pcs
   menu_category1_menu_item6 = SimpleMenuItem.create({name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}])
   #Gyoza 30 Pcs
   menu_category1_menu_item20 = SimpleMenuItem.create({name: "Gyoza 30 Pcs", alt_name: "Gyoza 30 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item20, price:11500.0, is_on_promotion:false}])
   #Green Onion Gyoza 6Pcs
   menu_category1_menu_item7 = SimpleMenuItem.create({name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item7, price:3500.0, is_on_promotion:false}])
@@ -32,7 +33,7 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item8, price:3500.0, is_on_promotion:false}])
   #White Onion Gyoza 6Pcs
   menu_category1_menu_item9 = SimpleMenuItem.create({name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:0.0, is_on_promotion:false}])      
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:0.0, is_on_promotion:false}])
   # Spicy Mayonnaise Gyoza 6pcs
   menu_category1_menu_item4 = SimpleMenuItem.create({name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}])
@@ -47,22 +48,22 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:0.0, is_on_promotion:false}])
   # Gyoza 2pcs
   # menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
-  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}])    
+  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}])
   # Gyoza dumpling soup with Udon
   menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}])
   # # Gyoza dumpling soup with Udon
   # menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
-  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}])    
+  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}])
   # Gyoza dumpling soup
   menu_category1_menu_item22 = SimpleMenuItem.create({name: "Gyoza dumpling soup", alt_name: "Gyoza dumpling soup",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}])
   # Gyoza dumpling tossed
   menu_category1_menu_item23 = SimpleMenuItem.create({name: "Gyoza dumpling tossed", alt_name: "Gyoza dumpling tossed",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:2500.0, is_on_promotion:false}])      
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:2500.0, is_on_promotion:false}])
   # Gyoza dumpling soup with Ramen
   menu_category1_menu_item23 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Ramen", alt_name: "Gyoza dumpling soup with Ramen",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:3000.0, is_on_promotion:false}])      
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item23, price:3000.0, is_on_promotion:false}])
 
   # Salad
 menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Salad", order_by: 4,created_by: "SYSTEM DEFAULT"})
@@ -77,7 +78,7 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item36, price:2200.00, is_on_promotion:false}])
   # S4-Glass Noodle Salad
   menu_category1_menu_item37 = SimpleMenuItem.create({name: "S4-Glass Noodle Salad", alt_name: "S4-Glass Noodle Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item37, price:2500.00, is_on_promotion:false}])
   # Seaweed Salad
   menu_category1_menu_item28 = SimpleMenuItem.create({name: "S5-Seaweed Salad", alt_name: "S5-Seaweed Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item28, price:3000.00, is_on_promotion:false}])
@@ -90,16 +91,16 @@ menu_category4 = MenuCategory.create({menu: menu, name: "Salad", alt_name: "Sala
   # S5-Otsumami Sansyu
   # menu_category1_menu_item35 = SimpleMenuItem.create({name: "S5-Otsumami Sansyu", alt_name: "S5-Otsumami Sansyu",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item35, price:2500.00, is_on_promotion:false}])
-  
+
   # Fried Tofu Salad
   menu_category1_menu_item31 = SimpleMenuItem.create({name: "S7-Fried Tofu Salad", alt_name: "S7-Fried Tofu Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}])      
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}])
   #BBQ Pork Salad
   menu_category1_menu_item29 = SimpleMenuItem.create({ name: "S8-BBQ Pork Salad", alt_name: "S8-BBQ Pork Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item29, price:4000.00, is_on_promotion:false}])
   # Seafood Salad
   menu_category1_menu_item30 = SimpleMenuItem.create({name: "S9-Seafood Salad", alt_name: "S9-Seafood Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}]) 
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item30, price:5000.00, is_on_promotion:false}])
   # Gyoza Salad
   # menu_category1_menu_item59 = SimpleMenuItem.create({name: "Gyoza Salad", alt_name: "Gyoza Salad",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item59, price:4000.00, is_on_promotion:false}])
@@ -126,18 +127,18 @@ menu_category5 = MenuCategory.create({menu: menu,  name: "Appetizer", alt_name:
   # A6 Party Set A
   menu_category1_menu_item54 = SimpleMenuItem.create({name: "A6-Party Set A", alt_name: "A6-Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item54, price:0.00, is_on_promotion:false}])
-  # A7 Party Set 
+  # A7 Party Set
   menu_category1_menu_item55 = SimpleMenuItem.create({name: "A7-Party Set", alt_name: "A7-Party Set",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:5500.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item55, price:5500.00, is_on_promotion:false}])
   # A8 Wakatori Spring Chicken
   menu_category1_menu_item56 = SimpleMenuItem.create({name: "A8-Wakatori Spring Chicken", alt_name: "A8-Wakatori Spring Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:0.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:0.00, is_on_promotion:false}])
   # A9 Ohsho Fried Chicken
   menu_category1_menu_item57 = SimpleMenuItem.create({name: "A9-Ohsho Fried Chicken", alt_name: "A9-Ohsho Fried Chicken",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:0.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item57, price:0.00, is_on_promotion:false}])
   # A10 Fish & Chip
   menu_category1_menu_item58 = SimpleMenuItem.create({name: "A10-Fish & Chip", alt_name: "A10-Fish & Chip",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:4500.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:4500.00, is_on_promotion:false}])
   # A2 Kushi Katsu
   # menu_category1_menu_item48 = SimpleMenuItem.create({name: "A2 Kushi Katsu", alt_name: "A2 Kushi Katsu",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item48, price:4000.00, is_on_promotion:false}])
@@ -153,11 +154,11 @@ menu_category5 = MenuCategory.create({menu: menu,  name: "Appetizer", alt_name:
   # # A6 Vegetable Tempura
   # menu_category1_menu_item52 = SimpleMenuItem.create({name: "A6 Vegetable Tempura", alt_name: "A6 Vegetable Tempura",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item52, price:2500.00, is_on_promotion:false}])
-  
+
   # # A 10 - Fried Potato
   # menu_category1_menu_item56 = SimpleMenuItem.create({name: "A10-Fried Potato", alt_name: "A10 - Fried Potato",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item56, price:1500.00, is_on_promotion:false}])
-  
+
   # # A12 Chicken Cutlet
   # menu_category1_menu_item58 = SimpleMenuItem.create({name: "A12-Chicken Cutlet", alt_name: "A12 - Chicken Cutlet",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item58, price:3500.00, is_on_promotion:false}])
@@ -175,7 +176,7 @@ menu_category5 = MenuCategory.create({menu: menu,  name: "Appetizer", alt_name:
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item45, price:6500.00, is_on_promotion:false}])
   # # Grilled Shishamo
   # menu_category1_menu_item46 = SimpleMenuItem.create({name: "Grilled Shishamo", alt_name: "Grilled Shishamo",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}])    
+  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item46, price:5000.00, is_on_promotion:false}])
   # # Party Set A
   # menu_category1_menu_item38 = SimpleMenuItem.create({name: "Party Set A", alt_name: "Party Set A",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item38, price:5500.00, is_on_promotion:false}])
@@ -208,7 +209,7 @@ menu_category5 = MenuCategory.create({menu: menu,  name: "Appetizer", alt_name:
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item64, price:500.00, is_on_promotion:false}])
   # Salad
   # menu_category1_menu_item65 = SimpleMenuItem.create({name: "Salad", alt_name: "",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}])  
+  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item65, price:500.00, is_on_promotion:false}])
 
 # A La Carte
 menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name: "A La Carte", order_by: 7,created_by: "SYSTEM DEFAULT"})
@@ -242,16 +243,16 @@ menu_category7 = MenuCategory.create({menu: menu, name: "A La Carte", alt_name:
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item75, price:4900.00, is_on_promotion:false}])
   # F10 Green Pepper Steak
   menu_category1_menu_item72 = SimpleMenuItem.create({name: "F10-Green Pepper Steak", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3400.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item72, price:3400.00, is_on_promotion:false}])
   # F11 Fried Eggplant with Pork
   menu_category1_menu_item68 = SimpleMenuItem.create({name: "F11-Fried Eggplant with Pork", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item68, price:0.00, is_on_promotion:false}])
   # F12 Spicy Fried Beef
   menu_category1_menu_item69 = SimpleMenuItem.create({name: "F12-Spicy Fried Beef", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:3400.00, is_on_promotion:false}]) 
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item69, price:3400.00, is_on_promotion:false}])
   # F13 Fried Egg with Beef
   menu_category1_menu_item66 = SimpleMenuItem.create({name: "F13-Fried Cabage with Konbu Taste", alt_name: "",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2500.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item66, price:2500.00, is_on_promotion:false}])
 
 # Curry
 menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Curry", order_by: 12,created_by: "SYSTEM DEFAULT"})
@@ -285,19 +286,19 @@ menu_category12 = MenuCategory.create({menu: menu, name: "Curry", alt_name: "Cur
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item1, price:7900.00, is_on_promotion:false}])
   # C10-Fried Chicken Curry Tenshinhan
    menu_category12_menu_item6 = SimpleMenuItem.create({name: "C10-Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:6500.00, is_on_promotion:false}]) 
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category12_menu_item6, price:6500.00, is_on_promotion:false}])
 
 # Rice
 menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice", order_by: 13,created_by: "SYSTEM DEFAULT"})
   # R1-Fried Rice
    menu_category13_menu_item7 = SimpleMenuItem.create({name: "R1-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) 
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}])
   # R2-Kimuchi Fried Rice
   menu_category13_menu_item8 = SimpleMenuItem.create({name: "R2-Kimuchi Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item8, price:4500.00, is_on_promotion:false}])
   # R3-Beef Fried Rice
    menu_category13_menu_item11 = SimpleMenuItem.create({name: "R3-Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) 
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}])
   # R4-Mabo Fried Rice
   menu_category13_menu_item12 = SimpleMenuItem.create({name: "R4-Mabo Fried Rice", alt_name: " ",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item12, price:4500.00, is_on_promotion:false}])
@@ -339,23 +340,23 @@ menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item5, price:5800.00, is_on_promotion:false}])
   # # R6-Fried Prawn Don
   #  menu_category13_menu_item6 = SimpleMenuItem.create({name: "R6-Fried Prawn Don", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}]) 
+  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item6, price:6900.00, is_on_promotion:false}])
   # # R7-Fried Rice
   #  menu_category13_menu_item7 = SimpleMenuItem.create({name: "R7-Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) 
-  #    menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}]) 
-  
+  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Pork)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}])
+  #    menu_item1_instance = MenuItemInstance.create([{item_instance_name:"R7-Fried Rice(Chicken)",menu_item: menu_category13_menu_item7, price:3000.00, is_on_promotion:false}])
+
   # # R9-Crab Tenshinhan
   #  menu_category13_menu_item9 = SimpleMenuItem.create({name: "R9-Crab Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}]) 
+  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item9, price:4500.00, is_on_promotion:false}])
   # # R10-Crab Fried Rice
   # menu_category13_menu_item10 = SimpleMenuItem.create({name: "R10-Crab Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item10, price:4500.00, is_on_promotion:false}])
   # # Beef Fried Rice
   #  menu_category13_menu_item11 = SimpleMenuItem.create({name: "Beef Fried Rice", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}]) 
-  
-  
+  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item11, price:5000.00, is_on_promotion:false}])
+
+
   # # Mabo Tenshinhan
   # menu_category13_menu_item14 = SimpleMenuItem.create({name: "Mabo Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item14, price:5500.00, is_on_promotion:false}])
@@ -367,16 +368,16 @@ menu_category13 = MenuCategory.create({menu: menu, name: "Rice", alt_name: "Rice
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item16, price:7900.00, is_on_promotion:false}])
   # # Fried Chicken Curry Tenshinhan
   #  menu_category13_menu_item17 = SimpleMenuItem.create({name: "Fried Chicken Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}])      
+  #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item17, price:6500.00, is_on_promotion:false}])
   # # Chicken Cutlet Curry Tenshinhan
   #  menu_category13_menu_item18 = SimpleMenuItem.create({name: "Chicken Cutlet Curry Tenshinhan", alt_name: "",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category13_menu_item18, price:7000.00, is_on_promotion:false}])
 
 # Ramen
-menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"})  
+menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Ramen", order_by: 8,created_by: "SYSTEM DEFAULT"})
   # N1 - Sio Ramen
   menu_category1_menu_item80 = SimpleMenuItem.create({name: " N1-Sio Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item80, price:4500.00, is_on_promotion:false}])
   # N2 Syoyu Ramen
   menu_category1_menu_item82 = SimpleMenuItem.create({name: " N2-Syoyu Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item82, price:4500.00, is_on_promotion:false}])
@@ -403,20 +404,20 @@ menu_category8 = MenuCategory.create({menu: menu, name: "Ramen", alt_name: "Rame
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:5500.00, is_on_promotion:false}])
   # N10 Ramen Tossed
   menu_category1_menu_item83 = SimpleMenuItem.create({name: "N10-Ramen Tossed", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:2500.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item83, price:2500.00, is_on_promotion:false}])
   # N11-Fried Noodle with Thick Sauce
   menu_category1_menu_item81 = SimpleMenuItem.create({name: "N11-Fried Noodle with Thick Sauce Fish", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}]) 
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item81, price:5900.00, is_on_promotion:false}])
   # # N6 Spicy Curry Ramen
   # menu_category1_menu_item85 = SimpleMenuItem.create({name: "N6 Spicy Curry Ramen", alt_name: " ",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food })
-  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}])  
-  
+  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item85, price:6000.00, is_on_promotion:false}])
+
   # N12 Cold Ramen
   menu_category1_menu_item79 = SimpleMenuItem.create({name: "N12-Cold Ramen", alt_name: "",menu_category: menu_category8 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item79, price:5000.00, is_on_promotion:false}])
 
 # Ramen Topping
-menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"})  
+menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_name: "Ramen Topping", order_by: 9, created_by: "SYSTEM DEFAULT"})
   # E1-Bamboo Shoot
   menu_category1_menu_item89 = SimpleMenuItem.create({name: "E1-Bamboo Shoot", alt_name: " ",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item89, price:400.00, is_on_promotion:false}])
@@ -432,13 +433,13 @@ menu_category9 = MenuCategory.create({menu: menu, name: "Ramen Topping", alt_nam
   # E5-Green Onion
   menu_category1_menu_item88 = SimpleMenuItem.create({name: "E5-Green Onion ", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item88, price:500.00, is_on_promotion:false}])
-    
+
   # # Half Egg
   # menu_category1_menu_item87 = SimpleMenuItem.create({name: "Half Egg", alt_name: "",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item87, price:300.00, is_on_promotion:false}])
 
 # Udon
-menu_category10 = MenuCategory.create({menu: menu,  name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"})  
+menu_category10 = MenuCategory.create({menu: menu,  name: "Udon", alt_name: "Udon", order_by: 10,created_by: "SYSTEM DEFAULT"})
   # U1 Ebi Ten udon
   menu_category1_menu_item94 = SimpleMenuItem.create({name: "U1-Ebi Ten udon", alt_name: " ",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item94, price:7900.00, is_on_promotion:false}])
@@ -472,7 +473,7 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item200, price:12000.00, is_on_promotion:false}])
   # Grilled Garlic
   menu_category33_menu_item201 = SimpleMenuItem.create({name: "Y2-Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item201, price:1000.00, is_on_promotion:false}])
   # Grilled Shishamo
   menu_category33_menu_item202 = SimpleMenuItem.create({name: "Y3-Grilled Shishamo", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item202, price:5500.00, is_on_promotion:false}])
@@ -487,10 +488,10 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item205, price:2500.00, is_on_promotion:false}])
   # Yakitori
   menu_category33_menu_item206 = SimpleMenuItem.create({name: "Y7-Yakitori", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}])    
-    menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}]) 
-    menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:3000.00, is_on_promotion:false}])    
-    menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3500.00, is_on_promotion:false}])       
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Liver)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}])
+    menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Chicken Thigh)",menu_item: menu_category33_menu_item206, price:2500.00, is_on_promotion:false}])
+    menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Pork Liver)",menu_item: menu_category33_menu_item206, price:3000.00, is_on_promotion:false}])
+    menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Yakitori (Asparagus Bacon)",menu_item: menu_category33_menu_item206, price:3500.00, is_on_promotion:false}])
   # Yakitori Assortment
   menu_category33_menu_item207 = SimpleMenuItem.create({name: "Y8-Yakitori Assortment", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item207, price:4500.00, is_on_promotion:false}])
@@ -499,10 +500,10 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item208, price:3500.00, is_on_promotion:false}])
   # Lady finger (1 piece)
   menu_category33_menu_item209 = SimpleMenuItem.create({name: "Y10-Lady finger", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item209, price:1500.00, is_on_promotion:false}])
   # Chicken Satay (1 piece)
   menu_category33_menu_item210 = SimpleMenuItem.create({name: "Y11-Chicken Satay", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category33_menu_item210, price:3000.00, is_on_promotion:false}])
 
 #Sushi
 menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sushi", order_by: 30, created_by: "SYSTEM DEFAULT"})
@@ -574,14 +575,14 @@ menu_category30 = MenuCategory.create({menu: menu, name: "Sushi", alt_name: "Sus
   # # Soft Shell Crab Roll
   # menu_category30_menu_item207 = SimpleMenuItem.create({name: "Soft Shell Crab Roll", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Soft Shell Crab Roll",menu_item: menu_category30_menu_item207, price:5500.00, is_on_promotion:false}])
-  
+
   # # Apple Salad
   # menu_category30_menu_item209 = SimpleMenuItem.create({name: "Apple Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Apple Salad",menu_item: menu_category30_menu_item209, price:3500.00, is_on_promotion:false}])
   # # Seaweed Salad
   # menu_category30_menu_item2010 = SimpleMenuItem.create({name: "Seaweed Salad", alt_name: "",menu_category: menu_category30 , min_selectable_item: 1, max_selectable_item:1, account: food })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Seaweed Salad",menu_item: menu_category30_menu_item2010, price:3000.00, is_on_promotion:false}])
-  
+
 # set
 menu_category6 = MenuCategory.create({menu: menu,  name: "Set", alt_name: "Set", order_by: 6,created_by: "SYSTEM DEFAULT"})
   # Set A ( Soup + Gyoza 3 pcs)
@@ -610,7 +611,7 @@ menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "D
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])
     menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])
     menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])
-    menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])    
+    menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D2-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])
   # D3-Seasonal Fruits
   menu_category11_menu_item202 = SimpleMenuItem.create({name: "D3-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}])
@@ -619,7 +620,7 @@ menu_category11 = MenuCategory.create({menu: menu, name: "Dessert", alt_name: "D
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}])
   # D5-Red Bean Gyoza
   menu_category15_menu_item201 = SimpleMenuItem.create({name: "D5-Red Bean Gyoza", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}])      
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}])
   # D6-Peanuts Butter Gyoza
   menu_category15_menu_item203 = SimpleMenuItem.create({name: "D6-Peanuts Butter Gyoza", alt_name: " ",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category15_menu_item203, price:3000.00, is_on_promotion:false}])
@@ -677,7 +678,7 @@ menu_category16 = MenuCategory.create({menu: menu, name: "Extra", alt_name: "Ext
 # menu_category14 = MenuCategory.create({menu: menu, name: "Kids Set", alt_name: "Kids Set", order_by: 14,created_by: "SYSTEM DEFAULT"})
  # Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs)
  # menu_category14_menu_item1 = SimpleMenuItem.create({name: "Kids Set A (Fried Rice+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food })
- #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}])      
+ #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item1, price:3500.00, is_on_promotion:false}])
  # # Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)
  # menu_category14_menu_item2 = SimpleMenuItem.create({name: "Kids Set B (Ramen+Fried Potato+Gyoza 2pcs)", alt_name: "",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food })
  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category14_menu_item2, price:4500.00, is_on_promotion:false}])
@@ -728,17 +729,17 @@ menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name:
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item5, price:2500.00, is_on_promotion:false}])
   # Cafe' latte
    menu_category17_menu_item6 = SimpleMenuItem.create({name: "Cafe' latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}]) 
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item6, price:2500.00, is_on_promotion:false}])
   # Matcha latte
    menu_category17_menu_item7 = SimpleMenuItem.create({name: "Matcha latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}])        
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item7, price:2500.00, is_on_promotion:false}])
   # Cafe' Mocha
   menu_category17_menu_item10 = SimpleMenuItem.create({name: "Cafe' Mocha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item10, price:3000.00, is_on_promotion:false}])
   # Flavor latte
    menu_category17_menu_item11 = SimpleMenuItem.create({name: "Flavor latte", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) 
-     menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazenut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}]) 
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Caramel)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}])
+     menu_item1_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Hazenut)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}])
      menu_item2_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Almond)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}])
      menu_item3_instance = MenuItemInstance.create([{item_instance_name:"Flavor latte (Butter scotch)",menu_item: menu_category17_menu_item11, price:3000.00, is_on_promotion:false}])
   # Roasted Almond Matchal latte
@@ -746,7 +747,7 @@ menu_category17 = MenuCategory.create({menu: menu, name: "Hot Drinks", alt_name:
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item12, price:3000.00, is_on_promotion:false}])
   # Coconut Matcha latte
   menu_category17_menu_item13 = SimpleMenuItem.create({name: "Coconut Matcha", alt_name: "",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category17_menu_item13, price:3000.00, is_on_promotion:false}])
 
 # Cold Drinks
 menu_category3 = MenuCategory.create({menu: menu,name: "Cold Drinks", alt_name: "Cold Drinks", order_by: 3,created_by: "SYSTEM DEFAULT"})
@@ -800,19 +801,19 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seas
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item5, price:1500.00, is_on_promotion:false}])
   # Papaya Juice
    menu_category20_menu_item6 = SimpleMenuItem.create({name: "Papaya Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item6, price:1500.00, is_on_promotion:false}]) 
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item6, price:1500.00, is_on_promotion:false}])
   # Avocado Juice
    menu_category20_menu_item7 = SimpleMenuItem.create({name: "Avocado Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}])       
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item7, price:2000.00, is_on_promotion:false}])
   # Kiwi Juice
    menu_category20_menu_item9 = SimpleMenuItem.create({name: "Kiwi Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item9, price:2000.00, is_on_promotion:false}]) 
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item9, price:2000.00, is_on_promotion:false}])
   # Mango Juice
   menu_category20_menu_item10 = SimpleMenuItem.create({name: "Mango Juice", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item10, price:2000.00, is_on_promotion:false}])
   # Lime Soda
    menu_category20_menu_item11 = SimpleMenuItem.create({name: "Lime Soda", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item11, price:2000.00, is_on_promotion:false}]) 
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item11, price:2000.00, is_on_promotion:false}])
   # # Ice
   # menu_category20_menu_item12 = SimpleMenuItem.create({name: "Ice", alt_name: " ",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item12, price:500.00, is_on_promotion:false}])
@@ -821,7 +822,7 @@ menu_category20 = MenuCategory.create({menu: menu, name: "Drink(Fresh Juice Seas
   #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item13, price:1500.00, is_on_promotion:false}])
   # # Snow Tower
   # menu_category20_menu_item14 = SimpleMenuItem.create({name: "Snow Tower", alt_name: "",menu_category: menu_category20 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}])  
+  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category20_menu_item14, price:200.00, is_on_promotion:false}])
 
 #Smoothies
 menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name: "Smoothies", order_by: 23, created_by: "SYSTEM DEFAULT"})
@@ -839,7 +840,7 @@ menu_category23 = MenuCategory.create({menu: menu, name: "Smoothies", alt_name:
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item201, price:3500.00, is_on_promotion:false}])
   # Mango Smoothie
   menu_category23_menu_item205 = SimpleMenuItem.create({name: "Mango Smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item205, price:3500.00, is_on_promotion:false}])
   # Blueberry smoothie
   menu_category23_menu_item203 = SimpleMenuItem.create({name: "Blueberry smoothie", alt_name: "",menu_category: menu_category23 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category23_menu_item203, price:3500.00, is_on_promotion:false}])
@@ -930,16 +931,16 @@ menu_category18 = MenuCategory.create({menu: menu, name: "Beer", alt_name: "Beer
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item200, price:1500.00, is_on_promotion:false}])
   # Kirin Ichiban Draft Beer
   menu_category18_menu_item201 = SimpleMenuItem.create({name: "Kirin Ichiban Draft Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}])      
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item201, price:1800.00, is_on_promotion:false}])
   # Myanmar Beer
   menu_category18_menu_item202 = SimpleMenuItem.create({name: "Myanmar Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item202, price:2000.00, is_on_promotion:false}])
   # Tuborg Beer
   menu_category18_menu_item203 = SimpleMenuItem.create({name: "Tuborg Beer", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}])  
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category18_menu_item203, price:2100.00, is_on_promotion:false}])
   # # Wine by the Glass
   # menu_category18_menu_item204 = SimpleMenuItem.create({name: "Wine by the Glass", alt_name: "",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}])  
+  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Wine by the Glass",menu_item: menu_category18_menu_item204, price:3000.00, is_on_promotion:false}])
 
 #Japanese Sake
 menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_name: "Japanese Sake", order_by: 25, created_by: "SYSTEM DEFAULT"})
@@ -958,9 +959,9 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na
   # Lichiko Silhouette 720ml
   menu_category25_menu_item200 = SimpleMenuItem.create({name: "Lichiko Silhouette 720ml", alt_name: " ",menu_category: menu_category25 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category25_menu_item200, price:39000.00, is_on_promotion:false}])
-  
+
 # # Cocktail
-# menu_category26 = MenuCategory.create({menu: menu,  name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"})  
+# menu_category26 = MenuCategory.create({menu: menu,  name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"})
 #   # Moscow's Sky
 #   menu_category1_menu_item200 = SimpleMenuItem.create({name: "Moscow's Sky", alt_name: " ",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
 #     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item200, price:3500.00, is_on_promotion:false}])
@@ -1035,7 +1036,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na
 #     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Chocolate",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])
 #     menu_item1_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Green Tea",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])
 #     menu_item2_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Strawberry",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])
-#     menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])    
+#     menu_item3_instance = MenuItemInstance.create([{item_instance_name:"D5-Ice Cream Vanilla",menu_item: menu_category11_menu_item201, price:1500.00, is_on_promotion:false}])
 #   # D6-Seasonal Fruits
 #   menu_category11_menu_item202 = SimpleMenuItem.create({name: "D6-Seasonal Fruits", alt_name: "",menu_category: menu_category11 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
 #     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D6-Seasonal Fruits",menu_item: menu_category11_menu_item202, price:1500.00, is_on_promotion:false}])
@@ -1053,13 +1054,13 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na
 #     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D1-Peanuts Butter Gyoza",menu_item: menu_category15_menu_item200, price:3000.00, is_on_promotion:false}])
 #   # D2-Red Bean Gyoza
 #   menu_category15_menu_item201 = SimpleMenuItem.create({name: "D2-Red Bean Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-#     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}])      
+#     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D2-Red Bean Gyoza",menu_item: menu_category15_menu_item201, price:2500.00, is_on_promotion:false}])
 #   # D3-Banana Gyoza
 #   menu_category15_menu_item202 = SimpleMenuItem.create({name: "D3-Banana Gyoza", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
 #     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"D3-Banana Gyoza",menu_item: menu_category15_menu_item202, price:2500.00, is_on_promotion:false}])
 #   # Dessert Gyoza 2Pcs
 #   menu_category15_menu_item203 = SimpleMenuItem.create({name: "Dessert Gyoza 2Pcs", alt_name: "",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-#     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}])  
+#     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Dessert Gyoza 2Pcs",menu_item: menu_category15_menu_item203, price:1000.00, is_on_promotion:false}])
 
 # # Green Tea
 # menu_category19 = MenuCategory.create({menu: menu, name: "Green Tea", alt_name: "Green Tea", order_by: 19, created_by: "SYSTEM DEFAULT"})
@@ -1068,7 +1069,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na
 #     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot Green Tea",menu_item: menu_category19_menu_item200, price:1500.00, is_on_promotion:false}])
 #   # Ice Green Tea
 #   menu_category19_menu_item201 = SimpleMenuItem.create({name: "Ice Green Tea", alt_name: "",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-#     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Green Tea",menu_item: menu_category19_menu_item201, price:1500.00, is_on_promotion:false}])      
+#     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Ice Green Tea",menu_item: menu_category19_menu_item201, price:1500.00, is_on_promotion:false}])
 
 # # Chinese Tea
 # menu_category31 = MenuCategory.create({menu: menu, name: "Chinese Tea", alt_name: "Chinese Tea", order_by: 31, created_by: "SYSTEM DEFAULT"})
@@ -1077,7 +1078,7 @@ menu_category25 = MenuCategory.create({menu: menu, name: "Japanese Sake", alt_na
 #     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Hot China Tea",menu_item: menu_category19_menu_item200, price:500.00, is_on_promotion:false}])
 #   # Cold China Tea
 #   menu_category19_menu_item201 = SimpleMenuItem.create({name: "Cold China Tea", alt_name: "",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-#     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cold China Tea",menu_item: menu_category19_menu_item201, price:500.00, is_on_promotion:false}])      
+#     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cold China Tea",menu_item: menu_category19_menu_item201, price:500.00, is_on_promotion:false}])
 
 # Wine
 menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine", order_by: 32, created_by: "SYSTEM DEFAULT"})
@@ -1086,16 +1087,16 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item200, price:0.00, is_on_promotion:false}])
   # Cabernet Sauvignon Viejo Vivedo
   menu_category32_menu_item201 = SimpleMenuItem.create({name: "Cabernet Sauvignon Viejo Vivedo(Argentina)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}])          
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:20000.00, is_on_promotion:false}])
   # Church lane (South Australia)
   menu_category32_menu_item202 = SimpleMenuItem.create({name: "Church lane (South Australia)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:25000.00, is_on_promotion:false}])
   # Chardonnay Layer Cake
   menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chardonnay Layer Cake(Napa Valley)", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:30000.00, is_on_promotion:false}])
 
 # Cocktail
-menu_category26 = MenuCategory.create({menu: menu,  name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"})  
+menu_category26 = MenuCategory.create({menu: menu,  name: "Cocktail", alt_name: "Cocktail", order_by: 26,created_by: "SYSTEM DEFAULT"})
   # Crane at Lakeside
   menu_category1_menu_item202 = SimpleMenuItem.create({name: "Crane at Lakeside (Sake, Lime, Green, Apple)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item202, price:2500.00, is_on_promotion:false}])
@@ -1116,10 +1117,10 @@ menu_category26 = MenuCategory.create({menu: menu,  name: "Cocktail", alt_name:
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item207, price:3500.00, is_on_promotion:false}])
   # Kyoto Temptation
    menu_category1_menu_item206 = SimpleMenuItem.create({name: "Kyoto Temptation (Lichiko, Lime, Passion)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}])  
+     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item206, price:4500.00, is_on_promotion:false}])
   # Tokyo Sunset
   menu_category1_menu_item201 = SimpleMenuItem.create({name: "Tokyo Sunset (Lichiko, Vodka, Lime, Strawberry)", alt_name: "",menu_category: menu_category26 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item201, price:4500.00, is_on_promotion:false}])
 
 # Spirits
 menu_category32 = MenuCategory.create({menu: menu, name: "Spirits", alt_name: "Spirits", order_by: 32, created_by: "SYSTEM DEFAULT"})
@@ -1128,22 +1129,22 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Spirits", alt_name: "S
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item200, price:45000.00, is_on_promotion:false}])
   # Johanny Walker Double Limited
   menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Double Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}])          
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:50000.00, is_on_promotion:false}])
   # Johanny Walker Black Limited
   menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Black Limited", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:48000.00, is_on_promotion:false}])
   # Glenffich 12 years
   menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 12 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:54000.00, is_on_promotion:false}])
   # Glenffich 15 years
   menu_category32_menu_item203 = SimpleMenuItem.create({name: "Glenffich 15 years", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:75000.00, is_on_promotion:false}])
   # Chivas Extra
   menu_category32_menu_item203 = SimpleMenuItem.create({name: "Chivas Extra", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}])    
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item203, price:70000.00, is_on_promotion:false}])
   # Johanny Walker Gold Tin Pack
   menu_category32_menu_item201 = SimpleMenuItem.create({name: "Johanny Walker Gold Tin Pack", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}])          
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item201, price:75000.00, is_on_promotion:false}])
   # Johanny Walker Platinum
   menu_category32_menu_item202 = SimpleMenuItem.create({name: "Johanny Walker Platinum", alt_name: "",menu_category: menu_category32 , min_selectable_item: 1, max_selectable_item:1, account: beverage })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category32_menu_item202, price:82000.00, is_on_promotion:false}])