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

editing discout

Browse Source
This commit is contained in:
Yan
2017-06-08 15:21:53 +06:30
parent c7aac7c2b8
commit 9866acf198
4 changed files with 151 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/assets/javascripts/orgiami.js
View File

@@ -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);
}

7
app/assets/stylesheets/orgiami.scss
View File

@@ -69,3 +69,10 @@
.green{ .green{
background-color: #009900 background-color: #009900
} }
/*----- Reset -----*/
select.form-control {
height: inherit !important;
}

4
app/models/sale.rb
View File

@@ -55,8 +55,8 @@ class Sale < ApplicationRecord
generate_receipt_no generate_receipt_no
order = Order.find(order_id) order = Order.find(order_id)
#Default - Values #Default Tax - Values
self.tax_type = "execlusive" self.tax_type = "exclusive"
self.requested_by = requested_by self.requested_by = requested_by
self.requested_at = DateTime.now.utc self.requested_at = DateTime.now.utc

153
app/views/origami/discounts/index.html.erb
View File

@@ -80,76 +80,95 @@
<!-- Column Two --> <!-- Column Two -->
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="row"> <!-- Discount Amount -->
<div class="col-md-12"> <div class="card row">
<div class="card-header">
<div class="row"> <div><strong id="order-title">Pay Discount</strong></div>
<div class="col-md-7"> </div>
<div class="row"> <div class="card-block">
<div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div> <div class="card-title">
<div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div> <form class="form-horizontal">
<div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div> <div class="form-group">
</div> <div class="col-md-3">
</div> <select name="discount_type" class="form-control">
<div class="col-md-5"> <option val=0 >Net</option>
<div class="col-md-12 cashier_number long" data-value="1000" data-type="add">1000</div> <option val=1 >Percentage</option>
</div> </select>
</div> </div>
<div class="col-md-9">
<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
</div>
</div>
<button id="pay-discount" class="btn btn-primary long">Discount</button>
</form>
</div>
<div class="col-md-12">
<div class="row">
<div class="col-md-7">
<div class="row">
<div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
<div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div>
<div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long" data-value="500" data-type="add">500</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row">
<div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div> <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
<div class="col-md-3 cashier_number" data-value="5" data-type="num">5</div> <div class="col-md-3 cashier_number" data-value="5" data-type="num">5</div>
<div class="col-md-3 cashier_number" data-value="6" data-type="num">6</div> <div class="col-md-3 cashier_number" data-value="6" data-type="num">6</div>
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div class="col-md-12 cashier_number long" data-value="5000" data-type="add">5000</div> <div class="col-md-12 cashier_number long" data-value="1000" data-type="add">1000</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row">
<div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div> <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
<div class="col-md-3 cashier_number" data-value="8" data-type="num">8</div> <div class="col-md-3 cashier_number" data-value="8" data-type="num">8</div>
<div class="col-md-3 cashier_number" data-value="9" data-type="num">9</div> <div class="col-md-3 cashier_number" data-value="9" data-type="num">9</div>
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div class="col-md-12 cashier_number long" data-value="10000" data-type="add">10000</div> <div class="col-md-12 cashier_number long" data-value="5000" data-type="add">5000</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row">
<div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div> <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
<div class="col-md-3 cashier_number" data-value="." data-type="num">.</div> <div class="col-md-3 cashier_number" data-value="." data-type="num">.</div>
<div class="col-md-3 cashier_number" data-value="00" data-type="num">00</div> <div class="col-md-3 cashier_number" data-value="00" data-type="num">00</div>
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div class="col-md-12 cashier_number long" data-value="50000" data-type="add">50000</div> <div class="col-md-12 cashier_number long" data-value="10000" data-type="add">10000</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<div class="row"> <div class="row">
<div class="col-md-3 cashier_number"></div> <div class="col-md-3 cashier_number"></div>
<div class="col-md-3 cashier_number red" data-type="del">DEL</div> <div class="col-md-3 cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 cashier_number green" data-type="clr">CLR</div> <div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div class="col-md-12 cashier_number long purple " id="pay">PAY</div> <div class="col-md-12 cashier_number long" data-value="50000" data-type="add">50000</div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>