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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Aung Myo
2018-09-11 16:43:43 +06:30
parent 1dee84d733 49268a9fca
commit ffca0af445
8 changed files with 72 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/origami/home/show.html.erb
View File

@@ -1163,7 +1163,7 @@
$('#edit').on('click', function () {
var dining_id = "<%= @dining.id %>"
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
if ($(this).attr('active')=== "true") {
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
}else{
@@ -1174,7 +1174,7 @@
$('#commissions').on('click', function () {
var dining_id = "<%= @dining.id %>"
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
});
@@ -1197,7 +1197,7 @@
closeOnConfirm: false
}, function (isConfirm) {
if (isConfirm) {
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var sale_id = $("#sale_id").val();//"<%= @obj_sale.sale_id rescue "" %>"
var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
var remark = $("#remark").val();
@@ -1305,7 +1305,7 @@
closeOnConfirm: false
}, function (isConfirm) {
if (isConfirm) {
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
$.ajax({
type: 'POST',
@@ -1336,7 +1336,7 @@
createAccessCode(code);
if (type == "edit") {
var dining_id = "<%= @dining.id rescue "" %> ";
var sale_id = "<%= @obj_sale.sale_id rescue "" %>";
var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>";
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
}else if(type == "void"){
$('#AccessCodeModal').modal('hide');
@@ -1371,7 +1371,7 @@
var cashier_type = 'cashier';
var sale_id = $('#sale_id').text();
var dining_id = "<%= @dining.id rescue "" %> ";
var sale_id = "<%= @obj_sale.sale_id rescue "" %>";
var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>";
localStorage.removeItem("tax_type");
swal({
title: "Alert",

2
app/views/origami/order_reservation/get_order.json.jbuilder
View File

@@ -4,7 +4,7 @@ if @order
:requested_time,:pickup_time,:expected_waiting_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
:payment_status,:payment_ref,:taxes,:total_amount,:total_tax,
:discount_amount,:convenience_charge,:grand_total,:status,:order_remark,
:remark,:sale_id)
:remark,:sale_id,:action_times)
@delivery = Delivery.find_by_order_reservation_id(@order.order_reservation_id)
if @delivery
json.delivery do |json|

10
app/views/origami/order_reservation/index.html.erb
View File

@@ -468,26 +468,26 @@
</tr>
</tbody>
</table>
<!-- <table class="table">
<table class="table">
<tr>
<td colspan="2" class="body-td align-left">
<td colspan="2" class="body-td align-left accepted_time">
<span class="font-13">ACCEPTED</span><br>
<b id="accepted_time">Sept 06, 2018(Weds) 10:00 AM</b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<td colspan="2" class="body-td align-left kitchen_time">
<span class="font-13">SEND TO KITCHEN</span><br>
<b id="send_kitchen_time">Sept 06, 2018(Weds) 11:00 AM</b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<td colspan="2" class="body-td align-left ready_time">
<span class="font-13">READY TO DELIVERY</span><br>
<b id="ready_delivery_time">Sept 06, 2018(Weds) 12:00 PM</b>
</td>
</tr>
</table> -->
</table>
</div>
<div class="card-footer grand-card-footer">

8
app/views/origami/rooms/show.html.erb
View File

@@ -1260,7 +1260,7 @@ $('#add_invoice').on('click',function(){
$('#edit').on('click',function(){
var dining_id = "<%= @room.id %>"
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/cashier/edit";
});
@@ -1319,7 +1319,7 @@ $('#add_invoice').on('click',function(){
$('#commissions').on('click', function () {
var dining_id = "<%= @room.id %>"
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
});
@@ -1384,7 +1384,7 @@ $('#add_invoice').on('click',function(){
closeOnConfirm: false
}, function (isConfirm) {
if (isConfirm) {
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
$.ajax({
type: 'POST',
@@ -1421,7 +1421,7 @@ $('#add_invoice').on('click',function(){
createAccessCode(code);
if (type == "edit") {
var dining_id = "<%= @room.id rescue ""%>";
var sale_id = "<%= @obj_sale.sale_id rescue "" %>";
var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>";
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/cashier/edit";
}else if(type == "void"){
$('#AccessCodeModal').modal('hide');

2
app/views/origami/table_invoices/show.html.erb
View File

@@ -80,7 +80,7 @@
count += 1
sub_total = sub_total + sale_item.price
%>
<input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
<input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
<%
# Can't check for discount
# unless sale_item.price == 0