confict clear

app/models/dining_facility.rb

@@ -1,6 +1,9 @@
 class DiningFacility < ApplicationRecord
   belongs_to :zone
 
+  TABLE_TYPE = "Table"
+  ROOM_TYPE = "Room"
+
   default_scope { order('order_by asc') }
 
   scope :active, -> {where(is_active: true)}

app/models/order.rb

@@ -201,4 +201,40 @@ class Order < ApplicationRecord
     #Send to background job for processing
     OrderQueueProcessorJob.perform_later(self.id)
   end
+
+  #Origami: Cashier : to view order type Table
+  def self.get_order_table
+    order_table = Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price,
+        order_items.id as order_items_id,dining_facilities.name as table_name")
+        .joins("left join booking_orders on booking_orders.order_id = orders.id
+        left join bookings on bookings.id = booking_orders.id
+        left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
+        left join order_items on order_items.order_id = orders.id")
+        .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
+        .group("orders.id") 
+  end
+   #Origami: Cashier : to view order type Room
+  def self.get_order_rooms
+    order_rooms = Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price,
+          order_items.id as order_items_id,dining_facilities.name as room_name")
+          .joins("left join booking_orders on booking_orders.order_id = orders.id
+          left join bookings on bookings.id = booking_orders.id
+          left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
+          left join order_items on order_items.order_id = orders.id")
+          .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,"dine_in",true)
+          .group("orders.id")
+  end
+  #Origami: Cashier : to view orders
+  def self.get_orders
+    from = Time.now.beginning_of_day.utc
+    to = Time.now.end_of_day.utc
+    orders = Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price,
+          order_items.id as order_items_id,dining_facilities.name as table_or_room_name")
+          .joins("left join booking_orders on booking_orders.order_id = orders.id
+          left join bookings on bookings.id = booking_orders.id
+          left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
+          left join order_items on order_items.order_id = orders.id")
+          .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
+          .group("orders.id")
+  end
 end

app/models/order_item.rb

@@ -33,4 +33,10 @@ class OrderItem < ApplicationRecord
 
 
   end
+  #Origami : Cashier : to show order items details
+  def self.get_order_items_details(order_id)
+    order_details = OrderItem.select("order_items.item_name,order_items.qty,order_items.price,(order_items.qty*order_items.price) as total_price")
+         .joins("left join orders on orders.id = order_items.order_id")
+         .where("order_items.order_id=?",order_id)     
+  end
 end

app/models/sale.rb

@@ -188,7 +188,8 @@ class Sale < ApplicationRecord
       sale_tax.tax_name = tax.name
       sale_tax.tax_rate = tax.rate
       #include or execulive
-      sale_tax.tax_payable_amount = total_taxable  * tax.rate
+      # sale_tax.tax_payable_amount = total_taxable  * tax.rate
+      sale_tax.tax_payable_amount = total_taxable  * tax.rate / 100
       #new taxable amount
       total_taxable = total_taxable + sale_tax.tax_payable_amount