'
+'
'
+'
'
- +"
'
- +""
+ + JSON.stringify(options) +"' data-image='' data-toggle='modal' data-target='.sx_item_detailModal'>"
+'
'
+''+ product[field].name +'
'
+''
+ pointer_event = 'cursor'
+ opacity = ''
+ }
- row = '
'
+ row = '![](../../"+data.attr()
";
@@ -585,37 +676,39 @@ $(function() {
$('#modal_box_img').append(image);
instance_attributes = []
+ oos_values = ''
+ total_price = 0
+
for(var field in instances) {
+ if (instances[field].out_of_stock) {
+ oos_values = instances[field].values;
+ $('#add_to_order').attr('disabled', true);
+ $('#minus').attr('disabled', true);
+ $('#plus').attr('disabled', true);
+ $('#count').attr('readonly', true)
+ } else {
+ $('.add_to_order').removeAttr('disabled');
+ $('#minus').removeAttr('disabled');
+ $('#plus').removeAttr('disabled');
+ $('#count').removeAttr('readonly');
+ }
+
value = instances[field].values;
$(value).each(function(i){
options = value[i];
instance_attributes.push(options);
- // $.ajax({
- // type: "GET",
- // url: '../../api/restaurant/menu_item_attributes/'+value[i],
- // data: {id:value[i]},
- // success:function(result){
-
- // options = result["name"];
- // instance_attributes.push(options);
- // }
- // });
});
}
- // selected_arr = []
- // $(selected_item).each(function(i){
- // $.ajax({
- // type: "GET",
- // url: '../../api/restaurant/menu_item_attributes/'+selected_item[i],
- // data: {id:selected_item[i]},
- // success:function(result){
- // name = result["name"];
- // selected_arr.push(name);
- // }
- // });
- // });
+ selected_item = selected_item.sort()
+ if(oos_values) {
+ oos_values = oos_values.sort()
+ }
+
+ if (attributes.length === 0) { // for product_box
+ total_price = data.attr('data-price');
+ }
for(var field in attributes) {
value = attributes[field]["values"];
@@ -625,18 +718,27 @@ $(function() {
$(value).each(function(i){
disabled = "false";
status ="";
+
if(parseInt(jQuery.inArray(value[i], selected_item)) !== -1){
- status = "selected-attribute";
+ if(JSON.stringify(oos_values) != JSON.stringify(selected_item)) {
+ status = "selected-attribute";
+ total_price = data.attr('data-price')
+ }
}
+
if(parseInt(jQuery.inArray(value[i], instance_attributes)) == -1){
// disabled = "disabled";
}
+
row +="";
});
+
$(".attributes-list").append(row);
}
@@ -658,17 +760,21 @@ $(function() {
$('#instance_name').text(data.attr('data-instance'));
$('#instance_code').text(data.attr('data-instance-code'));
$('#promotion_price').text(data.attr('data-promotion-price'));
- $('#total_price').text(data.attr('data-price'));
+ $('#total_price').text(total_price);
$('#unit_price').text(data.attr('data-price'));
- });
+ }
// click select option icon for add
$(document).on('click', '.attribute_btn', function(event){
+ $('.attributes-list button').removeClass('bg-gray box-shadow-none');
+
// $('.change_qty').val(1);
value = $(this).data('value');
type = $(this).data('type');
instances = $(this).data('instances');
+ item_attributes = $(this).data('attributes');
+ selected_values = []
attributes = $(".attribute_btn");
$(attributes).each(function(i){
@@ -678,29 +784,118 @@ $(function() {
});
$(this).addClass('selected-attribute');
- // if ($(".attribute_btn").attr("data-type")==type){
- // $('.'+type).removeClass("selected-attribute");
- // }
- // $(this).addClass('selected-attribute');
+ $('button.selected-attribute').each(function(i) {
+ selected_values.push($(this).data('value'));
+ })
+
+ for(var sv in selected_values) {
+ current_type = $('.attributes-list').find(`button[data-value='${selected_values[sv]}']`).data('type')
+ for (var i in item_attributes) {
+ available_btn = []
+ if (item_attributes[i].type != current_type) {
+ for(var j in instances) {
+ if (instances[j].values.includes(selected_values[sv]) && instances[j].out_of_stock == false) {
+ $.map(instances[j].values, function(v) {
+ if (v != selected_values[sv]) {
+ available_btn.push(v)
+ }
+ })
+ }
+ }
+ if (available_btn.length == 0) {
+ element = $('.attributes-list').find(`button[data-type!='${current_type}']`)
+ $.map(element, function(elem) {
+ if (!$(elem).hasClass('bg-gray')) {
+ $(elem).addClass('bg-gray box-shadow-none');
+ }
+ })
+ } else {
+ $.map(available_btn, function(btn) {
+ element = $('.attributes-list').find(`button[data-type !='${current_type}'][data-value!='${btn}']`)
+ $.map(element, function(elem) {
+ if (!$(elem).hasClass('bg-gray') && !available_btn.includes($(elem).data('value'))) {
+ $(elem).addClass('bg-gray box-shadow-none')
+ }
+ })
+ });
+ }
+ }
+ }
+ }
var selected_attr = get_selected_attributes('selected-attribute');
qty = $('.change_qty').val();
+ if($('#total_price').text() > 0) {
+ $('#add_to_order').removeAttr('disabled')
+ $('#total_price').text(0.0)
+ }
+
+ var equal = false;
for(var field in instances) {
item_attr = instances[field].values;
-
+ item_attr = item_attr.sort()
+ selected_attr = selected_attr.sort()
if(JSON.stringify(item_attr) == JSON.stringify(selected_attr)){
- unit_price = instances[field].price ;
- total_price = qty * unit_price ;
- $('#instance_name').text(instances[field].name);
- $('#instance_code').text(instances[field].code);
- $('#promotion_price').text(instances[field].promotion_price);
- $('#total_price').text(total_price);
- $('#unit_price').text(unit_price);
+ if (instances[field].out_of_stock) {
+ var text = ''
+ var length = 0
+ for (var i in selected_attr) {
+ length += 1;
+ if (length == selected_attr.length) {
+ text += selected_attr[i]
+ }
+ else {
+ text += selected_attr[i]+'-'
+ }
+ }
+ $('#wanring_text').text('')
+ $('#wanring_text').append('' + text + ' is out of stock.')
+ $('#add_to_order').attr('disabled', true)
+ $('#minus').attr('disabled', true);
+ $('#plus').attr('disabled', true);
+ $('#count').attr('readonly', true)
+ return
+ } else {
+ equal = true
+ unit_price = instances[field].price ;
+ total_price = qty * unit_price ;
+ $('#instance_name').text(instances[field].name);
+ $('#instance_code').text(instances[field].code);
+ $('#promotion_price').text(instances[field].promotion_price);
+ $('#total_price').text(total_price);
+ $('#unit_price').text(unit_price);
+ }
}
}
+ if (equal) {
+ $('#wanring_text').text('');
+ $('#add_to_order').removeAttr('disabled');
+ $('#minus').removeAttr('disabled');
+ $('#plus').removeAttr('disabled');
+ $('#count').removeAttr('readonly')
+ } else {
+ var text = ''
+ var length = 0
+ for (var i in selected_attr) {
+ length += 1;
+ if (length == selected_attr.length) {
+ text += selected_attr[i]
+ }
+ else {
+ text += selected_attr[i]+'-'
+ }
+ }
+ $('#wanring_text').text('')
+ $('#wanring_text').append('' + text + ' is not available.')
+ $('#add_to_order').attr('disabled', true)
+ $('#minus').attr('disabled', true);
+ $('#plus').attr('disabled', true);
+ $('#count').attr('readonly', true)
+ }
+
}); //End selecct attribute buttom
// click select option icon for add
@@ -709,7 +904,6 @@ $(function() {
value = $(this).data('value');
type = $(this).data('type');
group = $(this).data('group');
- console.log(group);
options = $(".option_btn");
$(options).each(function(i){
if ($(options[i]).attr('data-type')==type){
@@ -781,14 +975,13 @@ $(function() {
total_price = $('#total_price').text();
qty = parseInt($('#count').val());
- var item_row = $('.selected-attribute');
+ var item_row = $('.selected-attribute');
attribute_arr = get_selected_attributes('selected-attribute');
option_arr = get_selected_attributes('selected-option');
if (item_row.length>0) {
var instances = jQuery.parseJSON(item_row.attr('data-instances'));
-
for(var field in instances) {
attrbu = JSON.stringify(attribute_arr);
@@ -803,9 +996,9 @@ $(function() {
}
}
- if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values)) {
- console.log('instances');
- console.log(attrbu);
+ attribute_arr = attribute_arr.sort()
+ instance_arr = instances[field].values.sort()
+ if (JSON.stringify(attribute_arr) === JSON.stringify(instance_arr)) {
$('.add_to_order').attr('data-instance-code',instances[field].code);
$('.add_to_order').attr('data-instance',instances[field].name);
$('.add_to_order').attr('data-price',instances[field].price);
@@ -833,33 +1026,14 @@ $(function() {
console.log(item_data);
show_item_detail(item_data,"add_to_order");
calculate_sub_total();
- code = $('#item_code').text()
+ code = $('#instance_code').text()
autoScrollToItem(code);
}); //End add order Click
- // click plus icon for add
- $(document).on('click', '.add_icon', function(event){
-
- if (window.location.pathname != '/settings/out_of_stock/new') {
- var item_data = $(this);
- code = $(this).data('item-code');
- if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
- item = get_item(item_data,"add_icon");
- customer_display_view(item,"add");
- }
-
- show_item_detail(item_data,"add_icon");
- calculate_sub_total();
- autoScrollToItem(code)
- }
-
- }); //End Add Icon Click
-
// scroll to element
function autoScrollToItem(code) {
- console.log(code)
- element = $('.summary-items').find(`[data-code='${code}']`);
+ element = $('.summary-items').find(`[data-instance-code='${code}']`);
item_qty = element.find('#item_qty').text()
parent = element.parents('.card-text')
@@ -895,12 +1069,10 @@ $(function() {
function isNotInView(elem, parent){
// for scroll up | for scroll down
result = (($(elem).offset().top - 100) < $(elem).height() || $(parent).height() < (elem.position().top + elem.outerHeight(true)));
- console.log(result)
return result // reutn boolean
}
function scrollToELement(elem) {
- console.log('Scroll into view')
elem[0].scrollIntoView();
}
@@ -962,7 +1134,7 @@ $(function() {
+'' + data.attr('data-name')+ ' ' + instance +''+option_name+' '
+'' + qty + ' '
+''
- + parseFloat(price).toFixed(2)
+ + parseFloat(price * qty).toFixed(2)
+' '
+'';
$(".summary-items tbody").append(row);
@@ -1018,7 +1190,8 @@ $(function() {
dataType: "json",
success:function(result){
if (type == "quick_service" || type=="food_court") {
- window.location.href = "/origami/"+type;
+ module_name = window.location.href.includes('foodcourt') ? 'foodcourt' : 'origami'
+ window.location.href = "/"+module_name+"/"+type;
}else{
if(table_type == "Table"){
window.location.href = "/origami/table/" + table_id;
@@ -1097,7 +1270,13 @@ $(function() {
});
}else if(result.data == 'OK'){
- window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text();
+ if (window.location.pathname.includes('foodcourt')) {
+ order_id = $('#order_id').val()
+ window.location.href = '/foodcourt/food_court/'+order_id+'/request_bill'
+ }
+ else {
+ window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text();
+ }
}else{
if(result.current_user_role == 'cashier'){
window.location.href = "/foodcourt/sale/"+result.data["sale_id"]+"/"+type+"/payment";
@@ -1538,9 +1717,17 @@ $(function() {
// price = $("#unit_price").text();
// $("#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) {
var menu_list = $('.menu_items_list');
menu_list.empty();
+ console.log(menu_items);
for(var field in menu_items) {
if (menu_items[field].is_sub_item == false) {
instances = menu_items[field].instances ;
@@ -1585,7 +1772,7 @@ $(function() {
menu_instances = [];
$(instances).each(function(i){
- if (instances[i].is_default === true) {
+ if (instances[i].is_default === true && !instances[i].out_of_stock) {
code = instances[i].code;
name = instances[i].name;
price = parseFloat(instances[i].price).toFixed(2);
@@ -1603,6 +1790,65 @@ $(function() {
});
}
+ pointer_event = 'cursor'
+ opacity = ''
+ status = ''
+ count = 0;
+ $(instances).each(function(i) {
+ if (instances[i].out_of_stock == true) {
+ count += 1
+ if (instances.length == count) { // all attributes out of stock
+ pointer_event = 'none'
+ status = 'out of stock'
+ opacity = '0.5'
+ }
+
+ }
+ })
+
+ if (JSON.stringify(menu_items[field].item_sets)!='[]') { // check all item_sets out of stock??
+ item_sets = menu_items[field].item_sets
+ oos_count = 0
+ available_count = 0
+ for(var f in item_sets) {
+ value = item_sets[f]["instances"];
+ $(value).each(function(i){
+ menus = JSON.parse(localStorage.getItem("menus"));
+ if (menus != null) {
+ for(var j in menus) {
+ var categories = menus[j]["categories"];
+ for(var ii in categories) {
+ var items = categories[ii]["items"];
+ for(var iii in items) {
+ var result = items[iii]["instances"];
+ for(var v in result) {
+ if (value[i]["id"] == result[v]["id"]) {
+ if (result[v].is_available) {
+ available_count += 1
+ if (result[v].out_of_stock) {
+ oos_count += 1
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ })
+ if(available_count == oos_count) {
+ pointer_event = 'none'
+ opacity = '0.5'
+ status = 'out of stock'
+ }
+ }
+ }
+
+ if (status) {
+ price_tag = ''+status+''
+ } else {
+ price_tag =''+price+''
+ }
if (menu_items[field].image) {
if (modify_order) {
@@ -1610,134 +1856,127 @@ $(function() {
}else{
image_path = menu_items[field].image;
}
- if (out_of_stock === true) {
- oos_item = out_of_stock_item
- oos_item = '
'
+"
'
@@ -362,6 +371,7 @@ $(function() {
rowCount = $('.selected-instance');
setCount = $('.selected-set');
item_options = $(this).data('option');
+ console.log(item_options);
min_qty = $(this).data('min-qty');
max_qty = $(this).data('max-qty');
@@ -374,7 +384,7 @@ $(function() {
type = item_options[field]["type"];
row = "'
+'
'
+''
+'"+type+"
" $(value).each(function(i){ - row +=""; }); @@ -540,6 +550,90 @@ $(function() { //click item row for add order $(document).on('click', '.menu_item_box', function(event){ + attributes = $(this).data('id'); + selected_item = $(this).data('item'); + instances = $(this).data('instance'); + item_options = $(this).data('option'); + data = $(this).parent().siblings('.add_icon'); + + show_attribute_selection_modal(attributes, selected_item, instances, item_options, data) + + }); + + // click plus icon for add + $(document).on('click', '.add_icon', function(event){ + + if($(this).hasClass('product_item')) { + $('.sx_item_detailModal').modal('hide'); + + var item_data = $(this); + code = $(this).data('instance-code'); + + if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) { + item = get_item(item_data,"add_icon"); + customer_display_view(item,"add"); + } + show_item_detail(item_data,"add_icon"); + calculate_sub_total(); + autoScrollToItem(code) + + return + } + + if ($(this).data('instances').length == 1) { + + $('.sx_item_detailModal').modal('hide'); + + if ($(this).data('instances')[0].out_of_stock == false ) { + var item_data = $(this); + code = $(this).data('instance-code'); + + if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) { + item = get_item(item_data,"add_icon"); + customer_display_view(item,"add"); + } + show_item_detail(item_data,"add_icon"); + calculate_sub_total(); + autoScrollToItem(code) + + } + return + + } else { + count = 0 + for (var i in $(this).data('instances')) { + if(!$(this).data('instances')[i].out_of_stock) { + count += 1; + } + } + + if (count === 1) { + $('.sx_item_detailModal').modal('hide'); + + var item_data = $(this); + code = $(this).data('instance-code'); + + if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) { + item = get_item(item_data,"add_icon"); + customer_display_view(item,"add"); + } + show_item_detail(item_data,"add_icon"); + calculate_sub_total(); + autoScrollToItem(code) + return + } + + attributes = $(this).data('id'); + selected_item = $(this).data('attributes'); + instances = $(this).data('instances'); + item_options = $(this).data('options'); + data = $(this) + + show_attribute_selection_modal(attributes, selected_item, instances, item_options, data) + } + }); //End Add Icon Click + + function show_attribute_selection_modal(attributes, selected_item, instances, item_options, data) { $('.attributes-list').empty(); $('.options-list').empty(); $('#modal_box_img').empty(); @@ -553,19 +647,16 @@ $(function() { $('.add_to_order').removeAttr('data-name'); $('.add_to_order').removeAttr('data-attributes'); $('.add_to_order').removeAttr('data-options'); + $('.add_to_order').removeAttr('disabled'); + $('#minus').removeAttr('disabled'); + $('#plus').removeAttr('disabled'); + $('#count').removeAttr('readonly'); + $('#wanring_text').text(''); + $('#total_price').text(0.0); - $('#count').val(1); + $('#count').val(1); change_qty_plus_minus("count","plus","minus"); - // data = $(this).parent().children().children('.add_icon'); - data = $(this).parent().siblings('.add_icon'); - - $('#total_price').text(data.attr('data-price')); - attributes = $(this).data('id'); - selected_item = $(this).data('item'); - instances = $(this).data('instance'); - item_options = $(this).data('option'); - if (data.attr('data-image')) { if (modify_order) { image = "'
- oos_header = '
OUT OF STOCK
'
- }else{
- oos_item = ''
- oos_header = ''
- }
- row = '
'
- + oos_item + oos_header
- +'
'
- +'
'+ menu_items[field].name +'
'
+ oos_item = ''
+ name = menu_items[field].name
+ short_name = truncateString(name, 30)
+ row = '
'
+ + oos_item
+ +'
'; ;
+ }else{
+ oos_item = ''
+ +'
'
+ +"'+ short_name +'
'
+ +'"
+ + '
'
+ +'
'
+ +''
+ +''
+
+ name = menu_items[field].name
+ short_name = truncateString(name, 50)
+ row = '
'
+ + oos_item
+ +'
';
- }
+ }
- $('.menu_items_list').append(row);
- }
- //end instances in menu-items alest 1 instance
- }
- //end is_sub_item false
+ $('.menu_items_list').append(row);
}
+ //end instances in menu-items alest 1 instance
+ }
+ //end is_sub_item false
+ }
}
$("#add_to_existing_order").on('click', function(e){
$(this).attr('disabled', 'disabled');
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 2e03aa95..585a5ce9 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -23,6 +23,16 @@ $(document).ready(function() {
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({
height: '100%',
size: '5px',
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 8c21972d..c20f0558 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -311,7 +311,7 @@ i.logout_icon{
text-align:center;
font-weight:900;
color:#fff;
- font-size:1.5em;
+ font-size:1.2em;
margin:auto;
}
.custom-card-no-img-head{
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index 85f2cfb4..a75d03ab 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -27,6 +27,14 @@ table.fixed-header {
}
}
+.bg-gray {
+ background-color: #D7D7D7;
+}
+
+.box-shadow-none {
+ box-shadow: none !important;
+}
+
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
diff --git a/app/controllers/base_foodcourt_controller.rb b/app/controllers/base_foodcourt_controller.rb
index 3d28f342..801f680d 100644
--- a/app/controllers/base_foodcourt_controller.rb
+++ b/app/controllers/base_foodcourt_controller.rb
@@ -12,7 +12,7 @@ class BaseFoodcourtController < ActionController::Base
rescue_from CanCan::AccessDenied do |exception|
flash[:warning] = exception.message
# redirect_to origami_root_path
- redirect_to origami_dashboard_path
+ redirect_to foodcourt_food_court_path
end
def check_user
diff --git a/app/controllers/foodcourt/orders_controller.rb b/app/controllers/foodcourt/orders_controller.rb
index 2049fd38..71408690 100755
--- a/app/controllers/foodcourt/orders_controller.rb
+++ b/app/controllers/foodcourt/orders_controller.rb
@@ -54,9 +54,6 @@ class Foodcourt::OrdersController < BaseFoodcourtController
end
end
def app_orders
- # @pending_orders = Sale.pending_order('food_court')
- # @completed = Sale.completed_sale('food_court')
-
if !params[:booking_id].nil? && !params[:booking_id].blank?
@booking = Booking.select("orders.*,bookings.*,customers.*")
.joins("JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id")
@@ -67,10 +64,211 @@ class Foodcourt::OrdersController < BaseFoodcourtController
@booking_id =@booking.booking_id
@order_id =@booking.order_id
@sale_data = Sale.find_by_sale_id(@booking.sale_id)
+
+ elsif params[:pending_id]
+ id = params[:pending_id]
+ if id.include? "SAL"
+ @pending = Sale.includes(:sale_items).find_by(sale_id: id)
+ if @pending.sale_status == "new"
+ @status = "sale"
+ end
+ elsif id.include? "BKI"
+ @pending = Booking.includes(:order_items).find_by(booking_id: id)
+ @status = "order"
+ end
+ end
+ @current_shift = ShiftSale.current_shift
+ status = ['completed', 'void']
+
+ @pending_sales = Sale.where('shift_sale_id = ? AND sale_status NOT IN (?)', @current_shift.id, status)
+ @pending_completed = Sale.where('shift_sale_id = ? AND sale_status IN (?)', @current_shift.id, status)
+ @pending_orders = Sale.pending_order('food_court')
+
+ @completed, @bookings = Sale.get_foodcourt_current_shift_orders
+ 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
+ @cashier_type = "food_court"
+ today = DateTime.now
+ day = Date.today.wday
+
+ @menus = []
+ @menu = []
+
+ if params[:id].include? "BKI"
+ @table_id = nil
+ @table = nil
+ @booking = Booking.find(params[:id])
+ else
+ @table_id = params[:id]
+ @table = DiningFacility.find(@table_id)
+ @booking = @table.get_booking
end
- @completed, @bookings = Sale.get_mobile_orders
+ @sale_id = @booking.sale_id
+ if @booking
+ @booking_id = @booking.booking_id
+ @obj_order = @booking.orders.first
+ @customer = @obj_order.customer
+ @date = @obj_order.created_at
+ @order_items = @booking.order_items
+ end
+
+ render "foodcourt/addorders/detail"
+ end
+
+ def update_modify_order
+ booking = Booking.find(params[:booking_id])
+ sale = booking.sale
+ if sale && sale.sale_status != 'new'
+ render :json => { :status => false }
+ end
+
+ is_extra_time = false
+ extra_time = ''
+ cashier_type = "quick_service"
+
+ items_arr = []
+ JSON.parse(params[:order_items]).each { |i|
+ i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+ if i["item_instance_code"].include? "ext"
+ is_extra_time = true
+ arr_exts = i["item_instance_code"].split("_")
+ if arr_exts[1].match(/^(\d)+$/)
+ time = arr_exts[1].to_i*60*i["quantity"].to_i
+ extra_time = Time.at(time)
+ end
+ end
+ if i["parent_order_item_id"]
+ items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"parent_order_item_id": i["parent_order_item_id"],"options": i["options"]}
+ else
+ items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
+ end
+ items_arr.push(items)
+ }
+
+ # begin
+ order = Order.new
+ order.source = params[:order_source]
+ order.order_type = params[:order_type]
+ # order.customer_id = params[:customer_id].present? ? params[:customer_id] : walkin.customer_id # for no customer id from mobile
+ order.items = items_arr
+ order.guest = params[:guest_info]
+ order.table_id = params[:table_id] # this is dining facilities's id
+ order.waiters = current_login_employee.name
+ order.employee_name = current_login_employee.name
+
+ order.is_extra_time = is_extra_time
+ order.extra_time = extra_time
+
+ order.new_booking = false
+ order.booking_id = booking.booking_id
+
+ if order.generate
+ if sale
+ Sale.add_to_existing_pending_invoice(nil, sale.sale_id, booking)
+ render :json => { :status => true, :data => sale }
+ else
+ render :json => { :status => true, :data => 'OK' }
+ end
+ else
+ render :json => { :status => false }
+ end
+ end
+
+ def request_bill
+ sale_data =[]
+ if !ShiftSale.current_shift.nil?
+ order_id = params[:order_id] # order_id
+ order = Order.find(order_id)
+ booking = order.booking
+ if booking.checkin_at.utc > Time.now.utc && booking.checkout_at.nil?
+ @status = false
+ @error_message = "Operation failed, Could not request bill!"
+ else
+ table = DiningFacility.find_by(id: booking.dining_facility_id)
+
+ if booking.sale_id.nil?
+ if sale_data = Sale.generate_invoice_from_booking(booking, current_login_employee, current_user, order.source, params[:current_checkin_induties_count])
+ # in-duty update
+ in_duties = InDuty.where("booking_id=?", booking.id)
+ if !in_duties.empty?
+ in_duties.each do |in_duty|
+ induty = InDuty.find(in_duty.id)
+ induty.sale_id = sale_data.sale_id
+ induty.out_time = Time.now.utc
+ induty.save
+ end
+ end
+
+ action_by = current_user.name
+ type = "REQUEST_BILL"
+
+ remark = "Request bill Receipt No #{sale_data.receipt_no}"
+ sale_audit = SaleAudit.record_audit_sale(sale_data.sale_id,remark,action_by,type )
+
+ # Promotion Activation
+ Promotion.promo_activate(sale_data)
+
+ #bill channel
+ if ENV["SERVER_MODE"] == 'cloud'
+ from = request.subdomain + "." + request.domain
+ else
+ from = ""
+ end
+
+ if ["quick_service", "cashier"].include? order.source
+ ActionCable.server.broadcast "bill_channel", table: table, from: from
+ end
+
+ unless ["quick_service", "food_court"].include? order.source
+ #check checkInOut pdf print
+ checkout_time = Lookup.collection_of('checkout_time')
+ if !booking.dining_facility_id.nil?
+ terminal = DiningFacility.find_by_id(booking.dining_facility_id)
+ cashier_terminal = CashierTerminal.find_by_id(terminal.zone_id)
+
+ if (!checkout_time.empty?) && (ENV["SERVER_MODE"] != "cloud") #no print in cloud server
+ unique_code = "CheckInOutPdf"
+ printer = PrintSetting.find_by_unique_code(unique_code)
+
+ # print when complete click
+ order_queue_printer = Printer::OrderQueuePrinter.new(printer)
+
+ if !printer.nil?
+ order_queue_printer.print_check_in_out(printer, cashier_terminal, booking, table)
+ end
+ end
+ end
+ end
+ @status = true
+ sale_id = sale_data.sale_id
+ else
+ @status = false
+ sale_id = nil
+ end
+ else
+ @status = true
+ sale_id = booking.sale_id
+ end
+ end
+ else
+ @status = false
+ @error_message = "No Current Open Shift for This Employee"
+ end
+ if ["quick_service", "food_court"].include? order.source
+ redirect_to "/foodcourt/sale/#{sale_data.sale_id}/food_court/payment#"
+ end
+ #
end
def completed
diff --git a/app/models/card_sale_tran.rb b/app/models/card_sale_tran.rb
index ea76e45a..4ff5ffb9 100644
--- a/app/models/card_sale_tran.rb
+++ b/app/models/card_sale_tran.rb
@@ -67,7 +67,7 @@ class CardSaleTran < ApplicationRecord
shift_closed_at As closing_date,")
.order("shift_sales.id DESC")
return query = query.where("shift_sales.shift_started_at >= ?" , from)
- byebug
+ # byebug
end
end
\ No newline at end of file
diff --git a/app/models/card_settle_tran.rb b/app/models/card_settle_tran.rb
index 2f087ef3..5e0695d8 100644
--- a/app/models/card_settle_tran.rb
+++ b/app/models/card_settle_tran.rb
@@ -64,6 +64,6 @@ class CardSettleTran < ApplicationRecord
shift_closed_at As closing_date,")
.order("shift_sales.id DESC")
return query = query.where("shift_sales.shift_started_at >= ?" , from)
- byebug
+ # byebug
end
end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 954674bb..7e1ff6ad 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -673,26 +673,28 @@ class Sale < ApplicationRecord
end
- def self.get_mobile_orders
+ def self.get_foodcourt_current_shift_orders
+ @current_shift = ShiftSale.current_shift
@bookings = Booking.select("bookings.*,customers.*")
.joins(" JOIN sales ON bookings.sale_id=sales.sale_id")
.joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id")
.joins("JOIN orders ON orders.order_id=booking_orders.order_id")
.joins("JOIN order_items ON orders.order_id=order_items.order_id")
.joins("JOIN customers ON orders.customer_id=customers.customer_id")
- .where("sales.sale_status =? and sales.payment_status =? and orders.source='app' and DATE(bookings.created_at)=?",'completed','paid', Date.today)
- .order("bookings.created_at desc").uniq
+ .where("sales.sale_status =? and sales.payment_status =? and orders.source='app' and sales.shift_sale_id = ?",
+ 'completed','paid', @current_shift.id
+ ).order("bookings.created_at desc").uniq
- @competed = []
+ @completed = []
@assigns = []
@bookings.each do |b|
if b.booking_status == 'completed'
- @competed << b
+ @completed << b
else
@assigns << b
end
end
- return @competed, @assigns
+ return @completed, @assigns
end
#Generate new Receipt No when it is not assigned
diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb
index b8bc515e..60a957cb 100644
--- a/app/views/foodcourt/addorders/detail.html.erb
+++ b/app/views/foodcourt/addorders/detail.html.erb
@@ -6,10 +6,12 @@
+ <% @order_id = params[:order_id].gsub('"', '') if params[:order_id] %>
+
"
+
+ +'
'
+ +"'+ short_name +'
'
+ +'"
+'
'
- +""
+ +''
- +''
- +'
'; ;
- }else{
- if (out_of_stock === true) {
- // oos_item = out_of_stock_item
- oos_item = ''
- oos_header = '
'
+ +'OUT OF STOCK
'
- }else{
- oos_item = ''
- oos_header = ''
- }
- row = '
';
+ +''
- + oos_item + oos_header
- +'
'
- +'"
-
- +'
'
- +"'+ menu_items[field].name +'
'
- +'"
- +'
'
- +''
- +'