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

fixed some issue

Browse Source
This commit is contained in:
phyusin
2018-05-11 11:59:30 +06:30
parent 80f353ba3c
commit 760c7685df
14 changed files with 636 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/channels/check_new_order.js
View File

@@ -34,10 +34,11 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', {
// } // }
// }); // });
$("#notify_new_order_lists").text(order_lists); $("#notify_new_order_lists").text(order_lists);
$("#notify_new_order").on('shown.bs.modal', function(e){ $("#notify_new_order").on('show.bs.modal', function(e){
$("#notify_new_order").focus();
$("#notify_order_send_to_kitchen").modal('hide'); $("#notify_order_send_to_kitchen").modal('hide');
$("#notify_order_ready_to_delivery").modal('hide'); $("#notify_order_ready_to_delivery").modal('hide');
}).on('shown.bs.modal', function(e){
$("#notify_new_order").focus();
}).on('hide.bs.modal', function (e) { }).on('hide.bs.modal', function (e) {
$("#notify_new_order").modal("hide"); $("#notify_new_order").modal("hide");
}).modal({show: true, keyboard: false, backdrop: false}); }).modal({show: true, keyboard: false, backdrop: false});

3
app/assets/javascripts/channels/check_order_ready_to_delivery.js
View File

@@ -35,9 +35,10 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe
// }); // });
$("#notify_order_ready_to_delivery_lists").text(order_lists); $("#notify_order_ready_to_delivery_lists").text(order_lists);
$("#notify_order_ready_to_delivery").on('shown.bs.modal', function(e){ $("#notify_order_ready_to_delivery").on('shown.bs.modal', function(e){
$("#notify_order_ready_to_delivery").focus();
$("#notify_new_order").modal('hide'); $("#notify_new_order").modal('hide');
$("#notify_order_send_to_kitchen").modal('hide'); $("#notify_order_send_to_kitchen").modal('hide');
}).on('shown.bs.modal', function(e){
$("#notify_order_ready_to_delivery").focus();
}).on('hide.bs.modal', function (e) { }).on('hide.bs.modal', function (e) {
$("#notify_order_ready_to_delivery").modal("hide"); $("#notify_order_ready_to_delivery").modal("hide");
}).modal({show: true, keyboard: false, backdrop: false}); }).modal({show: true, keyboard: false, backdrop: false});

5
app/assets/javascripts/channels/check_order_send_to_kitchen.js
View File

@@ -34,10 +34,11 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend
// } // }
// }); // });
$("#notify_order_send_to_kitchen_lists").text(order_lists); $("#notify_order_send_to_kitchen_lists").text(order_lists);
$("#notify_order_send_to_kitchen").on('shown.bs.modal', function(e){ $("#notify_order_send_to_kitchen").on('show.bs.modal', function(e){
$("#notify_order_send_to_kitchen").focus();
$("#notify_new_order").modal('hide'); $("#notify_new_order").modal('hide');
$("#notify_order_ready_to_delivery").modal('hide'); $("#notify_order_ready_to_delivery").modal('hide');
}).on('shown.bs.modal', function(e){
$("#notify_order_send_to_kitchen").focus();
}).on('hide.bs.modal', function (e) { }).on('hide.bs.modal', function (e) {
$("#notify_order_send_to_kitchen").modal("hide"); $("#notify_order_send_to_kitchen").modal("hide");
}).modal({show: true, keyboard: false, backdrop: false}); }).modal({show: true, keyboard: false, backdrop: false});

8
app/controllers/oqs/edit_controller.rb
View File

@@ -27,6 +27,8 @@ class Oqs::EditController < BaseOqsController
remarks = params[:remarks] remarks = params[:remarks]
order_item = OrderItem.find(order_items_id) order_item = OrderItem.find(order_items_id)
order = Order.find(order_item.order_id)
if qty_weight.to_i <= order_item.qty.to_i
before_updated_qty = order_item.qty before_updated_qty = order_item.qty
order_item.item_order_by = current_user.name order_item.item_order_by = current_user.name
@@ -34,7 +36,7 @@ class Oqs::EditController < BaseOqsController
order_item.remark = remarks order_item.remark = remarks
order_item.save order_item.save
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server if ENV["SERVER_MODE"] != "cloud" && order.source == 'cashier' #no print in cloud server
# print # print
assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
@@ -71,6 +73,10 @@ class Oqs::EditController < BaseOqsController
end end
end end
end end
render :json => {:status=> true }
else
render :json => {:status=> false, :message => "Not allowed over quantity!" }
end
end end
#Shop Name in Navbor #Shop Name in Navbor

