diff --git a/app/models/order.rb b/app/models/order.rb index 54e02b83..8c456a2c 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -208,8 +208,7 @@ class Order < ApplicationRecord OrderBroadcastJob.perform_later(self.id) end - #Origami: Cashier : to view order type Table - + #Origami: Cashier : to view order Table def self.get_order_table order_table = Order.select("orders.order_id as order_id,sum(order_items.qty*order_items.price) as total_price, order_items.order_items_id as order_items_id,dining_facilities.name as table_name") @@ -221,6 +220,7 @@ class Order < ApplicationRecord .group("orders.order_id, order_items.order_items_id,dining_facilities.name") end + #Origami: Cashier : to view booking order Table def self.get_booking_order_table booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") diff --git a/db/migrate/20170331024749_create_menu_items.rb b/db/migrate/20170331024749_create_menu_items.rb index a67156c5..ce6d1486 100644 --- a/db/migrate/20170331024749_create_menu_items.rb +++ b/db/migrate/20170331024749_create_menu_items.rb @@ -1,3 +1,4 @@ + class CreateMenuItems < ActiveRecord::Migration[5.1] def change create_table :menu_items do |t| diff --git a/db/seeds.rb b/db/seeds.rb index fd9a9e96..c90bfff5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -107,7 +107,7 @@ menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Sample Men #Default Menu items menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) -menu_item0_instance = MenuItemInstance.create([{item_instance_name:"half portion",item_instance_code:"01001-1", menu_item: menu_category1_menu_item0, price:12.00, is_on_promotion:false}]) +menu_item0_instance = MenuItemInstance.create([{item_instance_name:"half portion",item_instance_code:"II0101", menu_item: menu_category1_menu_item0, price:12.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"full portion",item_instance_code:"01001-2", menu_item: menu_category1_menu_item0, price:18.00, is_on_promotion:false}]) menu_category1_menu_item1 = SetMenuItem.create({item_code:"I004", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 , account: food})