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

Merge branch 'master' into cloud

Browse Source
This commit is contained in:
Yan
2017-12-13 18:30:39 +06:30
parent b3b443735a 974c5df830
commit 6507ad1eb5
11 changed files with 114 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/views/origami/other_charges/index.html.erb
View File

@@ -8,7 +8,7 @@
<div><strong id="order-title">ORDER DETAILS</strong></div>
</div> -->
<div class="card-block">
<div class="card-title row">
<div class="row card-title">
<div class="col-lg-6 col-md-6 col-sm-6">
<p id="sale-id" class="hidden"><%=@sale_data.sale_id %></p>
<p>Receipt No: <span id="receipt_no"><%=@sale_data.receipt_no rescue ' '%></span></p>
@@ -95,12 +95,16 @@
<div class="card-title">
<div class="form-horizontal">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="-group">
<div class="bottom-5">
<input type="text" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" />
</div>
<div class="-group">
<div class="bottom-5">
<textarea id="reasons" name="reasons" rows="2" class="form-control" placeholder="Reasons"></textarea>
</div>
</div>
<div class="bottom-5">
<input type="checkbox" id="is_taxable" name="is_taxable" />
<lable for="is_taxable">Is Taxable</lable>
</div>
</div>
</div>
</div>
@@ -199,7 +203,7 @@
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
$(document).ready(function(){
$(".cashier_number").on('click', function(event){
if(event.handled !== true) {
var original_value=0;
@@ -270,11 +274,15 @@
var sub_total = $('#order-sub-total').text();
var charge_amount = $("#other-charges-amount").val();
var reasons = $("#reasons").val();
var is_taxable = 0
if ($("#is_taxable:checked").length > 0) {
is_taxable = 1
}
// Update sub total
$('#order-sub-total').text(parseFloat(sub_total) + parseFloat(charge_amount));
var item_row = item_row_template(sale_id, charge_amount, reasons);
var item_row = item_row_template(sale_id, charge_amount, reasons, is_taxable);
$("#order-items-table tbody").append(item_row);
});
@@ -323,13 +331,14 @@
var sale_item = {};
sale_item.id = $(this).attr('id');
sale_item.name = $(this).find('#item-name-price').text();
sale_item.price = $(this).find('#item-total-price').text();
sale_item.price = $(this).find('#item-total-price').text()
sale_item.is_taxable = $(this).find('#item_taxable').text();
sale_items.push(sale_item);
});
return sale_items;
}
function item_row_template(sale_id, charge_amount, reasons){
function item_row_template(sale_id, charge_amount, reasons, is_taxable){
var item_row = "<tr class='other-item-row' id='SLI-000000000000'>" +
"<td style='width: 60%; text-align: left;'>" +
"<span id='item_account_type' class='hidden'>" +
@@ -338,6 +347,7 @@
"<span id='item-name-price'>" +
reasons +
"</span>" +
"<span id='item_taxable' class='hidden'>" + is_taxable + "</span>" +
"</td>" +
"<td style='width: 20%; text-align: right;'>" +
"<span id='item-qty'>1</span>" +