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

update pending and quick service

Browse Source
This commit is contained in:
Aung Myo
2018-02-15 15:26:34 +06:30
parent a8fdf2ec30
commit cf644892c9
9 changed files with 164 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/origami/addorders/detail.html.erb
View File

@@ -11,6 +11,9 @@
<div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" id="ul-navbar">
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li>
<% @menu.each do |menu| %>
<% if !menu.valid_time.nil? %>
<% if menu.menu_category_id.nil? %>
@@ -52,9 +55,7 @@
<% end %>
<%end %>
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li>
</ul>
</div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10">

10
app/views/origami/payments/show.html.erb
View File

@@ -326,9 +326,10 @@ var cashier_type = "<%= @cashier_type %>";
payment_type = '';
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
console.log("ssssssssssss")
payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment")
if (member_id && member_discount) {
console.log("fffffffffffff")
if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
$("#credit_payment").hide();
} else{
@@ -430,7 +431,12 @@ var cashier_type = "<%= @cashier_type %>";
var dining_id = $('#dining').text();
var sale_id = $('#sale_id').text();
if ($(this).attr('active')=== "true") {
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";
if (dining_id) {
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";
}else{
window.location.href = "/origami/table/sale/" + sale_id + "/"+cashier_type+"/edit";
}
}else{
swal("Opps","You are not authorized for void","warning")
}

11
app/views/origami/pending_order/show.html.erb
View File

@@ -42,7 +42,7 @@
</div>
<div class="card-title row customer_detail p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6">
Customer : <%= @sale.customer.name rescue "-" %>
&nbsp; Customer : <%= @sale.customer.name rescue "-" %>
</div>
@@ -112,7 +112,6 @@
</div>
</div>
</div>
<!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
@@ -136,7 +135,13 @@ $(document).ready(function(){
});
$('#addorder').on('click', function () {
var table_id = "<%=@table_id%>";
window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+$('#sale_id').val();
var booking_id = "<%=@booking%>";
if (table_id) {
window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+$('#sale_id').val();
}else{
window.location.href = '/origami/quick_service/modify_order/'+ booking_id+"/" +$('#sale_id').val();
}
});
});
</script>