From 2318d83adfd465f51c554e63328753e4873d90fd Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 6 Jun 2017 16:19:14 +0630 Subject: [PATCH] update --- .../origami/card_payments_controller.rb | 10 ++++++ .../origami/credit_payments_controller.rb | 10 ++++++ .../origami/payments_controller.rb | 3 ++ .../origami/card_payments/index.html.erb | 1 + .../origami/credit_payments/index.html.erb | 1 + app/views/origami/request_bills/show.html.erb | 32 ++++++++++++++++--- 6 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 app/controllers/origami/card_payments_controller.rb create mode 100644 app/controllers/origami/credit_payments_controller.rb create mode 100644 app/views/origami/card_payments/index.html.erb create mode 100644 app/views/origami/credit_payments/index.html.erb diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb new file mode 100644 index 00000000..2df4b266 --- /dev/null +++ b/app/controllers/origami/card_payments_controller.rb @@ -0,0 +1,10 @@ +class Origami::CardPaymentsController < BaseOrigamiController + + + def index + end + + def create + end + +end diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb new file mode 100644 index 00000000..a348951e --- /dev/null +++ b/app/controllers/origami/credit_payments_controller.rb @@ -0,0 +1,10 @@ +class Origami::CreditPaymentsController < BaseOrigamiController + + + def index + end + + def create + end + +end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 3fa3aa9b..f64e27e3 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -5,6 +5,9 @@ class Origami::PaymentsController < BaseOrigamiController end def create + #payment type + #sale status + #point - get [ food amount ] end def show diff --git a/app/views/origami/card_payments/index.html.erb b/app/views/origami/card_payments/index.html.erb new file mode 100644 index 00000000..86ef10b0 --- /dev/null +++ b/app/views/origami/card_payments/index.html.erb @@ -0,0 +1 @@ +Hello Card Payment diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb new file mode 100644 index 00000000..e4f97119 --- /dev/null +++ b/app/views/origami/credit_payments/index.html.erb @@ -0,0 +1 @@ +hello Credit diff --git a/app/views/origami/request_bills/show.html.erb b/app/views/origami/request_bills/show.html.erb index 98ed0019..573a63f4 100644 --- a/app/views/origami/request_bills/show.html.erb +++ b/app/views/origami/request_bills/show.html.erb @@ -74,8 +74,8 @@
-
AMOUNT DUE
-
<%= @sale_data.grand_total %>
+
AMOUNT DUE
+
<%= @sale_data.grand_total %>

@@ -95,7 +95,7 @@
BALANCE
-
0.0
+
<%= @sale_data.grand_total %>

@@ -157,7 +157,7 @@
-
PAY
+
PAY
@@ -179,8 +179,10 @@ $(document).on('click', '.cashier_number', function(event){ var input_value = $(this).attr("data-value"); if (original_value == "0.0"){ $('#cash').text(input_value); + update_balance(); }else{ $('#cash').append(input_value); + update_balance(); } break; @@ -188,6 +190,7 @@ $(document).on('click', '.cashier_number', function(event){ var input_value = $(this).attr("data-value"); amount = parseInt(input_value) + parseInt(original_value); $('#cash').text(amount); + update_balance(); break; } @@ -196,6 +199,7 @@ $(document).on('click', '.cashier_number', function(event){ return false; } }); + $( document ).ready(function() { $('#credit_payment').click(function() { var sale_id = $('#sale_id').text(); @@ -208,5 +212,25 @@ $( document ).ready(function() { window.location.href = '/origami/sale/'+ sale_id + "/payment/card_payment" return false; }); + + $('#pay').click(function() { + console.log("pay") + if($('#amount_due').text() > 0){ + console.log("greater") + }else{ + console.log("less") + } + }); + }); + +function update_balance(){ + var cash = $('#cash').text(); + var credit = $('#credit').text(); + var card = $('#card').text(); + var amount_due = $('#amount_due').text(); + var total = cash + credit + card + var result = amount_due - total + $('#balance').text(result); +}