21
app/controllers/origami/moveroom_controller.rb
View File

@@ -11,6 +11,8 @@ class Origami::MoveroomController < BaseOrigamiController
@orders = Order.all.order('date desc') @orders = Order.all.order('date desc')
@status_order = "" @status_order = ""
@status_sale = ""
@sale_array = Array.new
@dining = DiningFacility.find(params[:dining_id]) @dining = DiningFacility.find(params[:dining_id])
@dining.bookings.each do |booking| @dining.bookings.each do |booking|
if booking.sale_id.nil? if booking.sale_id.nil?
@@ -18,21 +20,38 @@ class Origami::MoveroomController < BaseOrigamiController
booking.booking_orders.each do |booking_order| booking.booking_orders.each do |booking_order|
order = Order.find(booking_order.order_id) order = Order.find(booking_order.order_id)
@obj_order = order @obj_order = order
@customer = order.customer
@date = order.created_at @date = order.created_at
@booking= booking
order.order_items.each do |item| order.order_items.each do |item|
@order_items.push(item) @order_items.push(item)
end end
accounts = @customer.tax_profiles
@account_arr =[]
accounts.each do |acc|
account = TaxProfile.find(acc)
@account_arr.push(account)
end
end end
@status_order = 'order' @status_order = 'order'
else else
sale = Sale.find(booking.sale_id) sale = Sale.find(booking.sale_id)
if sale.sale_status != "completed" if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile"
@sale_array.push(sale)
if @status_order == 'order' if @status_order == 'order'
@status_order = 'sale' @status_order = 'sale'
end end
@booking= booking
@date = sale.created_at @date = sale.created_at
@status_sale = 'sale' @status_sale = 'sale'
@obj_sale = sale @obj_sale = sale
@customer = sale.customer
accounts = @customer.tax_profiles
@account_arr =[]
accounts.each do |acc|
account = TaxProfile.find(acc)
@account_arr.push(account)
end
end end
end end
end end

3
app/controllers/origami/movetable_controller.rb
View File

@@ -18,7 +18,6 @@ class Origami::MovetableController < BaseOrigamiController
if booking.sale_id.nil? if booking.sale_id.nil?
@order_items = Array.new @order_items = Array.new
booking.booking_orders.each do |booking_order| booking.booking_orders.each do |booking_order|
order = Order.find(booking_order.order_id) order = Order.find(booking_order.order_id)
@obj_order = order @obj_order = order
@customer = order.customer @customer = order.customer
@@ -37,7 +36,7 @@ class Origami::MovetableController < BaseOrigamiController
@status_order = 'order' @status_order = 'order'
else else
sale = Sale.find(booking.sale_id) sale = Sale.find(booking.sale_id)
if sale.sale_status != "completed" if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile"
@sale_array.push(sale) @sale_array.push(sale)
if @status_order == 'order' if @status_order == 'order'
@status_order = 'sale' @status_order = 'sale'

1
app/controllers/origami/order_reservation_controller.rb
View File

@@ -1,7 +1,6 @@
class Origami::OrderReservationController < BaseOrigamiController class Origami::OrderReservationController < BaseOrigamiController
def index def index
puts Time.now.utc
@order = OrderReservation.latest_order #.active @order = OrderReservation.latest_order #.active
@count_on_order = OrderReservation.get_count_on_order @count_on_order = OrderReservation.get_count_on_order
@count_on_completed = OrderReservation.get_count_on_completed @count_on_completed = OrderReservation.get_count_on_completed

2
app/controllers/reports/receipt_no_controller.rb
View File

@@ -20,7 +20,7 @@ authorize_resource :class => false
payment_type = params[:payment_type] payment_type = params[:payment_type]
@sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type)
@sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type) @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
@tax_profiles = TaxProfile.order('order_by asc').limit(2) @tax_profiles = TaxProfile.where('group_type = "cashier"').order('order_by asc').limit(2)
@from = from @from = from
@to = to @to = to
# get printer info # get printer info

4
app/views/oqs/edit/index.html.erb
View File

