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

pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-05-04 18:00:44 +06:30
parent 2f398bcfeb
commit bb4c004406
12 changed files with 185 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -188,6 +188,10 @@ Add Base URL for DOEMAL
1) settings/lookups => { type:order_reservation, name: BaseURL, value:'{doemal url}' } 1) settings/lookups => { type:order_reservation, name: BaseURL, value:'{doemal url}' }
2) settings/lookups => { type:order_reservation, name: Token, value:'{doemal token}' } 2) settings/lookups => { type:order_reservation, name: Token, value:'{doemal token}' }
Add Feature for Dine-in Cashier
** '0' means can not use dine-in cashier and '1' means can use dine-in cashier **
=> settings/lookups => { type:dinein_cashier, name: DineInCashier, value:'{0 or 1}' }
Add Feature for Quick Service Add Feature for Quick Service
** '0' means can not use quick service and '1' means can use quick service ** ** '0' means can not use quick service and '1' means can use quick service **
=> settings/lookups => { type:quick_service, name: QuickService, value:'{0 or 1}' } => settings/lookups => { type:quick_service, name: QuickService, value:'{0 or 1}' }

4
app/assets/javascripts/order_reservation.js
View File

@@ -282,8 +282,8 @@ function callback_url(callback,ref_no,order_id,status,time,exptime){
function timeFormat(date){ function timeFormat(date){
var isPM = date.getHours() >= 12; var isPM = date.getHours() >= 12;
var isMidday = date.getHours() == 12; var isMidday = date.getHours() == 12;
var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), var time = [(date.getHours()>10? date.getHours() : '0'+date.getHours()) - (isPM && !isMidday ? 12 : 0),
date.getMinutes() || '00'].join(':') + (date.getMinutes()>10? date.getMinutes() : '0'+date.getMinutes()) || '00'].join(':') +
(isPM ? ' PM' : ' AM'); (isPM ? ' PM' : ' AM');
return time; return time;
} }

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

@@ -18,9 +18,6 @@ class Origami::AddordersController < BaseOrigamiController
if check_mobile if check_mobile
@webview = true @webview = true
end end
today = DateTime.now
day = Date.today.wday
@menus = Menu.all @menus = Menu.all
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
@table_id = params[:id] @table_id = params[:id]

7
app/controllers/origami/dashboard_controller.rb
View File

@@ -56,6 +56,13 @@ class Origami::DashboardController < BaseOrigamiController
# get printer info # get printer info
@print_settings = PrintSetting.get_precision_delimiter() @print_settings = PrintSetting.get_precision_delimiter()
@current_user = current_user @current_user = current_user
#dine-in cashier
dinein_cashier = Lookup.collection_of('dinein_cashier')
@dinein_cashier = 0
if !dinein_cashier[0].nil?
@dinein_cashier = dinein_cashier[0][1]
end
#quick service #quick service
quick_service = Lookup.collection_of('quick_service') quick_service = Lookup.collection_of('quick_service')
@quick_service = 0 @quick_service = 0

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

@@ -1,7 +1,7 @@
class Origami::OrderReservationController < BaseOrigamiController class Origami::OrderReservationController < BaseOrigamiController
def index def index
@order = OrderReservation.latest_order @order = OrderReservation.latest_order #.active
@count_on_order = OrderReservation.get_count_on_order @count_on_order = OrderReservation.get_count_on_order
end end

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

@@ -279,6 +279,9 @@ class Origami::PaymentsController < BaseOrigamiController
new_total = Sale.get_rounding_adjustment(saleObj.grand_total) new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
@rounding_adj = new_total-saleObj.grand_total @rounding_adj = new_total-saleObj.grand_total
saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj) saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj)
@sale_data.grand_total = new_total
@sale_data.old_grand_total = saleObj.grand_total
@sale_data.rounding_adjustment = @rounding_adj
else else
@rounding_adj = @sale_data.rounding_adjustment @rounding_adj = @sale_data.rounding_adjustment
end end

5
app/models/order_reservation.rb
View File

