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

shift

Browse Source
This commit is contained in:
Nweni
2017-06-29 18:59:17 +06:30
parent 11c3be8f4a
commit 8046bc7745
9 changed files with 119 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/origami/cash_ins_controller.rb
View File

@@ -11,5 +11,8 @@ class Origami::CashInsController < BaseOrigamiController
payment_method_reference = params[:payment_method_reference]
p_jour = PaymentJournal.new
p_jour.cash_in(reference, remark, amount, payment_method, payment_method_reference, current_user.id)
shift = ShiftSale.current_open_shift(current_user.id)
shift.cash_in = shift.cash_in + amount.to_i
shift.save
end
end

3
app/controllers/origami/cash_outs_controller.rb
View File

@@ -9,5 +9,8 @@ class Origami::CashOutsController < BaseOrigamiController
amount = params[:amount]
p_jour = PaymentJournal.new
p_jour.cash_out(reference, remark, amount, current_user.id)
shift = ShiftSale.current_open_shift(current_user.id)
shift.cash_out = shift.cash_out + amount.to_i
shift.save
end
end

5
app/controllers/origami/shifts_controller.rb
View File

@@ -18,9 +18,12 @@ class Origami::ShiftsController < BaseOrigamiController
end
def update_shift
@shift = ShiftSale.current_open_shift(current_user.id)
closing_balance = params[:closing_balance]
shift_id = params[:shift_id]
@shift = ShiftSale.find_by_id(shift_id)
if @shift
@shift.shift_closed_at = DateTime.now.utc
@shift.closing_balance = closing_balance.to_f
@shift.save
end
end

21
app/models/payment_journal.rb
View File

@@ -19,4 +19,25 @@ class PaymentJournal < ApplicationRecord
self.created_by = current_user
self.save
end
# def self.today_cash_in(current_user)
# credit = 0.0
# today_date = DateTime.now.strftime("%Y-%m-%d")
# pj_credit = PaymentJournal.where("TO_CHAR(created_at, 'YYYY-MM-DD')=? and created_by=?",today_date, current_user)
# pj_credit.each do |obj|
# credit += obj.credit_amount
# end
# return credit
# end
#
# def self.today_cash_out(current_user)
# debit = 0.0
# today_date = DateTime.now.strftime("%Y-%m-%d")
# pj_debit = PaymentJournal.where("TO_CHAR(created_at, 'YYYY-MM-DD')=? and created_by=?",today_date, current_user)
# pj_debit.each do |obj|
# debit += obj.debit_amount
# end
# return debit
# end
end

36
app/models/sale.rb
View File

@@ -25,7 +25,7 @@ class Sale < ApplicationRecord
SALE_STATUS_OUTSTANDING = "outstanding"
SALE_STATUS_COMPLETED = "completed"
def generate_invoice_from_booking(booking_id, requested_by, cashier)
def generate_invoice_from_booking(booking_id, requested_by, cashier)
booking = Booking.find(booking_id)
status = false
Rails.logger.debug "Booking -> " + booking.id.to_s
@@ -66,7 +66,7 @@ class Sale < ApplicationRecord
#Default Tax - Values
self.tax_type = "exclusive"
# set cashier
# set cashier
if cashier != nil
self.cashier_id = cashier[0].id
self.cashier_name = cashier[0].name
@@ -270,8 +270,6 @@ class Sale < ApplicationRecord
end
private
def product_get_unit_price(item_code)
menu_item_hash =MenuItem.search_by_item_code(item_code)
if (menu_instance_code)
@@ -409,6 +407,36 @@ def self.get_by_range_by_saleitems(from,to,status,report_type)
end
def get_cash_amount
cash = 0.0
self.sale_payments.each do |pay|
if pay.payment_method == 'cash'
cash = pay.payment_amount
end
end
return cash
end
def get_credit_amount
credit = 0.0
self.sale_payments.each do |pay|
if pay.payment_method == 'creditnote'
credit = pay.payment_amount
end
end
return credit
end
def get_other_amount
other = 0.0
self.sale_payments.each do |pay|
if pay.payment_method != 'cash' && pay.payment_method != 'creditnote'
other += pay.payment_amount
end
end
return other
end
private
def generate_custom_id

22
app/models/sale_payment.rb
View File

@@ -131,7 +131,6 @@ class SalePayment < ApplicationRecord
self.payment_status = "paid"
payment_method = self.save!
sale_update_payment_status(self.received_amount)
return payment_status
end
@@ -146,7 +145,6 @@ class SalePayment < ApplicationRecord
payment_method = self.save!
sale_update_payment_status(self.received_amount)
return payment_status
end
@@ -161,7 +159,6 @@ class SalePayment < ApplicationRecord
payment_method = self.save!
sale_update_payment_status(self.received_amount)
return payment_status
end
@@ -175,7 +172,6 @@ class SalePayment < ApplicationRecord
self.outstanding_amount = self.sale.grand_total- self.received_amount
self.payment_status = "paid"
payment_method = self.save!
sale_update_payment_status(self.received_amount)
return payment_status
@@ -192,7 +188,6 @@ class SalePayment < ApplicationRecord
self.outstanding_amount = self.sale.grand_total- self.received_amount
self.payment_status = "paid"
payment_method = self.save!
sale_update_payment_status(self.received_amount)
return payment_status
@@ -220,7 +215,6 @@ class SalePayment < ApplicationRecord
else
sale_update_payment_status(0)
end
return payment_status
end
@@ -249,16 +243,20 @@ class SalePayment < ApplicationRecord
self.sale.save!
table_update_status(sObj)
rebat(sObj)
shift = ShiftSale.current_open_shift(self.sale.cashier_id)
puts shift
if !shift.nil?
puts ">>>> shift >>>>>>"
shift.update(self.sale)
if paid_amount != "0.0"
update_shift
end
end
end
def update_shift
shift = ShiftSale.current_open_shift(self.sale.cashier_id)
if !shift.nil?
shift.update(self.sale)
end
end
def table_update_status(sale_obj)
status = true
booking = Booking.find_by_sale_id(sale_obj.id)
@@ -321,6 +319,8 @@ class SalePayment < ApplicationRecord
end
end
private
def generate_custom_id
self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI")

