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

fix addorder UI

Browse Source
This commit is contained in:
Zin Moe
2020-03-16 17:54:10 +06:30
parent 2cd816e20f
commit ce6785c70b
11 changed files with 166 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/addorder.js
View File

@@ -1539,6 +1539,13 @@ $(function() {
// price = $("#unit_price").text(); // price = $("#unit_price").text();
// $("#total_price").text(qty*price); // $("#total_price").text(qty*price);
// }); // });
function truncateString(str, num) {
if (str.length <= num) {
return str
} else {
return str.slice(0, num) + '...'
}
}
function show_menu_list(menu_items) { function show_menu_list(menu_items) {
var menu_list = $('.menu_items_list'); var menu_list = $('.menu_items_list');
menu_list.empty(); menu_list.empty();
@@ -1617,10 +1624,12 @@ $(function() {
oos_header = '' oos_header = ''
opacity = '' opacity = ''
} }
name = menu_items[field].name
short_name = truncateString(name, 30)
row = '<div class="col-md-6 col-sm-6 col-lg-3 m-t-2">' row = '<div class="col-md-6 col-sm-6 col-lg-3 m-t-2">'
+ oos_item + oos_header + oos_item + oos_header
+'<div class="custom-card-head card-head row" style="margin:0px; height: auto; font-size: 0.9em; opacity: '+opacity+'" >' +'<div class="custom-card-head card-head row" style="margin:0px; height: 40px; font-size: 0.9em; opacity: '+opacity+'" >'
+'<div class="col-md-10 " style="padding:0px !important;">'+ menu_items[field].name +'</div>' +'<div class="col-md-10 " style="padding:0px !important;">'+ short_name +'</div>'
+'</div>' +'</div>'
+"<div class='"+add_icon+"' " +"<div class='"+add_icon+"' "
@@ -1672,6 +1681,8 @@ $(function() {
oos_header = '' oos_header = ''
opacity = '' opacity = ''
} }
name = menu_items[field].name
short_name = truncateString(name, 60)
row = '<div class="col-md-6 col-sm-6 col-lg-3 m-t-2">' row = '<div class="col-md-6 col-sm-6 col-lg-3 m-t-2">'
+ oos_item + oos_header + oos_item + oos_header
+'<div class="custom-card-no-img-head card-head h-100 '+add_icon+' " id="oos'+ code +'" style="margin:0px;display:flex; opacity: '+opacity+';"' +'<div class="custom-card-no-img-head card-head h-100 '+add_icon+' " id="oos'+ code +'" style="margin:0px;display:flex; opacity: '+opacity+';"'
@@ -1690,7 +1701,7 @@ $(function() {
+" data-item-sets = '"+JSON.stringify(menu_items[field].item_sets)+"'" +" data-item-sets = '"+JSON.stringify(menu_items[field].item_sets)+"'"
+" data-instances = '"+JSON.stringify(menu_items[field].instances)+"'>" +" data-instances = '"+JSON.stringify(menu_items[field].instances)+"'>"
+'<div class="product_box" style="width:100%;"><span>'+ menu_items[field].name +'<span></div>' +'<div class="product_box" style="width:100%;"><span>'+ short_name +'<span></div>'
+'</div>' +'</div>'
+"<div class='"+add_icon+"' " +"<div class='"+add_icon+"' "
+" data-item-code='"+ menu_items[field].code +"' " +" data-item-code='"+ menu_items[field].code +"' "

10
app/assets/javascripts/custom.js
View File

@@ -23,6 +23,16 @@ $(document).ready(function() {
touchScrollStep : 50 touchScrollStep : 50
}); });
$('#foodcourt-table-slimscroll').slimScroll({
height: '100%',
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0',
touchScrollStep : 50
});
$('#foodcourt-order-slimscroll').slimScroll({ $('#foodcourt-order-slimscroll').slimScroll({
height: '100%', height: '100%',
size: '5px', size: '5px',

2
app/controllers/base_foodcourt_controller.rb
View File

@@ -12,7 +12,7 @@ class BaseFoodcourtController < ActionController::Base
rescue_from CanCan::AccessDenied do |exception| rescue_from CanCan::AccessDenied do |exception|
flash[:warning] = exception.message flash[:warning] = exception.message
# redirect_to origami_root_path # redirect_to origami_root_path
redirect_to origami_dashboard_path redirect_to foodcourt_food_court_path
end end
def check_user def check_user

8
app/controllers/foodcourt/orders_controller.rb
View File

@@ -87,6 +87,14 @@ class Foodcourt::OrdersController < BaseFoodcourtController
@completed, @bookings = Sale.get_foodcourt_current_shift_orders @completed, @bookings = Sale.get_foodcourt_current_shift_orders
end end
def current_shift_order_count
@current_shift = ShiftSale.current_shift
@pending_sales = Sale.where('shift_sale_id = ? AND sale_status NOT IN (?)', @current_shift.id, status)
@pending_orders = Sale.pending_order('food_court')
@occupied_table = @pending_sales.length + @pending_orders.length
render json: @occupied_table
end
def modify_order def modify_order
@cashier_type = "food_court" @cashier_type = "food_court"
today = DateTime.now today = DateTime.now

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

@@ -108,7 +108,8 @@
</div> </div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10 d-flex flex-column h-100" > <div class="col-md-7 col-lg-7 col-sm-7 m-t-10 d-flex flex-column h-100" style="margin-left: -10px;
margin-right: -10px;">
<div class="card h-100"> <div class="card h-100">
<div class="card-block d-flex flex-column h-100" style=""> <div class="card-block d-flex flex-column h-100" style="">
<div class="card-text" id="foodcourt-slimscroll"> <div class="card-text" id="foodcourt-slimscroll">
@@ -156,8 +157,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-3 col-lg-3 col-sm-3 m-t-10 d-flex flex-column h-100 "> <div class="col-md-3 col-lg-3 col-sm-3 m-t-10 d-flex flex-column h-100">
<div class="card h-100"> <div class="card h-100" style="margin-right: -20px;">
<div class="card-header" style="padding: 0.12rem 0.25rem"> <div class="card-header" style="padding: 0.12rem 0.25rem">
<button type="button" class="btn btn-lg btn-primary waves-effect col-md-12" id='app_order'> <button type="button" class="btn btn-lg btn-primary waves-effect col-md-12" id='app_order'>
Orders Orders

45
app/views/foodcourt/orders/app_orders.html.erb
View File

@@ -32,7 +32,7 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div class="tab-content h-100"> <div class="tab-content h-100 d-flex flex-column">
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane h-100 <%= params[:active] == 'completed' ? 'active' : '' %>" id="complete" role="tabpanel"> <div class="tab-pane h-100 <%= params[:active] == 'completed' ? 'active' : '' %>" id="complete" role="tabpanel">
<div class="d-flex flex-column h-100"> <div class="d-flex flex-column h-100">
@@ -90,10 +90,9 @@
<%= link_to foodcourt_app_order_by_booking_path(pending_id: pc.sale_id, active: 'completed'), class: 'item-card' do %> <%= link_to foodcourt_app_order_by_booking_path(pending_id: pc.sale_id, active: 'completed'), class: 'item-card' do %>
<div class="card <%= bg_color %> text-white"> <div class="card <%= bg_color %> text-white">
<div class="card-block"> <div class="card-block">
<%= pc.receipt_no %> <%= pc.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"> <%= pc.created_at.utc.getlocal.strftime("%I:%M %p") %></span>
<span class="float-right"><%= pc.created_at.strftime('%I:%M %p') %></span>
<br> <br>
<span class="float-right"><%= pc.sale_status %></span> <span style="font-size:12px;float:right;line-height: 30px;"><%= pc.sale_status %></span>
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -105,7 +104,7 @@
<!-- Panel 1 - Pending Orders --> <!-- Panel 1 - Pending Orders -->
<div class="tab-pane <%= 'active' if params[:active].blank? %> h-100" id="pending_order" role="tabpanel"> <div class="tab-pane <%= 'active' if params[:active].blank? %> h-100" id="pending_order" role="tabpanel">
<div class="h-100 d-flex flex-column"> <div class="h-100 d-flex flex-column">
<div id="foodcourt-order-slimscroll"> <div id="foodcourt-order-slimscroll" class="h-100">
<div class="card-columns p-l-10"> <div class="card-columns p-l-10">
<% @pending_sales.each do |sale| %> <% @pending_sales.each do |sale| %>
<% if @pending.present? %> <% if @pending.present? %>
@@ -123,7 +122,7 @@
<%= sale.receipt_no %> <%= sale.receipt_no %>
<span class="float-right"><%= sale.created_at.strftime('%I:%M %p') %></span> <span class="float-right"><%= sale.created_at.strftime('%I:%M %p') %></span>
<br> <br>
<span class = 'float-right'>Billed</span> <span class = 'float-right m-t-5'>Billed</span>
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -144,7 +143,7 @@
<%= order.booking_id %> <%= order.booking_id %>
<span class="float-right"><%= order.created_at.strftime('%I:%M-%p') %></span> <span class="float-right"><%= order.created_at.strftime('%I:%M-%p') %></span>
<br> <br>
<span class="float-right">new</span> <span class="float-right m-t-5">new</span>
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -188,7 +187,7 @@
</div> </div>
<% if !@booking.nil?%> <% if !@booking.nil?%>
<div class="col-md-4 col-lg-4 col-sm-12 h-100 d-flex flex-column m-l--15"> <div class="col-md-5 col-lg-5 col-sm-12 h-100 d-flex flex-column m-l--15" style="padding-right: 15px">
<span id="sale_id" style="display:none"><%= @booking.sale_id %></span> <span id="sale_id" style="display:none"><%= @booking.sale_id %></span>
<div class="card h-100" style="margin-bottom: 10px !important"> <div class="card h-100" style="margin-bottom: 10px !important">
<div class="card-header" style="padding: 0.12rem 0.25rem"> <div class="card-header" style="padding: 0.12rem 0.25rem">
@@ -203,7 +202,7 @@
<span class="font-14 float-left d-inline"><b>Booking</b> - <%=@booking.booking_id%></span> <span class="font-14 float-left d-inline"><b>Booking</b> - <%=@booking.booking_id%></span>
<span class="font-14 float-right d-inline"><b>Order No</b> - <%=@booking.order_id%></span> <span class="font-14 float-right d-inline"><b>Order No</b> - <%=@booking.order_id%></span>
</div> </div>
<div class="card-text h-100" id="foodcourt-order-slimscroll" style="overflow-y: auto"> <div class="card-text h-100" id="foodcourt-table-slimscroll" style="overflow-y: auto">
<table class="table table-striped summary-items fixed-header"> <table class="table table-striped summary-items fixed-header">
<thead> <thead>
<tr> <tr>
@@ -256,16 +255,13 @@
<td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total"><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></strong></td> <td style="padding:2px; text-align:" width="25%" class="item-attr"><strong id="sub_total"><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></strong></td>
</tr> </tr>
</table> </table>
<button type="button" class="btn btn-primary action-btn create col-md-12" id="done_order" style="margin: 10px 0 -2px 12px; width: 95%; font-size: 1.3rem">
DONE
</button>
</div> </div>
</div> </div>
</div> </div>
<% end %> <% end %>
<% if @pending %> <% if @pending %>
<div class="col-md-4 col-lg-4 col-sm-12 h-100 d-flex flex-column m-l--15"> <div class="col-md-5 col-lg-5 col-sm-12 h-100 d-flex flex-column m-l--15" style="padding-right: 15px">
<% if @status == 'sale' %> <% if @status == 'sale' %>
<span id="sale_id" style="display:none"><%= @pending.try(:sale_id) %></span> <span id="sale_id" style="display:none"><%= @pending.try(:sale_id) %></span>
<% elsif @status == 'order' %> <% elsif @status == 'order' %>
@@ -312,10 +308,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-block"> <div class="card-block d-flex flex-column h-100">
<div id="order-detail-slimscroll" data-height="140"> <div class="card-text h-100" id="foodcourt-table-slimscroll" style="overflow-y: auto">
<div class="card-text" style=""> <table class="table table-striped fixed-header" id="order-items-table">
<table class="table table-striped" id="order-items-table">
<thead> <thead>
<tr> <tr>
<th class="item-name">Items</th> <th class="item-name">Items</th>
@@ -351,8 +346,7 @@
</table> </table>
</div> </div>
</div> </div>
</div> <div class="card-footer">
<div class="pending-order card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<% if @status == 'sale' %> <% if @status == 'sale' %>
<tr> <tr>
@@ -389,13 +383,22 @@
<% end %> <% end %>
<% if @pending || @booking %>
<div class="col-md-1 col-lg-1 col-sm-12 h-100 d-flex flex-column" style="padding-right: 5px; margin-left: -5px;">
<% else %>
<div class="col-md-2 col-lg-2 col-sm-12 h-100 d-flex flex-column" style="padding: 0 15px 0 5px;"> <div class="col-md-2 col-lg-2 col-sm-12 h-100 d-flex flex-column" style="padding: 0 15px 0 5px;">
<% end %>
<button type="button" class="btn btn-block btn-default waves-effect" id='back'> <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
<i class="material-icons">reply</i> <i class="material-icons">reply</i>
<%= t("views.btn.back") %> <%= t("views.btn.back") %>
</button> </button>
<% if !@booking.nil?%> <% if @booking && @booking.booking_status == 'assign' %>
<a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal" data-type="void"> Void</a> <button type="button" class="btn btn-primary btn-block waves-effect create" id="done_order">
DONE
</button>
<% end %>
<% if @booking && @booking.booking_status != 'void' %>
<a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal" data-type="void"> Void </a>
<% end %> <% end %>
<!-- pending order button list --> <!-- pending order button list -->

15
app/views/foodcourt/payments/show.html.erb
View File

@@ -19,7 +19,7 @@
<div class="row clearfix h-100"> <div class="row clearfix h-100">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 d-flex flex-column h-100"> <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 d-flex flex-column h-100">
<div class="card h-100"> <div class="card h-100" style="margin-bottom: 15px">
<div class="card-header m-l-5 m-r-5"> <div class="card-header m-l-5 m-r-5">
<div id="order-title"> <div id="order-title">
<div class="row p-l-5 p-r-5"> <div class="row p-l-5 p-r-5">
@@ -159,12 +159,12 @@
</div> </div>
</div> </div>
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 d-flex flex-column h-100"> <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5 d-flex flex-column h-100" style="padding-right: 10px;">
<div class="card h-100"> <div class="card h-100" style="margin-bottom: 15px">
<div class="card-header" style="margin-bottom: 20%;"> <div class="card-header" style="margin-bottom: 20%;">
<div class="row m-l-5 m-r-5 m-t-20" style="padding-bottom: 14px;"> <div class="row m-l-5 m-r-5 m-t-20" style="padding-bottom: 14px;">
<div class="col-md-8"><strong class='amount_balance' style="font-size: 30px">Amount Due: <% if !@sale_payment.nil? %>( Credit )<% end %></strong></div> <div class="col-md-8"><strong class='amount_balance' style="font-size: 30px">Amount Due: <% if !@sale_payment.nil? %>( Credit )<% end %></strong></div>
<div class="col-md-4"> <div class="col-md-4 text-right">
<strong> <strong>
<span id="grand_total" class="hidden"> <span id="grand_total" class="hidden">
<% if @sale_payment.nil? %> <% if @sale_payment.nil? %>
@@ -196,7 +196,10 @@
</div> </div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1"> <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
<%= link_to 'Back', '/foodcourt/app_orders', class: 'btn btn-block btn-default waves-effect' %> <%= link_to '/foodcourt/app_orders', class: 'btn btn-block btn-default waves-effect', style: "padding-top: 0;" do%>
<i class="material-icons">reply</i>
BACK
<% end %>
<button type="button" class="btn btn-block btn-default waves-effect" id='refresh'> <button type="button" class="btn btn-block btn-default waves-effect" id='refresh'>
Refresh Refresh
</button> </button>
@@ -445,7 +448,7 @@
<div id="sxModal-Content"> <div id="sxModal-Content">
<h3>Card Tap</h3> <h3>Card Tap</h3>
</div> </div>
<div class="m-r-20" align="right"> <div style="position: absolute; bottom: 0; margin-left: 45%; margin-bottom: 60px;">
<button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button> <button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
</div> </div>
</div> </div>

17
app/views/layouts/_header.html.erb
View File

@@ -254,14 +254,29 @@
$('.close_cashier').on('click',function(e){ $('.close_cashier').on('click',function(e){
e.preventDefault(); // Prevent the href from redirecting directly e.preventDefault(); // Prevent the href from redirecting directly
var linkURL = '/foodcourt/shift/cashier/close'; var linkURL = '/foodcourt/shift/cashier/close';
var count = ''
var text = ''
$.ajax({
url: '/foodcourt/current_shift_order_count',
method: 'get',
success: function(data) {
count = JSON.stringify(data)
console.log(count)
if (count > 0) {
text = "<h5><span style=\"color: #CC0000\"> We have "+count+" pending orders and sales</span> </h5>.<br>Are you sure you want to close cashier? ";
}else{
text = "Are you sure you want to close cashier?";
}
swal({ swal({
title: "Alert!", title: "Alert!",
text: "Are you sure you want to close cashier?", text: text,
type: "warning", type: "warning",
showCancelButton: true, showCancelButton: true,
html: true html: true
}, function() { }, function() {
window.location.href = linkURL; window.location.href = linkURL;
}); });
}
})
}) })
</script> </script>

5
app/views/layouts/application.html.erb
View File

@@ -38,12 +38,7 @@
<!-- #END# Overlay For Sidebars --> <!-- #END# Overlay For Sidebars -->
<%= render 'layouts/header' %> <%= render 'layouts/header' %>
<section> <section>
<%food_court = Lookup.find_by_lookup_type_and_value("food_court", "1")%>
<% if food_court && current_user.role=='cashier'%>
<%= render 'layouts/foodcourt_left_sidebar' %>
<% else %>
<%= render 'layouts/left_sidebar' %> <%= render 'layouts/left_sidebar' %>
<%end%>
<%= render 'layouts/right_sidebar' %> <%= render 'layouts/right_sidebar' %>
</section> </section>

2
app/views/layouts/foodcourt.html.erb
View File

@@ -38,7 +38,7 @@
<!-- #END# Overlay For Sidebars --> <!-- #END# Overlay For Sidebars -->
<%= render 'layouts/header' %> <%= render 'layouts/header' %>
<section> <section>
<%= render 'layouts/foodcourt_left_sidebar' %> <%= render 'layouts/left_sidebar' %>
<%= render 'layouts/right_sidebar' %> <%= render 'layouts/right_sidebar' %>
</section> </section>

1
config/routes.rb
View File

@@ -701,6 +701,7 @@ scope "(:locale)", locale: /en|mm/ do
get "food_court/modify_order/:id/:sale_id" => "orders#modify_order" get "food_court/modify_order/:id/:sale_id" => "orders#modify_order"
post '/food_court/update_modify_order' => "orders#update_modify_order", :defaults => { :format => 'json' } post '/food_court/update_modify_order' => "orders#update_modify_order", :defaults => { :format => 'json' }
get '/food_court/:order_id/request_bill' => 'orders#request_bill', :as => 'food_court_request_bill' get '/food_court/:order_id/request_bill' => 'orders#request_bill', :as => 'food_court_request_bill'
get 'current_shift_order_count' => 'orders#current_shift_order_count', :as => 'food_court_order_count'
end end
end end
end end