@@ -7,6 +7,7 @@ class OrderReservation < ApplicationRecord
has_many :order_reservation_items has_many :order_reservation_items
has_one :delivery has_one :delivery
scope :active, -> { where("created_at BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") }
scope :latest_order, -> { order("order_reservation_id desc, created_at desc") } scope :latest_order, -> { order("order_reservation_id desc, created_at desc") }
SEND_TO_KITCHEN = "send_to_kitchen" SEND_TO_KITCHEN = "send_to_kitchen"
@@ -218,7 +219,7 @@ class OrderReservation < ApplicationRecord
def self.check_order_send_to_kitchen def self.check_order_send_to_kitchen
today = Time.now.utc today = Time.now.utc
order_reservation = OrderReservation.where("status='accepted' and requested_time > '#{today}'") order_reservation = OrderReservation.where("status='accepted' and requested_time > '#{today}' and expected_waiting_time < '#{today}'")
if order_reservation.length > 0 if order_reservation.length > 0
if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
ActionCable.server.broadcast "check_order_send_to_kitchen_channel",data: order_reservation ActionCable.server.broadcast "check_order_send_to_kitchen_channel",data: order_reservation
@@ -228,7 +229,7 @@ class OrderReservation < ApplicationRecord
def self.check_order_ready_to_delivery def self.check_order_ready_to_delivery
today = Time.now.utc today = Time.now.utc
order_reservation = OrderReservation.where("status='send_to_kitchen' and requested_time > '#{today}'") order_reservation = OrderReservation.where("status='send_to_kitchen' and requested_time > '#{today}' and expected_waiting_time < '#{today}'")
if order_reservation.length > 0 if order_reservation.length > 0
if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
ActionCable.server.broadcast "check_order_ready_to_delivery_channel",data: order_reservation ActionCable.server.broadcast "check_order_ready_to_delivery_channel",data: order_reservation

4
app/pdf/order_set_item_pdf.rb
View File

@@ -4,8 +4,8 @@ class OrderSetItemPdf < Prawn::Document
def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty) def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
self.page_width = print_settings.page_width self.page_width = print_settings.page_width
self.page_height = print_settings.page_height self.page_height = print_settings.page_height
self.header_font_size = printer_settings.header_font_size.to_i self.header_font_size = print_settings.header_font_size.to_i
self.item_font_size = printer_settings.item_font_size.to_i self.item_font_size = print_settings.item_font_size.to_i
self.margin = 0 self.margin = 0
self.price_width = 40 # No Need for item self.price_width = 40 # No Need for item
self.qty_width = 40 self.qty_width = 40

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

@@ -43,46 +43,46 @@
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a> <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li> </li>
<% @menu.each do |menu| %> <% @menu.each do |menu| %>
<% if !menu.valid_time.nil? %> <% if !menu.valid_time.nil? %>
<% if menu.menu_category_id.nil? %> <% if menu.menu_category_id.nil? %>
<!--if type quick_service or cashier for table --> <!--if type quick_service or cashier for table -->
<% if type %> <% if type %>
<% if !menu.code.include? "SPL" %> <% if !menu.code.include? "SPL" %>
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
<p class="hidden menu-id"><%= menu.id %></p> <p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%> <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list"> <ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul> </ul>
</a> </a>
</li> </li>
<% end%> <% end%>
<!-- else quick_service or cashier for table --> <!-- else quick_service or cashier for table -->
<% else %> <% else %>
<% if @table.get_current_checkout_booking.nil? %> <% if @table.get_current_checkout_booking.nil? %>
<% if !menu.code.include? "SPL" %> <% if !menu.code.include? "SPL" %>
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%> " data-sub-id="<%=menu.get_sub_category%>"> <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%> " data-sub-id="<%=menu.get_sub_category%>">
<p class="hidden menu-id"><%= menu.id %></p> <p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%> <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list"> <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul> </ul>
</a> </a>
</li> </li>
<% end%> <% end%>
<% else %> <% else %>
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
<p class="hidden menu-id"><%= menu.id %></p> <p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%> <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list"> <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul> </ul>
</a> </a>
</li> </li>
<% end%> <% end%>
<!-- end quick_service or cashier for table --> <!-- end quick_service or cashier for table -->
<% end %> <% end %>
<% end%> <% end%>
<% end %> <% end %>
<%end %> <%end %>
</ul> </ul>
</div> </div>
</div> </div>

2
app/views/origami/dashboard/index.html.erb
View File

@@ -28,6 +28,7 @@
</div> </div>
</div> </div>
<% end %> <% end %>
<% if @dinein_cashier == '1' %>
<div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 cashier_view"> <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 cashier_view">
<div class="info-box bg-green"> <div class="info-box bg-green">
<div class="icon" > <div class="icon" >
@@ -36,6 +37,7 @@
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div> <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
</div> </div>
</div> </div>
<% end %>
<% if @order_reservation == '1' %> <% if @order_reservation == '1' %>
<div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 order_reservation"> <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 order_reservation">
<div class="info-box bg-blue"> <div class="info-box bg-blue">

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

@@ -378,7 +378,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<p id="ref_no" class="hidden"></p> <p id="ref_no" class="hidden"></p>
<p id="callback_url" class="hidden"></p> <p id="callback_url" class="hidden"></p>
<p id="order_id" class="hidden"></p> <p id="order_id" class="hidden"></p>
@@ -411,4 +411,6 @@
<div id="notify_new_order"></div> <div id="notify_new_order"></div>
<div id="notify_order_send_to_kitchen"></div> <div id="notify_order_send_to_kitchen"></div>
<div id="notify_order_ready_to_delivery"></div> <div id="notify_order_ready_to_delivery"></div>
</div>

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

