diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 023912ca..cbe356b5 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -6,7 +6,7 @@
- +

@@ -131,8 +131,8 @@ $(document).on('click', '.cashier_number', function(event){ $('#used_amount').text(cash.substr(0,cash.length-1)); break; case 'nett': - alert($('#valid_amount').text()) - $('#used_amount').text($('#valid_amount').text()); + var remain_amount = $('#redeemamt').val(); + $('#used_amount').text(remain_amount); break; } diff --git a/db/seeds.rb b/db/seeds.rb index f612d6f1..fc3e1bde 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -79,7 +79,7 @@ account_type = Lookup.create([{lookup_type:'account_type', name: 'Income', value # sale void reason void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manager', value: 'Approve By Manager'}, {lookup_type:'void_reason', name: 'Customer Mistake', value: 'Customer Mistake'}, - {lookup_type:'void_reason', name: 'Cashier Mistake', value: 'Cashier Mistake'}, + {lookup_type:'void_reason', name: 'Cashier Mistake', value: 'Cashier Mistake'}, {lookup_type:'void_reason', name: 'Waiter Mistake', value: 'Waiter Mistake'}]) #WALK CUSTOMER - Default CUSTOMER (take key 1)