This commit is contained in:
Nweni
2017-07-02 11:22:49 +06:30
parent 97c70fb72b
commit acca5b5a1d
5 changed files with 35 additions and 22 deletions

View File

@@ -5,7 +5,7 @@ class Api::BillController < Api::ApiController
def create def create
@status = false @status = false
@error_message = "Order ID or Booking ID is require to request for a bill." @error_message = "Order ID or Booking ID is require to request for a bill."
if ShiftSale.current_shift
#create Bill by Booking ID #create Bill by Booking ID
if (params[:booking_id]) if (params[:booking_id])
booking = Booking.find(params[:booking_id]) booking = Booking.find(params[:booking_id])
@@ -24,7 +24,10 @@ class Api::BillController < Api::ApiController
@sale = Sale.new @sale = Sale.new
@status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier) @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
end end
else
@status = false
@error_message = "No Current Open Shift"
end
# Not Use for these printed bill cannot give customer # Not Use for these printed bill cannot give customer
# @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)

View File

@@ -4,6 +4,8 @@ class Origami::ShiftsController < BaseOrigamiController
end end
def show def show
puts ">>>>>"
puts current_user.id
@shift = ShiftSale.current_open_shift(current_user.id) @shift = ShiftSale.current_open_shift(current_user.id)
end end

View File

@@ -16,11 +16,17 @@ class ShiftSale < ApplicationRecord
belongs_to :cashier_terminal belongs_to :cashier_terminal
belongs_to :employee, :foreign_key => 'employee_id' belongs_to :employee, :foreign_key => 'employee_id'
def self.current_shift
today_date = DateTime.now.strftime("%Y-%m-%d")
shift = ShiftSale.where("DATE(shift_started_at)=? and shift_started_at is not null and shift_closed_at is null",today_date).take
return shift
end
def self.current_open_shift(current_user) def self.current_open_shift(current_user)
#if current_user #if current_user
#find open shift where is open today and is not closed and login by current cashier #find open shift where is open today and is not closed and login by current cashier
today_date = DateTime.now.strftime("%Y-%m-%d") today_date = DateTime.now.strftime("%Y-%m-%d")
shift = ShiftSale.where("DATE(shift_started_at)= #{ today_date } and shift_started_at is not null and shift_closed_at is null and employee_id = #{current_user}").take shift = ShiftSale.where("DATE(shift_started_at)=? and shift_started_at is not null and shift_closed_at is null and employee_id = #{current_user}",today_date).take
return shift return shift
#end #end
end end

View File

@@ -163,18 +163,18 @@
</thead> </thead>
<tbody> <tbody>
<% <%
count = 0 count = 0
sub_total = 0 sub_total = 0
if @status_sale == "sale" if @status_sale == "sale"
@sale_array[0].sale_items.each do |sale_item| @sale_array[0].sale_items.each do |sale_item|
count += 1
sub_total = sub_total + sale_item.price sub_total = sub_total + sale_item.price
%> %>
<input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>"> <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
<% <%
# Can't check for discount # Can't check for discount
unless sale_item.price == 0 unless sale_item.price == 0
count += 1
%> %>
<tr> <tr>
<td><%= count %></td> <td><%= count %></td>

View File

@@ -334,6 +334,7 @@ $( document ).ready(function() {
}); });
$('#pay').click(function() { $('#pay').click(function() {
$('#pay').text("Processing, Please wait!")
if($('#balance').text() > 0){ if($('#balance').text() > 0){
alert(" Insufficient Amount!") alert(" Insufficient Amount!")
}else{ }else{
@@ -351,6 +352,7 @@ $( document ).ready(function() {
if($('#balance').text() < 0){ if($('#balance').text() < 0){
alert("Changed amount " + $('#balance').text() * (-1) ) alert("Changed amount " + $('#balance').text() * (-1) )
}else{ }else{
$('#pay').text("Pay")
alert("Thank you") alert("Thank you")
} }