11
app/models/shift_sale.rb
View File

@@ -37,14 +37,17 @@ class ShiftSale < ApplicationRecord
def update(sale)
saleobj = Sale.find_by_sale_id(sale)
self.total_revenue = self.total_revenue + saleobj.total_amount
cash = saleobj.get_cash_amount
credit = saleobj.get_credit_amount
other_sales = saleobj.get_other_amount
self.total_revenue = self.total_revenue.to_f + saleobj.total_amount.to_f
self.total_discounts = self.total_discounts + saleobj.total_discount
self.total_taxes = self.total_taxes + saleobj.total_tax
self.grand_total = self.grand_total + saleobj.grand_total
self.cash_sales = self.cash_sales.to_f + cash.to_f
self.credit_sales = self.credit_sales.to_i + credit.to_f
self.other_sales = self.other_sales.to_i + other_sales.to_f
# self.nett_sales =
# self.cash_sales =
# self.credit_sales =
# self.other_sales =
# self.commercial_taxes =
self.save

33
app/views/origami/shifts/new.html.erb
View File

@@ -21,7 +21,40 @@
</div>
</div>
</div>
<div class='col-md-8'>
<div class="row">
<div class="col-lg-6 col-md-1 col-sm-1">
<div class="row bottom">
<div class=" cashier_number " data-value="1" data-type="num">1</div>
<div class=" cashier_number left" data-value="2" data-type="num">2</div>
<div class=" cashier_number left" data-value="3" data-type="num">3</div>
</div>
<div class="row bottom">
<div class=" cashier_number " data-value="4" data-type="num">4</div>
<div class=" cashier_number left" data-value="5" data-type="num">5</div>
<div class=" cashier_number left" data-value="6" data-type="num">6</div>
</div>
<div class="row bottom">
<div class=" cashier_number " data-value="7" data-type="num">7</div>
<div class=" cashier_number left" data-value="8" data-type="num">8</div>
<div class=" cashier_number left" data-value="9" data-type="num">9</div>
</div>
<div class="row bottom">
<div class=" cashier_number " data-value="0" data-type="num">0</div>
<div class=" cashier_number left" data-value="." data-type="num">.</div>
<div class=" cashier_number left" data-value="00" data-type="num">00</div>
</div>
<div class="row bottom">
<div class=" cashier_number red" data-type="del" >Del</div>
<div class=" cashier_number orange left" data-type="clr">Clr</div>
<div class=" cashier_number purple left" data-type="ent">Ent</div>
</div>
</div>
</div>
</div>
</div>
<script>
var total = 0
$(document).on('focusout', '.float-value', function(event){

54
app/views/origami/shifts/show.html.erb
View File

@@ -12,54 +12,7 @@
<td>Cashier Name</td>
<td><%= @shift.employee.name rescue ''%></td>
</tr>
<tr>
<td>Opening Balance</td>
<td><%= @shift.opening_balance rescue ''%></td>
</tr>
<tr>
<td>Total Revenue</td>
<td><%= @shift.total_revenue rescue ''%></td>
</tr>
<tr>
<td>Total Discount</td>
<td><%= @shift.total_discounts rescue ''%></td>
</tr>
<tr>
<td>Total Tax</td>
<td><%= @shift.total_taxes rescue ''%></td>
</tr>
<tr>
<td>Grand Total</td>
<td><%= @shift.grand_total rescue ''%></td>
</tr>
<tr>
<td>Nett Sale</td>
<td><%= @shift.nett_sales rescue ''%></td>
</tr>
<tr>
<td>Cash Sale</td>
<td><%= @shift.cash_sales rescue ''%></td>
</tr>
<tr>
<td>Credit Sale</td>
<td><%= @shift.credit_sales rescue ''%></td>
</tr>
<tr>
<td>Other Sale</td>
<td><%= @shift.other_sales rescue ''%></td>
</tr>
<tr>
<td>Commercial Tax</td>
<td><%= @shift.commercial_taxes rescue ''%></td>
</tr>
<tr>
<td>Cash In</td>
<td><%= @shift.cash_in rescue ''%></td>
</tr>
<tr>
<td>Cash Out</td>
<td><%= @shift.cash_out rescue ''%></td>
</tr>
</table>
<hr>
<div class='row'>
@@ -67,7 +20,7 @@
<span style='font-size:20px;'><b>Closing Balance</b></span>
</div>
<div class='col-md-6'>
<span style='font-size:20px;padding-left:18px;'><b><%= @shift.closing_balance rescue ''%></b></span>
<span style='font-size:20px;'><b><input type='text' id='closing_balance_amount' value=''></b></span>
</div>
</div>
</div>
@@ -78,8 +31,11 @@
</div>
<script>
$('#close_cashier').on('click',function(){
var amount = $('#closing_balance_amount').val();
var shift_id = "<%= @shift.id %>"
$.ajax({type: "POST",
url: "<%= origami_close_shift_path %>",
data: "closing_balance="+ amount + "&shift_id="+ shift_id,
success:function(result){
console.log(result)
window.location.href = '/';