diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/orgiami.js index fd7d8e88..1abc6f65 100644 --- a/app/assets/javascripts/orgiami.js +++ b/app/assets/javascripts/orgiami.js @@ -105,5 +105,61 @@ $(document).ready(function(){ }); }); +/* For Receipt - discount or tax */ +$(document).on('click', '.cashier_number', function(event){ + if(event.handled !== true) { + var original_value=0; + original_value = $('#discount-amount').val(); + + var input_type = $(this).attr("data-type"); + + switch (input_type) { + case 'num': + var input_value = $(this).attr("data-value"); + if (original_value == "0.0"){ + $('#discount-amount').val(input_value); + update_balance(); + } + else{ + $('#discount-amount').val(original_value + '' + input_value); + update_balance(); + } + break; + + case 'add': + var input_value = $(this).attr("data-value"); + amount = parseInt(input_value) + parseInt(original_value); + $('#discount-amount').val(amount); + update_balance(); + break; + + case 'del' : + var discount_text=$('#discount-amount').val(); + $('#discount-amount').val(discount_text.substr(0,discount_text.length-1)); + update_balance(); + break; + + case 'clr': + $('#discount-amount').val("0.0"); + update_balance(); + break; + } + + event.handled = true; + } else { + return false; + } +}); + +function update_balance(){ + var discount_amount = $('#discount-amount').val(); + var sub_total = $('#order-sub-total').text(); + var tax = $('#order-Tax').text(); + + var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount; + $('#order-discount').text(discount_amount); + $('#order-grand-total').text(total); +} + diff --git a/app/assets/stylesheets/orgiami.scss b/app/assets/stylesheets/orgiami.scss index d94bc702..0be16266 100644 --- a/app/assets/stylesheets/orgiami.scss +++ b/app/assets/stylesheets/orgiami.scss @@ -69,3 +69,10 @@ .green{ background-color: #009900 } + + +/*----- Reset -----*/ + +select.form-control { + height: inherit !important; +} diff --git a/app/models/sale.rb b/app/models/sale.rb index 1a9c9a28..b0f07cb0 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -55,8 +55,8 @@ class Sale < ApplicationRecord generate_receipt_no order = Order.find(order_id) - #Default - Values - self.tax_type = "execlusive" + #Default Tax - Values + self.tax_type = "exclusive" self.requested_by = requested_by self.requested_at = DateTime.now.utc diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 4615a6aa..32093621 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -80,76 +80,95 @@
-
-
- -
-
-
-
1
-
2
-
3
-
-
-
-
1000
-
-
+ +
+
+
Pay Discount
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
1
+
2
+
3
+
+
+
+
500
+
+
-
-
-
-
4
-
5
-
6
-
-
-
-
5000
-
-
+
+
+
+
4
+
5
+
6
+
+
+
+
1000
+
+
-
-
-
-
7
-
8
-
9
-
-
-
-
10000
-
-
+
+
+
+
7
+
8
+
9
+
+
+
+
5000
+
+
-
-
-
-
0
-
.
-
00
-
-
-
-
50000
-
-
+
+
+
+
0
+
.
+
00
+
+
+
+
10000
+
+
-
-
-
-
-
DEL
-
CLR
-
-
-
-
PAY
-
-
- -
+
+
+
+
+
DEL
+
CLR
+
+
+
+
50000
+
+
+
+
-
- +