diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 9e967e54..83646c92 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -47,10 +47,6 @@ $(document).ready(function(){ // Enable/Disable Button control_button(order_status); - //for customer button - $("#customer").removeAttr('disabled'); - - var customer_id=$(this).find(".customer-id").text(); show_customer_details(customer_id); diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 22c0c119..3f453565 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -11,8 +11,7 @@ class Origami::HomeController < BaseOrigamiController @selected_item = Order.find(params[:booking_id]) @selected_item_type="Order" end - end - puts params[:booking_id] + end @completed_orders = Order.get_completed_order() @booking_orders = Order.get_booking_order_table() diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 58ba0b11..b6bfdfaa 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -9,7 +9,7 @@ class Origami::RequestBillsController < BaseOrigamiController check_booking = Booking.find_by_booking_id(booking_id) if check_booking.sale_id.nil? # Create Sale if it doesn't exist - @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee.name) + @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee) @sale_data = Sale.find_by_sale_id(@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id) else diff --git a/app/models/order.rb b/app/models/order.rb index 397bd2f3..aa6cb26f 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -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") diff --git a/app/models/sale.rb b/app/models/sale.rb index 5adb8a33..426ece2d 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -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}" diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 43ee0ada..09d9b7ef 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -31,28 +31,28 @@ customer_id = "" # For CSS- Class for Order? Sale? - sale_status="" - if cpo.order_status == 'new' - unique_id=cpo.booking_id + # sale_status="" + # if cpo.order_status == 'new' + # unique_id=cpo.booking_id - customer_id=cpo.order_customer_id - # check selected item and assign - if @selected_item != nil - if cpo.order_id == @selected_item.order_id - sale_status = sale_status + " selected-item" - end - end - else - unique_id=cpo.sale_id - customer_id=cpo.sale_customer_id - sale_status="paid" - # check selected item and assign - if @selected_item != nil - if unique_id == @selected_item.sale_id - sale_status = sale_status + " selected-item" - end + # customer_id=cpo.order_customer_id + # # check selected item and assign + # if @selected_item_type == "Sale" + # if cpo.order_id == @selected_item.order_id + # sale_status = sale_status + " selected-item" + # end + # end + # else + unique_id=cpo.sale_id + customer_id=cpo.sale_customer_id + sale_status="paid" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" end end + # end %>
@@ -64,12 +64,12 @@

Receipt No : - <%= cpo.sale_status %> + <%= cpo.receipt_no %>

Order Status : - <%= cpo.order_status %> + <%= cpo.sale_status %>

@@ -100,11 +100,11 @@ unique_id=bko.booking_id customer_id=bko.order_customer_id # check selected item and assign - if !@selected_item.nil? - if bko.order_id == @selected_item.order_id - sale_status = sale_status + " selected-item" - end - end + # if @selected_item != nil + # if bko.order_id == @selected_item.order_id + # sale_status = sale_status + " selected-item" + # end + # end else unique_id=bko.sale_id customer_id=bko.sale_customer_id @@ -162,11 +162,11 @@ unique_id=rmo.booking_id customer_id=rmo.order_customer_id # check selected item and assign - if @selected_item != nil - if rmo.order_id == @selected_item.order_id - sale_status = sale_status + " selected-item" - end - end + # if @selected_item != nil + # if rmo.order_id == @selected_item.order_id + # sale_status = sale_status + " selected-item" + # end + # end else unique_id=rmo.sale_id customer_id=rmo.sale_customer_id @@ -223,11 +223,11 @@ if odr.order_status == 'new' unique_id=odr.booking_id customer_id = odr.order_customer_id - if @selected_item != nil - if odr.order_id == @selected_item.order_id - sale_status = sale_status + " selected-item" - end - end + # if @selected_item != nil + # if odr.order_id == @selected_item.order_id + # sale_status = sale_status + " selected-item" + # end + # end else unique_id=odr.sale_id customer_id = odr.sale_customer_id