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

fixed conflict request_bill_con and origami index

Browse Source
This commit is contained in:
Aung Myo
2017-06-07 16:48:28 +06:30
parent 387ffa996b 4323da6589
commit 9ad04323f0
28 changed files with 264 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/views/origami/home/index.html.erb
View File

@@ -190,13 +190,13 @@
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Customer</button>
<!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button> -->
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>
Req.Bill
</button>
<!-- Cashier Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Discount</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button>
<button type="button" id="pay" class="btn btn-primary btn-lg btn-block" >Pay</button>
<button type="button" id="pay" class="btn btn-primary btn-lg btn-block" disabled >Pay</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
</div>
</div>
@@ -217,12 +217,14 @@ function callOrderDetails(sale_order_id){
order_id = sale_order_id.split("_")[1]
url = "origami/"+sale_order_id.split("_")[1]
data_val = { sale_id: sale_order_id.split("_")[1]}
$("#pay").prop('disabled',false);
$("#request_bills").prop('disabled',true);
}else{
order_id = sale_order_id.split("_")[1]
url = "origami/"+order_id
data_val = { order_id: sale_order_id.split("_")[1]}
$("#request_bills").prop('disabled',false);
$("#pay").prop('disabled',true);
}
table_or_order_id = order_id
@@ -314,14 +316,16 @@ $( document ).ready(function() {
window.location.href = '/origami/request_bills/'+ table_or_order_id
return false;
});
$('#pay').click(function() {
window.location.href = '/origami/sale/'+ pay_sale_id + "/payment"
return false;
});
});
$( document ).ready(function() {
$('#pay').click(function() {
window.location.href = '/origami/sale/'+pay_sale_id +"/payment"
return false;
});
});
</script>
<style type="text/css">