add cashier in sale and origami ui updated

This commit is contained in:
Yan
2017-06-14 16:51:25 +06:30
parent 7d6414cce6
commit 41e9aec389
6 changed files with 45 additions and 45 deletions

View File

@@ -239,7 +239,7 @@ class Order < ApplicationRecord
#Origami: Cashier : to view booking order Table
def self.get_completed_order
completed_orders = Booking.select("sales.receipt_no,orders.status as order_status,orders.order_id,
completed_orders = Booking.select("sales.receipt_no, sales.sale_status, orders.status as order_status,orders.order_id,
bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id")
.joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
.joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")

View File

@@ -56,7 +56,12 @@ class Sale < ApplicationRecord
#Default Tax - Values
self.tax_type = "exclusive"
self.requested_by = requested_by
# set cashier by current login
self.cashier_id = requested_by.id
self.cashier_name = requested_by.name
self.requested_by = requested_by.name
self.requested_at = DateTime.now.utc
Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}"