merge with master

app/models/menu.rb

@@ -31,4 +31,22 @@ class Menu < ApplicationRecord
       menu.destroy
       return false
   end
-end
+
+  def self.to_csv
+    m_attributes = %w{name is_active valid_days valid_time_from valid_time_to created_by created_at updated_at}    
+    CSV.generate(headers: true) do |csv|
+      csv << m_attributes
+      menu = Menu.all
+      menu.each do |user|
+        csv << m_attributes.map{ |attr| user.send(attr)}
+      end
+    end
+  end
+
+  def self.import(file)
+      CSV.foreach(file.path, headers:true) do |row|
+      Menu.create! row.to_hash
+    end  
+  end
+
+end

app/models/menu_category.rb

@@ -1,7 +1,7 @@
 class MenuCategory < ApplicationRecord  
   # before_create :generate_menu_category_code
 
-  belongs_to :menu
+  belongs_to :menu , counter_cache: true
   has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id"
   belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true
   has_many :menu_items
@@ -83,4 +83,19 @@ class MenuCategory < ApplicationRecord
   # def generate_menu_category_code        
   #   self.code = SeedGenerator.generate_code(self.class.name, "C")    
   # end
+
+  def self.to_csv
+   
+    mc_attributes = %w{id menu_id code name alt_name order_by created_by menu_category_id is_available created_at updated_at}
+    CSV.generate(headers: true) do |csv|
+      csv << mc_attributes
+
+      csv << mc_attributes
+      MenuCategory.all.each do |user|
+        puts user
+        csv << mc_attributes.map{ |attr| user.send(attr)}
+      end
+    end
+
+  end
 end

app/models/order.rb

@@ -135,7 +135,7 @@ class Order < ApplicationRecord
 
       #loop to add all items to order
       ordered_list.each do |item|
-       
+
         menu_item = MenuItem.search_by_item_code(item[:item_instance_code])
         
         # For Product while item code not in menu item
@@ -152,7 +152,7 @@ class Order < ApplicationRecord
               item[:sub_items].each do |si|
                 # Retrive instance's Price
                 set_item = MenuItem.search_by_item_code(si[:item_instance_code])
-                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
+                set_order_items.push({"item_instance_code"=>si[:item_instance_code], "item_instance_name"=>set_item[:name], "quantity"=>si[:quantity], "price"=>set_item[:price], "options"=>si[:options]})
               end
             end
             set_order_items = set_order_items.to_json
@@ -339,17 +339,17 @@ class Order < ApplicationRecord
   #Process order items and send to order queue
   def self.pay_process_order_queue(id,table_id)
     sidekiq      = Lookup.find_by_lookup_type("sidekiq")
-   if !sidekiq.nil?
-          OrderQueueProcessorJob.perform_later(id, table_id)
-          else
-            order        = Order.find(id) 
-            if order
-              oqs = OrderQueueStation.new
-              oqs.process_order(order, table_id)
-            end
-            assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
-            ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
-          end
+    if !sidekiq.nil?
+      OrderQueueProcessorJob.perform_later(id, table_id)
+    else
+      order        = Order.find(id) 
+      if order
+        oqs = OrderQueueStation.new
+        oqs.process_order(order, table_id)
+      end
+      assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
+      ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+    end
   end
   
   def check_cup_status(status)

app/models/order_item.rb

@@ -5,7 +5,8 @@ class OrderItem < ApplicationRecord
   before_create :generate_custom_id
 
   #Associations
-  belongs_to :order, autosave: true
+   belongs_to :order, autosave: true
+   # belongs_to :order, counter_cache: true
 
   #Validation
   validates_presence_of :item_code, :item_name, :qty

app/models/tax_profile.rb

@@ -1,5 +1,5 @@
 class TaxProfile < ApplicationRecord
   default_scope { order('order_by asc') }
   # validations
-  validates_presence_of :name, :rate
+  validates_presence_of :name, :rate, :group_type
 end