@@ -123,6 +123,7 @@ $(document).ready(function(){
data: params, data: params,
success: function(result){ success: function(result){
// alert("Updated!"); // alert("Updated!");
if(result.status){
<% if !@link_type.nil? %> <% if !@link_type.nil? %>
<% if @link_type == 'oqs' %> <% if @link_type == 'oqs' %>
window.location.href = '/oqs'; window.location.href = '/oqs';
@@ -142,6 +143,9 @@ $(document).ready(function(){
<% else %> <% else %>
window.location.href = '/oqs'; window.location.href = '/oqs';
<% end %> <% end %>
}else{
swal("Alert!", result.message, "warning");
}
} }
}); });
}); });

203
app/views/origami/moveroom/move_dining.html.erb
View File

@@ -15,7 +15,7 @@
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div id="order-detail-slimscroll" data-height="130"> <div id="custom-slimscroll">
<div class="tab-content" style=""> <div class="tab-content" style="">
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<!--- Panel 1 - Table Orders --> <!--- Panel 1 - Table Orders -->
@@ -23,11 +23,27 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<% if table.get_booking.nil? %>
<% if table.get_checkout_booking.nil? %>
<div class="card tables red text-white" data-id="<%= table.id %>" data-name="<%= table.name %>"> <div class="card tables red text-white" data-id="<%= table.id %>" data-name="<%= table.name %>">
<% else %>
<div class="card tables orange text-white" data-id="<%= table.id %>">
<% end %>
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
</div> </div>
</div> </div>
<% else %>
<% if table.get_checkout_booking.nil? %>
<div class="card tables blue text-white" data-id="<%= table.id %>">
<% else %>
<div class="card tables orange text-white" data-id="<%= table.id %>">
<% end %>
<div class="card-block">
<%= table.name %>
</div>
</div>
<% end %>
<% else %> <% else %>
<div class="card tables green text-white" data-id="<%= table.id %>" data-name="<%= table.name %>"> <div class="card tables green text-white" data-id="<%= table.id %>" data-name="<%= table.name %>">
<div class="card-block"> <div class="card-block">
@@ -76,31 +92,86 @@
<div class="card-header"> <div class="card-header">
<div><strong id="order-title"> MOVE --> <span style='color:red'> ' <%= @dining.name %> ' </span> to <span style='color:blue' id="moved"> </span></strong></div> <div><strong id="order-title"> MOVE --> <span style='color:red'> ' <%= @dining.name %> ' </span> to <span style='color:blue' id="moved"> </span></strong></div>
<input type='hidden' id="change_table_value" value="" /> <input type='hidden' id="change_table_value" value="" />
<% if @status_order == 'order' && @status_sale != 'sale' %>
<% if !@obj_order.nil? %>
<div id="save_order_id" data-order="<%= @obj_order.order_id %>">
<% else %>
<div id="save_order_id" data-order="">
<% end %>
<% if !@booking.nil? %>
<strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
<% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
<span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
<% else %>
<span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
<% end %>
<% end %>
</div>
<% elsif @status_sale == 'sale' %>
<div><strong id="order-title">INVOICE DETAILS </strong> | Table <%= @dining.name rescue "" %>
<% if !@booking.reserved_by.nil? && %>
<span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
<% else %>
<span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
<% end %>
</div>
<% else %>
<strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
<% end %>
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title row"> <div class="card-title">
<div class="row p-l-5 p-r-5">
<% if (!@sale_array.empty?) && (!@date.nil?) %>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<p class="m-l-10"> Receipt No: <span id="receipt_no"> &nbsp; Receipt No: <span id="receipt_no">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<%= @obj_sale.receipt_no rescue '' %> <%= @sale_array[0].receipt_no rescue '' %>
<% end %> <% end %>
</span></p> </span>
<br>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right"> <div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p class="m-r-10">Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p> Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %></span>
</div> <br>
</div>
<div class="card-title row customer_detail hide">
<div class="col-lg-6 col-md-6 col-sm-6">
<p>Customer : <span id="customer_name"></span></p>
</div> </div>
<% elsif !@date.nil? %>
<div class="col-lg-7 col-md-7 col-sm-7">
&nbsp; Order No: <span id="order_no">
<% if @status_order == 'order' %>
<%= @obj_order.order_id rescue '' %>
<% end %>
</span>
<br>
</div>
<div class="col-lg-5 col-md-5 col-sm-5 text-right">
Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %></span>
<br>
</div>
<% end %>
</div>
</div>
<div class="row p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6">
<% if @status_sale == 'sale' && !@sale_array.empty? %>
<p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
&nbsp; Customer : <%= @sale_array[0].customer.name rescue '' %>
<% elsif @status_order == 'order' && !@customer.nil?
%>
<p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
&nbsp; Customer : <%= @customer.name rescue "" %>
<% end %>
</div>
</div> </div>
<div id="order-detail-slimscroll" data-height="130"> <div id="order-detail-slimscroll" data-height="130">
<div class="card-text" style="" > <div class="card-text" style="" >
<table class="table table-striped" id="order-items-table"> <table class="table table-striped" id="order-items-table">
<thead> <thead>
<tr> <tr>
<th>#</th>
<th class="item-name">Items</th> <th class="item-name">Items</th>
<th class="item-attr">QTY</th> <th class="item-attr">QTY</th>
<th class="item-attr">Price</th> <th class="item-attr">Price</th>
@@ -108,14 +179,17 @@
</thead> </thead>
<tbody> <tbody>
<% <%
count = 0
sub_total = 0 sub_total = 0
if @status_sale == "sale" if @status_sale == "sale"
@obj_sale.sale_items.each do |sale_item| @sale_array[0].sale_items.each do |sale_item|
count += 1
sub_total = sub_total + sale_item.price sub_total = sub_total + sale_item.price
%> %>
<input type="hidden" id="sale_id" value="<%= @obj_sale.sale_id %>"> <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
<% unless sale_item.price <= 0 %> <% unless sale_item.price <= 0 %>
<tr> <tr>
<td><%= count %></td>
<td class='item-name'><%= sale_item.product_name %></td> <td class='item-name'><%= sale_item.product_name %></td>
<td class='item-attr'><%= sale_item.qty %></td> <td class='item-attr'><%= sale_item.qty %></td>
<td class='item-attr'><%= sale_item.price %></td> <td class='item-attr'><%= sale_item.price %></td>
@@ -125,19 +199,22 @@
end end
end end
if @status_order == 'order' if @status_order == 'order' && @status_sale != 'sale'
unless @order_items.nil? unless @order_items.nil? || @order_items.empty?
count = 0
@order_items.each do |order_item | @order_items.each do |order_item |
sub_total = sub_total + order_item.price count += 1
sub_total = sub_total + (order_item.price * order_item.qty)
unless order_item.price <= 0 %> #unless order_item.price <= 0 %>
<tr> <tr>
<td><%= count %></td>
<td class='item-name'><%= order_item.item_name %></td> <td class='item-name'><%= order_item.item_name %></td>
<td class='item-attr'><%= order_item.qty %></td> <td class='item-attr'><%= order_item.qty %></td>
<td class='item-attr'><%= order_item.qty*order_item.price %></td> <td class='item-attr'><%= order_item.qty*order_item.price %></td>
</tr> </tr>
<% <%
end #end
end end
end end
end end
@@ -146,9 +223,50 @@
</table> </table>
</div> </div>
</div> </div>
<%
if @status_sale == 'sale'
unless @order_items.nil?
%>
Pending New Order
<table class="table table-striped">
<%
@order_items.each do |order_item |
%>
<tr>
<td class='item-name'><%= order_item.item_name %></td>
<td class='item-attr'><%= order_item.qty %></td>
<td class='item-attr'><%= order_item.qty*order_item.price %></td>
</tr>
<%
end
%>
</table>
<button class='btn btn-primary btn-block waves-effect' id='add_invoice'> Add to existing invoice </button>
<%
else
@sale_array.each do |sale|
if @sale_array.size > 1
unless sale.receipt_no == @sale_array[0].receipt_no
%>
Pending Payment
<table class="table table-striped">
<tr>
<td>Receipt No - <%= sale.receipt_no %></td>
<td><button class='btn btn-lg btn-blue '>Show Detail </button></td>
</tr>
</table>
<%
end
end
end
end
end
%>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="move_table purple" id="move_table">MOVE TABLE</div> <div class="move_table purple" id="move_table">MOVE ROOM</div>
</div> </div>
</div> </div>
</div> </div>
@@ -175,17 +293,34 @@ $(document).ready(function(){
$(this).addClass('selected-item'); $(this).addClass('selected-item');
var dining_name = $(this).attr("data-name"); var dining_name = $(this).attr("data-name");
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
var change_from = "<%= @dining.id %>";
if ((dining_id == change_from) || (dining_name==undefined)) {
swal({
title: "Alert!!",
text: 'Please select another table !',
type: 'warning',
});
}else{
$('#moved').text(" ' " + dining_name + " ' ") $('#moved').text(" ' " + dining_name + " ' ")
$('#change_table_value').val(dining_id); $('#change_table_value').val(dining_id);
}
}) })
$(".rooms").on('click', function(){ $(".rooms").on('click', function(){
$('.rooms').removeClass('selected-item');
$(this).addClass('selected-item'); $(this).addClass('selected-item');
var dining_name = $(this).attr("data-name"); var dining_name = $(this).attr("data-name");
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
var change_from = "<%= @dining.id %>";
if (dining_id == change_from) {
swal({
title: "Alert!!",
text: 'Please select another room !',
type: 'warning',
});
}else{
$('#moved').text(dining_name) $('#moved').text(dining_name)
$('#change_table_value').val(dining_id); $('#change_table_value').val(dining_id);
}
}) })
$('#move_table').on('click',function(){ $('#move_table').on('click',function(){
@@ -207,7 +342,33 @@ $(document).ready(function(){
} }
}); });
} }
}) });
$('#add_invoice').on('click', function () {
var dining_id = "<%= @dining.id %>";
var sale_id = $("#sale_id").val();
var ajax_url = "/origami/sale/append_order";
$.ajax({
type: "POST",
url: ajax_url,
data: 'dining_id=' + dining_id + "&sale_id=" + sale_id,
success: function (result) {
swal({
title: "Information!",
text: "Invoice updated",
html: true,
closeOnConfirm: false,
closeOnCancel: false,
allowOutsideClick: false
}, function () {
$("#first_bill").removeAttr('disabled');
$("#pay").removeAttr('disabled');
window.location.reload();
});
}
});
});
}); });
$('#back').on('click',function(){ $('#back').on('click',function(){
window.location.href = '/origami/room/'+ "<%= @dining.id %>"; window.location.href = '/origami/room/'+ "<%= @dining.id %>";

48
app/views/origami/movetable/move_dining.html.erb
View File

@@ -54,6 +54,7 @@
</div> </div>
</div> </div>
<!--- Panel 2 - Room Orders --> <!--- Panel 2 - Room Orders -->
<div class="tab-pane" id="rooms" role="tabpanel"> <div class="tab-pane" id="rooms" role="tabpanel">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;" > <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;" >
@@ -243,7 +244,7 @@ if @status_sale == 'sale'
end end
%> %>
</table> </table>
<button class='btn btn-blue'> Add to existing invoice </button> <button class='btn btn-primary btn-block waves-effect' id='add_invoice'> Add to existing invoice </button>
<% <%
else else
@sale_array.each do |sale| @sale_array.each do |sale|
@@ -294,25 +295,17 @@ end
var dining_name = $(this).attr("data-name"); var dining_name = $(this).attr("data-name");
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
var change_from = "<%= @dining.id %>"; var change_from = "<%= @dining.id %>";
if (dining_id == change_from) { if ((dining_id == change_from) || (dining_name==undefined)) {
/*$.alert({
title: 'Alert!',
content: 'Please Select Another Table',
type: 'red',
typeAnimated: true,
btnClass: 'btn-danger',
});*/
swal({ swal({
title: "Alert!!", title: "Alert!!",
text: 'Please Select Another Table !', text: 'Please select another table !',
type: 'warning', type: 'warning',
}); });
}else{ }else{
$('#moved').text(" ' " + dining_name + " ' ") $('#moved').text(" ' " + dining_name + " ' ")
$('#change_table_value').val(dining_id); $('#change_table_value').val(dining_id);
} }
});
})
$(".rooms").on('click', function(){ $(".rooms").on('click', function(){
$('.rooms').removeClass('selected-item'); $('.rooms').removeClass('selected-item');
@@ -323,14 +316,14 @@ end
if (dining_id == change_from) { if (dining_id == change_from) {
swal({ swal({
title: "Alert!!", title: "Alert!!",
text: 'Please Select Another Table !', text: 'Please select another room !',
type: 'warning', type: 'warning',
}); });
}else{ }else{
$('#moved').text(dining_name) $('#moved').text(dining_name)
$('#change_table_value').val(dining_id); $('#change_table_value').val(dining_id);
} }
}) });
$('#move_table').on('click',function(){ $('#move_table').on('click',function(){
change_to = $('#change_table_value').val(); change_to = $('#change_table_value').val();
@@ -362,7 +355,32 @@ end
} }
}); });
} }
}) });
$('#add_invoice').on('click', function () {
var dining_id = "<%= @dining.id %>";
var sale_id = $("#sale_id").val();
var ajax_url = "/origami/sale/append_order";
$.ajax({
type: "POST",
url: ajax_url,
data: 'dining_id=' + dining_id + "&sale_id=" + sale_id,
success: function (result) {
swal({
title: "Information!",
text: "Invoice updated",
html: true,
closeOnConfirm: false,
closeOnCancel: false,
allowOutsideClick: false
}, function () {
$("#first_bill").removeAttr('disabled');
$("#pay").removeAttr('disabled');
window.location.reload();
});
}
});
});
}); });
$('#back').on('click',function(){ $('#back').on('click',function(){
window.location.href = '/origami/table/'+ "<%= @dining.id %>"; window.location.href = '/origami/table/'+ "<%= @dining.id %>";

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

@@ -30,7 +30,7 @@
<% @complete.each do |sale| %> <% @complete.each do |sale| %>
<div class="card sales red text-white" data-id = "<%= sale.sale_id %>"> <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
<div class="card-block"> <div class="card-block">
<%= sale.receipt_no %><span class="pull-right font-12"><%= sale.sale_status %></span> <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -135,7 +135,7 @@
<div class="tab-pane dining" id="orders" role="tabpanel"> <div class="tab-pane dining" id="orders" role="tabpanel">
<div class="card-columns"> <div class="card-columns">
<% @orders.each do |order| %> <% @orders.each do |order| %>
<div class="card orders red text-white" data-id = "<%= order.order_id %>"> <div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
<div class="card-block"> <div class="card-block">
<% <%
order_status = "" order_status = ""

21
app/views/origami/sales/show.html.erb
View File

@@ -90,9 +90,24 @@
<div class="tab-pane" id="orders" role="tabpanel" style=""> <div class="tab-pane" id="orders" role="tabpanel" style="">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @orders.each do |order| %> <% @orders.each do |order| %>
<div class="card orders bg-red text-white" data-id = "<%= order.order_id %>"> <div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id="<%= order.order_id %>">
<div class="card-block"> <div class="card-block">
<%= order.order_id %> <%
order_status = ""
sale_order = SaleOrder.find_by_order_id(order)
if sale_order
unless sale_order.sale_id.nil?
sale = Sale.find(sale_order.sale_id)
order_status = sale.sale_status
if order_status == 'new'
order_status = order.status
end
end
else
order_status = order.status
end
%>
<%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -198,7 +213,7 @@
<!-- Column Three --> <!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1"> <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> <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
<% if @sale.sale_status != 'void' %> <% if @sale.sale_status != 'void' && @sale.sale_status != 'waste' && @sale.sale_status != 'spoile' %>
<% if current_login_employee.role == "cashier" %> <% if current_login_employee.role == "cashier" %>
<a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal" data-type="void"> Void</a> <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal" data-type="void"> Void</a>
<% else %> <% else %>

16
app/views/reports/receipt_no/index.html.erb
View File

@@ -68,11 +68,7 @@
delimiter = "," delimiter = ","
else else
delimiter = "" delimiter = ""
end end %>
puts precision
puts "predelidm"
puts delimiter %>
<% grand_total = 0 %> <% grand_total = 0 %>
<% old_grand_total = 0 %> <% old_grand_total = 0 %>
@@ -116,12 +112,18 @@
<td colspan="2">&nbsp;</td> <td colspan="2">&nbsp;</td>
<td><b><%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td> <td><b><%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
<td><b><%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td> <td><b><%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
<% @sale_taxes.each do |tax| %> <% if !@sale_taxes.empty?
@sale_taxes.each do |tax| %>
<td><b><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td> <td><b><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
<% end %> <% end %>
<% else %>
<% @tax_profiles.each do |tax| %>
<td><b>0</b></td>
<% end %>
<% end %>
<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td> <td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
<td><b><%= rounding_adj.to_f rescue '-' %></b></td> <td><b><%= rounding_adj.to_f rescue '-' %></b></td>
<td><b><%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter) %></b></td> <td><b><%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter) rescue '0' %></b></td>
</tr> </tr>
<tr> <tr>
<td colspan="2">&nbsp;</td> <td colspan="2">&nbsp;</td>