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

cash payment complete

Browse Source
This commit is contained in:
Nweni
2017-06-09 11:25:30 +06:30
parent 35553217f5
commit 6171b00dc7
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile.lock
View File

@@ -244,7 +244,6 @@ DEPENDENCIES
jquery-rails jquery-rails
kaminari (~> 0.16.3) kaminari (~> 0.16.3)
listen (~> 3.0.5) listen (~> 3.0.5)
mysql2 (>= 0.3.18, < 0.5) mysql2 (>= 0.3.18, < 0.5)
pg pg
prawn prawn

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

@@ -10,7 +10,7 @@ class Origami::PaymentsController < BaseOrigamiController
if(Sale.exists?(sale_id)) if(Sale.exists?(sale_id))
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
sale_payment.process_payment(saleObj, @user, cash) sale_payment.process_payment(saleObj, @user, cash, "cash")
end end
end end

9
app/models/sale_payment.rb
View File

@@ -8,7 +8,7 @@ class SalePayment < ApplicationRecord
attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
def process_payment(invoice, action_by, cash_amount,payment_method) def process_payment(invoice, action_by, cash_amount, payment_method)
self.sale = invoice self.sale = invoice
self.received_amount = cash_amount self.received_amount = cash_amount
@@ -103,7 +103,7 @@ class SalePayment < ApplicationRecord
payment_status = false payment_status = false
self.payment_method = "cash" self.payment_method = "cash"
self.payment_amount = self.received_amount self.payment_amount = self.received_amount
self.outstanding_amount = self.sale.grand_total - self.received_amount self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
self.payment_status = "paid" self.payment_status = "paid"
payment_method = self.save! payment_method = self.save!
@@ -200,16 +200,15 @@ class SalePayment < ApplicationRecord
sale_update_payment_status(0) sale_update_payment_status(0)
end end
return payment_status return payment_status
end end
def sale_update_payment_status(paid_amount) def sale_update_payment_status(paid_amount)
#update amount_outstanding #update amount_outstanding
self.sale.amount_received = self.sale.amount_received + paid_amount self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f
self.sale.amount_changed = paid_amount - self.sale.amount_received self.sale.amount_changed = paid_amount - self.sale.amount_received
if (self.sale.grand_total <= self.sale.amount_received && self.sale.amount_changed > 0) if (self.sale.grand_total <= self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
self.sale.payment_status = "paid" self.sale.payment_status = "paid"
self.sale.sale_status = "completed" self.sale.sale_status = "completed"
self.sale.save! self.sale.save!

9
app/views/origami/payments/show.html.erb
View File

@@ -165,9 +165,12 @@
<script> <script>
$(document).on('click', '.cashier_number', function(event){ $(document).on('click', '.cashier_number', function(event){
//event.stopPropagation(); //
event.preventDefault(); // event.stopPropagation();
if(event.handled !== true) { // event.preventDefault();
console.log( event.handled );
if(event.handled == true) {
var original_value; var original_value;
original_value = $('#cash').text(); original_value = $('#cash').text();

4
config/initializers/assets.rb
View File

@@ -11,8 +11,8 @@ Rails.application.config.assets.version = '1.0'
# Rails.application.config.assets.precompile += %w( search.js ) # Rails.application.config.assets.precompile += %w( search.js )
# --- Waiter/ Cashier - Orgiami ---- # --- Waiter/ Cashier - Orgiami ----
Rails.application.config.assets.precompile += %w( orgiami.css ) Rails.application.config.assets.precompile += %w( origami.css )
Rails.application.config.assets.precompile += %w( orgiami.js ) Rails.application.config.assets.precompile += %w( origami.js )
# -- Order Queue Station ----- # -- Order Queue Station -----
Rails.application.config.assets.precompile += %w( OQS.css ) Rails.application.config.assets.precompile += %w( OQS.css )
Rails.application.config.assets.precompile += %w( OQS.js ) Rails.application.config.assets.precompile += %w( OQS.js )