git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add cashier in sale and origami ui updated

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/origami.js
View File

@@ -47,10 +47,6 @@ $(document).ready(function(){
// Enable/Disable Button // Enable/Disable Button
control_button(order_status); control_button(order_status);
//for customer button
$("#customer").removeAttr('disabled');
var customer_id=$(this).find(".customer-id").text(); var customer_id=$(this).find(".customer-id").text();
show_customer_details(customer_id); show_customer_details(customer_id);

1
app/controllers/origami/home_controller.rb
View File

@@ -12,7 +12,6 @@ class Origami::HomeController < BaseOrigamiController
@selected_item_type="Order" @selected_item_type="Order"
end end
end end
puts params[:booking_id]
@completed_orders = Order.get_completed_order() @completed_orders = Order.get_completed_order()
@booking_orders = Order.get_booking_order_table() @booking_orders = Order.get_booking_order_table()

2
app/controllers/origami/request_bills_controller.rb
View File

@@ -9,7 +9,7 @@ class Origami::RequestBillsController < BaseOrigamiController
check_booking = Booking.find_by_booking_id(booking_id) check_booking = Booking.find_by_booking_id(booking_id)
if check_booking.sale_id.nil? if check_booking.sale_id.nil?
# Create Sale if it doesn't exist # 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_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id)
else else

2
app/models/order.rb
View File

@@ -239,7 +239,7 @@ class Order < ApplicationRecord
#Origami: Cashier : to view booking order Table #Origami: Cashier : to view booking order Table
def self.get_completed_order 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") 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 booking_orders on booking_orders.booking_id = bookings.booking_id")
.joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")

7
app/models/sale.rb
View File

@@ -56,7 +56,12 @@ class Sale < ApplicationRecord
#Default Tax - Values #Default Tax - Values
self.tax_type = "exclusive" 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 self.requested_at = DateTime.now.utc
Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}" Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}"

72
app/views/origami/home/index.html.erb
View File

@@ -31,28 +31,28 @@
customer_id = "" customer_id = ""
# For CSS- Class for Order? Sale? # For CSS- Class for Order? Sale?
sale_status="" # sale_status=""
if cpo.order_status == 'new' # if cpo.order_status == 'new'
unique_id=cpo.booking_id # unique_id=cpo.booking_id
customer_id=cpo.order_customer_id # customer_id=cpo.order_customer_id
# check selected item and assign # # check selected item and assign
if @selected_item != nil # if @selected_item_type == "Sale"
if cpo.order_id == @selected_item.order_id # if cpo.order_id == @selected_item.order_id
sale_status = sale_status + " selected-item" # sale_status = sale_status + " selected-item"
end # end
end # end
else # else
unique_id=cpo.sale_id unique_id=cpo.sale_id
customer_id=cpo.sale_customer_id customer_id=cpo.sale_customer_id
sale_status="paid" sale_status="paid"
# check selected item and assign # check selected item and assign
if @selected_item != nil if @selected_item != nil
if unique_id == @selected_item.sale_id if unique_id == @selected_item.sale_id
sale_status = sale_status + " selected-item" sale_status = sale_status + " selected-item"
end
end end
end end
# end
%> %>
<div class="card orders <%= sale_status %>"> <div class="card orders <%= sale_status %>">
<div class="card-block"> <div class="card-block">
@@ -64,12 +64,12 @@
<p class="card-text"> <p class="card-text">
Receipt No : Receipt No :
<span class="orders-receipt-no"> <span class="orders-receipt-no">
<%= cpo.sale_status %> <%= cpo.receipt_no %>
</span> </span>
</p> </p>
<p class="card-text"> <p class="card-text">
Order Status : Order Status :
<span class="orders-order-status"><%= cpo.order_status %></span> <span class="orders-order-status"><%= cpo.sale_status %></span>
</small> </small>
</p> </p>
</div> </div>
@@ -100,11 +100,11 @@
unique_id=bko.booking_id unique_id=bko.booking_id
customer_id=bko.order_customer_id customer_id=bko.order_customer_id
# check selected item and assign # check selected item and assign
if !@selected_item.nil? # if @selected_item != nil
if bko.order_id == @selected_item.order_id # if bko.order_id == @selected_item.order_id
sale_status = sale_status + " selected-item" # sale_status = sale_status + " selected-item"
end # end
end # end
else else
unique_id=bko.sale_id unique_id=bko.sale_id
customer_id=bko.sale_customer_id customer_id=bko.sale_customer_id
@@ -162,11 +162,11 @@
unique_id=rmo.booking_id unique_id=rmo.booking_id
customer_id=rmo.order_customer_id customer_id=rmo.order_customer_id
# check selected item and assign # check selected item and assign
if @selected_item != nil # if @selected_item != nil
if rmo.order_id == @selected_item.order_id # if rmo.order_id == @selected_item.order_id
sale_status = sale_status + " selected-item" # sale_status = sale_status + " selected-item"
end # end
end # end
else else
unique_id=rmo.sale_id unique_id=rmo.sale_id
customer_id=rmo.sale_customer_id customer_id=rmo.sale_customer_id
@@ -223,11 +223,11 @@
if odr.order_status == 'new' if odr.order_status == 'new'
unique_id=odr.booking_id unique_id=odr.booking_id
customer_id = odr.order_customer_id customer_id = odr.order_customer_id
if @selected_item != nil # if @selected_item != nil
if odr.order_id == @selected_item.order_id # if odr.order_id == @selected_item.order_id
sale_status = sale_status + " selected-item" # sale_status = sale_status + " selected-item"
end # end
end # end
else else
unique_id=odr.sale_id unique_id=odr.sale_id
customer_id = odr.sale_customer_id customer_id = odr.sale_customer_id