@@ -198,13 +198,74 @@
<!-- 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' %>
<button type="button" id="void" class="btn bg-danger btn-block">VOID</button> <% if current_login_employee.role == "cashier" %>
<% end %> <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal" data-type="void"> Void</a>
<% else %>
<button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
<% end %>
<% end %>
<button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button> <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="AccessCodeModal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-sm" role="document">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="AccessCodeModalLabel">Enter Access Code</h4>
<button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#111;">&times;</button>
</div>
<div class="modal-body" style="padding: 0px 25px 15px 25px !important">
<input type="text" id="access_code" class="access_code form-control col-md-12 ">
<div class="row bottom p-l-15 p-r-15 m-t-10">
<div class="col-md-3 access_number border-top border-left" data-value="1" data-type="num">1</div>
<div class="col-md-3 access_number border-top border-left" data-value="2" data-type="num">2</div>
<div class="col-md-3 access_number border-top border-left" data-value="3" data-type="num">3</div>
<div class="col-md-3 access_number border-top border-left" data-value="4" data-type="num">4</div>
</div>
<div class="row bottom p-l-15 p-r-15">
<div class="col-md-3 access_number border-top border-left" data-value="5" data-type="num">5</div>
<div class="col-md-3 access_number border-top border-left" data-value="6" data-type="num">6</div>
<div class="col-md-3 access_number border-top border-left" data-value="7" data-type="num">7</div>
<div class="col-md-3 access_number border-top border-left" data-value="8" data-type="num">8</div>
</div>
<div class="row bottom p-l-15 p-r-15">
<div class="col-md-3 access_number border-top border-left" data-value="9" data-type="num">9</div>
<div class="col-md-3 access_number border-top border-left" data-value="0" data-type="num">0</div>
<div class="col-md-3 access_number border-top border-left orange" data-type="clr">Clr</div>
<div class="col-md-3 access_number ok border-top border-left blue" data-type="ok" data-action="">OK</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="voidModalLabel">Please Enter Reason for Void</h4>
</div>
<div class="modal-body">
<input type="textarea" name="remark" class="form-control col-md-12 remark" id="remark">
</div>
<div class="modal-footer ">
<div class="row p-r-20">
<div class="col-md-5">
<button type="button" class="btn btn-link p-t-5 p-b-5 bg-red waves-effect " id="void" active="true">VOID</button>
</div>
<div class="col-md-5">
<button type="button" class="btn btn-link p-t-5 p-b-5 bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
</div>
</div>
</div>
</div>
</div>
</div>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$(".tables").on('click', function(){ $(".tables").on('click', function(){
@@ -247,7 +308,14 @@ $('#back').on('click',function(){
// // }); // // });
// } // }
// }); // });
$(document).on('click', '.access_modal', function(event){
type = $(this).data("type");
$(".ok").attr("data-action",type)
$('#AccessCodeModal').modal('show');
});
$('#void').on('click', function () { $('#void').on('click', function () {
var access_code = localStorage.getItem("access_code");
swal({ swal({
title: "Alert", title: "Alert",
text: "Are you sure want to Void?", text: "Are you sure want to Void?",
@@ -259,10 +327,12 @@ $('#back').on('click',function(){
}, function (isConfirm) { }, function (isConfirm) {
if (isConfirm) { if (isConfirm) {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
var ajax_url = "/origami/sale/" + sale_id + '/void'; var ajax_url = "/origami/sale/" + sale_id +'/'+'cashier'+ '/void';
// var ajax_url = "/origami/sale/" + sale_id + '/void';
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: ajax_url, url: ajax_url,
data: {'access_code':access_code},
success: function () { success: function () {
window.location.href = '/origami/sale/'+sale_id; window.location.href = '/origami/sale/'+sale_id;
} }
@@ -271,10 +341,52 @@ $('#back').on('click',function(){
}); });
}); });
function check_emp_access_code(access_code,type) {
var url = "/origami/check_emp_access_code/" + access_code ;
$.ajax({
type: 'POST',
url: url,
data: {},
success: function (result) {
console.log(result)
if (result.status == true) {
createAccessCode(code);
if (type == "edit") {
var dining_id = $('#dining').text();
var sale_id = $('#sale_id').text();
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 if(type == "void"){
$('#AccessCodeModal').modal('hide');
$('#voidModal').modal('show');
// overall_void();
}else if(type == "waste") {
// $('#AccessCodeModal').modal('hide');
// $('#focModal').modal('show');
waste_and_spoilage("waste")
}else if(type == "spoile") {
// $('#AccessCodeModal').modal('hide');
// $('#voidModal').modal('show');
waste_and_spoilage("spoile")
}else if(type == "foc"){
$('#AccessCodeModal').modal('hide');
$('#focModal').modal('show');
// overall_foc();
}
}else{
swal("Opps",result.message,"warning")
}
}
});
}
$('#re-print').click(function() { $('#re-print').click(function() {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
window.location.href = '/origami/'+ sale_id + "/reprint" window.location.href = '/origami/'+ sale_id + "/reprint"
return false; // return false;
}); });
</script> </script>