diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index cefa64fb..237bf321 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1,4 +1,7 @@ $(function() { + + type = $('#type').val(); + modify_order = $('#modify_order').val(); //click menu sidebar menu category $(".product").on("click", function(){ var url = $(this).attr('data-ref'); @@ -83,9 +86,17 @@ $(function() { //show menu item list when click menu category function show_menu_item_list(url_item){ - var menu_list = $('.menu_items_list'); menu_list.empty(); + + if (modify_order=="true" && type =="true") { + url_item = '../../../addorders/'+url_item; + }if(modify_order=="false" && type =="true"){ + url_item = 'addorders/'+url_item + }else{ + url_item = url_item; + } + //Start Ajax $.ajax({ type: "GET", @@ -112,8 +123,10 @@ $(function() { if (JSON.stringify(menu_items[field].item_sets)!='[]') { fa_plus = ''; add = ''; - menu_item_box = 'set_item_box'; + menu_item_box = 'add_icon'; data_target = 'sx_item_set_detailModal'; + data_modal = 'modal' + add_icon = "set_item_box" code = menu_items[field].code; name = menu_items[field].name; instances = menu_items[field].instances; @@ -133,6 +146,8 @@ $(function() { add = 'add' menu_item_box = 'menu_item_box'; data_target = 'sx_item_detailModal'; + data_modal = '' + add_icon = "add_icon" $(instances).each(function(i){ if (instances[i].is_default === true) { @@ -149,39 +164,51 @@ $(function() { } if (menu_items[field].image) { - image_path = menu_items[field].image; + if (modify_order) { + image_path = "../../"+menu_items[field].image; + }else{ + image_path = menu_items[field].image; + } + }else{ - image_path = "/image/logo.png"; + if (modify_order) { + image_path = "../../image/logo.png"; + }else{ + image_path = "image/logo.png"; + } } + - row = '
' - +'
' + row = '
' + +'
' +'
'+ menu_items[field].name +'
' - +"
" - +"" - +add+ '' - +'
' - +'
' - - +"
" + +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >" + +"" + +add+ '' + +'
' + +'
' + +"
" - +"
" - +"" - +"
" + // +"
" + // +"" + // +"
" - +'
' + +'
' +''+ price +'' +'
' +'
'; @@ -203,9 +230,11 @@ $(function() { $('.set_change_qty').val(1); change_qty_plus_minus("set_count","set_plus","set_minus"); data = $(this).parent().children().children('.add_icon'); - - instances = $(this).data('instance'); + // data = $(this).parent().siblings('.add_icon'); + //instances = $(this).data('instance'); item_sets = $(this).data('item-sets'); + instances = $(this).data('instances'); + // item_sets = $(data).attr('data-item-sets'); for(var field in item_sets) { @@ -259,11 +288,11 @@ $(function() { $('#set_change_qty').val(1); $('#set_item_instances').text(instances); - $('#set_name').text(data.attr('data-name')); - $('#set_item_code').text(data.attr('data-item-code')); - $('#set_total_price').text(data.attr('data-price')); + $('#set_name').text($(this).attr('data-name')); + $('#set_item_code').text($(this).attr('data-item-code')); + $('#set_total_price').text($(this).attr('data-price')); // $('#set_total_price').text(0); - $('#set_unit_price').text(data.attr('data-price')); + $('#set_unit_price').text($(this).attr('data-price')); // $('#set_unit_price').text(0); }); // click instance for add item set @@ -423,7 +452,8 @@ $(function() { change_qty_plus_minus("count","plus","minus"); - data = $(this).parent().children().children('.add_icon'); + // data = $(this).parent().children().children('.add_icon'); + data = $(this).parent().siblings('.add_icon'); $('#total_price').text(data.attr('data-price')); attributes = $(this).data('id'); @@ -432,9 +462,19 @@ $(function() { item_options = $(this).data('option'); if (data.attr('data-image')) { - image = ""; + if (modify_order) { + image = ""; + }else{ + image = ""; + } + }else{ - image = ""; + if (modify_order) { + image = ""; + }else{ + image = ""; + } + } $('#modal_box_img').append(image); @@ -708,53 +748,118 @@ $(function() { } } - // Pay Discount for Payment + // Create Order $("#create_order").on('click', function(e){ + $(this).attr('disabled', 'disabled'); e.preventDefault(); $("#oqs_loading_wrapper").show(); - var table_id = $('#table_id').text(); - var customer_id = $('#customer_id').text(); - var booking_id = $('#booking_id').text(); + + type = $('#type').val(); + if (type == 'true') { + type = 'cashier' + + var table_type = $('#table_type').text(); + var table_id = $('#table_id').val(); + var customer_id = $('#customer_id').val(); + var booking_id = $('#booking_id').text(); + var ajax_url = 'addorders/create'; + }else{ + type = 'cashier' + var table_type = $('#table_type').text(); + var table_id = $('#table_id').text(); + var customer_id = $('#customer_id').text(); + var booking_id = $('#booking_id').text(); + var ajax_url = '../addorders/create'; + } if (!booking_id.length > 0) { - var params = {'order_source': "cashier", 'order_type': "dine_in", + var params = {'order_source': type, 'order_type': "dine_in", 'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id, 'table_id': table_id, 'order_items': order_items }; } - var table_type = $('#table_type').text(); + var order_items = JSON.stringify(get_order_item_rows()); - var ajax_url = '../addorders/create'; - var params = {'order_source': "cashier", 'order_type': "dine_in", + var params = {'order_source': type, 'order_type': "dine_in", 'customer_id': customer_id, 'guest_info': "", 'table_id': table_id, 'order_items': order_items }; + if (table_id.length>0) { + $.ajax({ + type: "POST", + url: ajax_url, + data: params, + dataType: "json", + success:function(result){ + + if(table_type == "Table"){ + window.location.href = "/origami/table/" + table_id + } + else { + window.location.href = "/origami/room/" + table_id + } + } + }); + }else{ + $(this).removeAttr('disabled', ''); + $("#oqs_loading_wrapper").hide(); + + swal("Opps","Please Select Table or Room","warning"); + } + }); + + + // Pay Discount for Payment + $("#create_pay_order").on('click', function(e){ + $(this).attr('disabled', 'disabled'); + e.preventDefault(); + type = "quick_service" + $("#oqs_loading_wrapper").show(); + console.log(modify_order) + if (modify_order == "true") { + console.log($('#sale_id').text()) + var ajax_url = '../../../quick_service/update_modify_order'; + var table_type = $('#table_type').text(); + var table_id = $('#table_id').text(); + var customer_id = $('#customer_id').text(); + var booking_id = $('#booking_id').text(); + var sale_id = $('#sale_id').text(); + }else{ + var ajax_url = 'addorders/create'; + var table_type = $('#table_id').find("option:selected").data('type'); + var table_id = $('#table_id').val(); + var customer_id = $('#customer_id').val(); + var booking_id = $('#booking_id').text(); + var sale_id = "" + } + + if (!booking_id.length > 0) { + + var params = {'order_source': type, 'order_type': "dine_in", + 'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id, + 'table_id': table_id, + 'order_items': order_items }; + } + var order_items = JSON.stringify(get_order_item_rows()); + + var params = {'order_source': type, 'order_type': "dine_in", + 'customer_id': customer_id, 'guest_info': "", + 'table_id': table_id, + 'order_items': order_items,'sale_id': sale_id }; + console.log(params) $.ajax({ type: "POST", url: ajax_url, data: params, dataType: "json", - success:function(result){ - // $("#oqs_loading_wrapper").hide(); - // swal({ - // title: "Information !", - // text: 'Order has been successfully created', - // confirmButtonColor: "green", - // confirmButtonText: "Yes!", - // closeOnConfirm: false, - // }, function (isConfirm) { - // if (isConfirm) { - if(table_type == "Table"){ - window.location.href = "/origami/table/" + table_id - } - else { - window.location.href = "/origami/room/" + table_id - } - // } - // }); - } + success:function(result){ + console.log(result) + if (result.status) { + window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment" + } + } }); }); @@ -869,11 +974,21 @@ $(function() { $("#back").on("click", function(){ var table_id = $('#table_id').text(); var table_type = $('#table_type').text(); - if(table_type == "Table"){ - window.location.href = "/origami/table/" + table_id - }else { - window.location.href = "/origami/room/" + table_id - } + type = $('#type').val(); + if (type == 'true') { + var table_type = $('#table_id').find("option:selected").data('type'); + var table_id = $('#table_id').val(); + window.location.href = "/origami/dashboard" + }else{ + var table_type = $('#table_type').text(); + var table_id = $('#table_id').text(); + + if(table_type == "Table"){ + window.location.href = "/origami/table/" + table_id + }else { + window.location.href = "/origami/room/" + table_id + } + } }); // Get Selected Class @@ -984,6 +1099,14 @@ $(function() { //show menu item list when click menu category function show_sub_category_list(url,sub_category){ + if (modify_order == "true" && type =="true") { + var url = "../../../addorders/"+url; + }if(modify_order=="false" && type =="true"){ + var url = 'addorders/'+url; + }else{ + var url = url; + } + var menu_list = $('.sub_category_list'); menu_list.empty(); //Start Ajax @@ -998,7 +1121,12 @@ $(function() { data = data.sub_category; if (data.length>0) { - $(sub_category).removeClass('hidden'); + if ((sub_category.hasClass('hidden'))) { + $(sub_category).removeClass('hidden'); + }else{ + $(sub_category).addClass('hidden'); + } + for(var i in data) { row = '
  • ' diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index bf09f726..7b29dcd4 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -3,9 +3,11 @@ section .content{ } .custom-card-head{ height: 40px; - background-color: #54A5AF; + #background-color: #54A5AF; + background-color: #a1aade; + opacity: 0.8; padding:5px; - color :#fff; + color :#000000; } .custom-card { @@ -53,8 +55,13 @@ section .content{ .nav-tabs .nav-item { border-bottom: 1px solid #fff; - border-left: 1px solid #54A5AF; - border-right: 1px solid #54A5AF; + margin-left:2px; + +} +#ul-navbar{ + border-left: 1px solid #54A5AF; + border-right: 1px solid #54A5AF; + } .nav > li > a{ color:#54A5AF; @@ -173,4 +180,65 @@ section.content{ i.logout_icon{ position: relative; top: 5px; +} + +.text-white{ + color: #fff; +} +/* Colors */ +.purple { + background-color:#7a62d3; +} + +.orange{ + background-color:#FF7F50; +} + +.red { + background-color:#F44336; +} + +.green{ + background-color: #009900; +} + +.orange{ + background-color: #FF8C00; +} + +.blue{ + background-color: blue; +} + +/*For Menu List*/ +.dropdown-toggle:after{ + margin-left:15px; +} +.my-toggle{ + padding: 15px 20px 10px 10px; + line-height:2; + +} +.list-menu{ + list-style: none; + margin-top:5px; + background-color: #eee; + border-bottom: 1px solid #fff; +} +.menu_list{ + display: block; + background-color: #eeeeee; + border-bottom: .214rem solid #fff; + border-left: 1px solid #54A5AF; + border-right: 1px solid #54A5AF; + margin-bottom: -1px; + margin-top: 5px +} +.menu_click{ + list-style: none; + margin-left:-40px; + border-bottom: .014rem solid #fff; +} +.list-menu > a:hover{ + text-decoration: none; } \ No newline at end of file diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb index e448cf17..c6a302a4 100755 --- a/app/controllers/base_origami_controller.rb +++ b/app/controllers/base_origami_controller.rb @@ -8,7 +8,8 @@ class BaseOrigamiController < ActionController::Base protect_from_forgery with: :exception rescue_from CanCan::AccessDenied do |exception| flash[:warning] = exception.message - redirect_to origami_root_path + # redirect_to origami_root_path + redirect_to origami_dashboard_path end def current_user diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 25fb0d70..1c006be1 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -126,6 +126,12 @@ class HomeController < ApplicationController render :json => {:status=> "Success", :url => root_path }.to_json end + #Shop Name in Navbor + helper_method :shop_detail + def shop_detail + @shop = Shop.first + end + private # Never trust parameters from the scary internet, only allow the white list through. @@ -146,7 +152,8 @@ class HomeController < ApplicationController #check if cashier has existing open cashier shift = ShiftSale.current_open_shift(employee.id) if !shift.nil? - redirect_to origami_root_path + redirect_to origami_dashboard_path + # redirect_to origami_root_path else redirect_to new_origami_shift_path end @@ -162,4 +169,5 @@ class HomeController < ApplicationController redirect_to reports_dailysale_index_path end end + end diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 400cffa5..add3065b 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -9,7 +9,10 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController end def detail - @menu = MenuCategory.all.active + today = DateTime.now + day = Date.today.wday + @menus = Menu.all + @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') @table_id = params[:id] @table = DiningFacility.find(@table_id) @booking = @table.get_booking @@ -44,6 +47,18 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController end end + def get_menu() + if (params[:id]) + puts params[:id] + #Pull this menu + @menu = Menu.find_by_id(params[:id]) + @menu_category = MenuCategory.where("menu_id='#{@menu.id}'").order("order_by asc") + # puts @menu.menu_items[1].item_attributes.to_json + return @menu + else + Menu.current_menu + end + end def get_menu_sub_category () id = params[:id] @@ -102,9 +117,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController if !params["booking_id"].nil? # check booking id is already completed. booking = Booking.find(params[:booking_id]) - + if params[:table_id].to_i > 0 + table_status = booking.dining_facility_id.to_i == params[:table_id].to_i + else + table_status = true + end if booking - if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved' + if table_status && booking.booking_status != 'moved' if !booking.sale_id.nil? sale_status = check_order_with_booking(booking) if sale_status @@ -115,22 +134,32 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController @order.booking_id = params[:booking_id] end else + if params[:table_id].to_i > 0 sale_status = check_order_with_table(params[:table_id]) if sale_status return return_json_status_with_code(400, "bill requested") end + end end end #booking exists else - sale_status = check_order_with_table(params[:table_id]) - if sale_status - # return false , @message = "bill requested" - return return_json_status_with_code(400, "bill requested") + if params[:table_id].to_i > 0 + sale_status = check_order_with_table(params[:table_id]) + if sale_status + # return false , @message = "bill requested" + return return_json_status_with_code(400, "bill requested") + end end end @status, @booking = @order.generate + if @status && @booking && @order.source == 'quick_service' + + @status, @sale = Sale.request_bill(@order,current_user,current_login_employee) + result = {:status=> @status, :data => @sale } + render :json => result.to_json + end end # render json for http status code diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb index cddf4feb..4fd9ba71 100755 --- a/app/controllers/origami/credit_payments_controller.rb +++ b/app/controllers/origami/credit_payments_controller.rb @@ -1,6 +1,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController def index @sale_id = params[:sale_id] + @cashier_type = params[:type] # limit visa_amount sale_data = Sale.find_by_sale_id(@sale_id) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index be1cc4dd..db89b1d0 100755 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -49,9 +49,16 @@ class Origami::CustomersController < BaseOrigamiController def add_customer @sale_id = params[:sale_id] + @cashier_type = params[:type] + if(@sale_id[0,3] == "SAL") @booking = Booking.find_by_sale_id(@sale_id) - @dining_facility = DiningFacility.find(@booking.dining_facility_id) + if @booking.dining_facility_id.to_i > 0 + @dining_facility = DiningFacility.find(@booking.dining_facility_id) + else + @dining_facility = nil + end + else @booking_order = BookingOrder.find_by_order_id(@sale_id) @booking = Booking.find(@booking_order.booking_id) diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb new file mode 100644 index 00000000..e47a8e48 --- /dev/null +++ b/app/controllers/origami/dashboard_controller.rb @@ -0,0 +1,64 @@ +class Origami::DashboardController < BaseOrigamiController + + def index + @shop = Shop.first + + today = DateTime.now.strftime('%Y-%m-%d') + # @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count() + # @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count() + + # @top_products = Sale.top_products(today).sum('i.qty') + # @bottom_products = Sale.bottom_products(today).sum('i.qty') + # @hourly_sales = Sale.hourly_sales(today).sum(:grand_total) + # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p') + # .sum(:grand_total) + # @employee_sales = Sale.employee_sales(today) + # .sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)') + # @inventories = StockJournal.inventory_balances(today).sum(:balance) + + @total_sale = Sale.total_sale(today) + @total_count = Sale.total_count(today) + @total_card = Sale.total_card_sale(today) + @total_credit = Sale.credit_payment(today) + + @sale_data = Array.new + @total_payment_methods = Sale.total_payment_methods(today) + + @total_payment_methods.each do |payment| + if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" + pay = Sale.payment_sale('card', today) + @sale_data.push({'card' => pay.payment_amount}) + else + pay = Sale.payment_sale(payment.payment_method, today) + @sale_data.push({payment.payment_method => pay.payment_amount}) + end + end + @summ_sale = Sale.summary_sale_receipt(today) + @total_customer = Sale.total_customer(today) + @total_dinein = Sale.total_dinein(today) + @total_takeaway = Sale.total_takeaway(today) + @total_other_customer = Sale.total_other_customer(today) + @total_membership = Sale.total_membership(today) + + @total_order = Sale.total_order(today) + @total_accounts = Sale.total_account(today) + @account_data = Array.new + @total_accounts.each do |account| + acc = Sale.account_data(account.account_id, today) + if !acc.nil? + @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc}) + end + end + + @top_items = Sale.top_items(today) + @total_foc_items = Sale.total_foc_items(today) + + # get printer info + @print_settings = PrintSetting.get_precision_delimiter() + end + + helper_method :shop_detail + def shop_detail + @shop = Shop.first + end +end diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 4c7555b8..46dd65d0 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -4,9 +4,14 @@ class Origami::DiscountsController < BaseOrigamiController #discount page show from origami index with selected order def index sale_id = params[:id] + @cashier_type = params[:type] if Sale.exists?(sale_id) @sale_data = Sale.find(sale_id) - @table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id) + if @sale_data.bookings[0].dining_facility_id.to_i > 0 + @table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id) + else + @table = nil + end end @member_discount = MembershipSetting.find_by_discount(1) @@ -22,8 +27,15 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find(sale_id) - table_id = sale.bookings[0].dining_facility_id - table = DiningFacility.find(table_id) + if sale.bookings[0].dining_facility_id.to_i > 0 + table_id = sale.bookings[0].dining_facility_id + table = DiningFacility.find(table_id) + else + table = nil + table_id = nil + end + + # sale.total_discount = overall_discount.to_f # sale.total_amount = sub_total.to_f # sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax; @@ -33,7 +45,6 @@ class Origami::DiscountsController < BaseOrigamiController #save sale item for discount discount_items.each do |di| origin_sale_item = SaleItem.find(di["id"]) - puts origin_sale_item.to_json sale_item = SaleItem.new sale_item.sale_id = sale_id @@ -54,6 +65,7 @@ class Origami::DiscountsController < BaseOrigamiController action_by = current_user.id remark = "Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} " + sale_audit = SaleAudit.record_audit_discount(sale_item.sale_id,sale.cashier_id, action_by,remark,"ITEMDISCOUNT" ) end @@ -62,13 +74,26 @@ class Origami::DiscountsController < BaseOrigamiController # Re-calc All Amount in Sale if overall_discount.to_f > 0 action_by = current_user.id - remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} " + if table.nil? + remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- no Table " + else + remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} " + end + sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"OVERALLDISCOUNT" ) end sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f) - result = {:status=> "Success", :table_id => table_id, :table_type => table.type } + if !table.nil? + result = {:status=> "Success", :table_id => table_id, :table_type => table.type } + else + result = {:status=> "Success" } + end else - result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type } + if !table.nil? + result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type } + else + result = {:status=> "Please, Check Again!" } + end end @@ -80,9 +105,15 @@ class Origami::DiscountsController < BaseOrigamiController sale_id = params[:sale_id] discount_items = JSON.parse(params[:discount_items]) if Sale.exists?(sale_id) - sale = Sale.find(sale_id) - table_id = sale.bookings[0].dining_facility_id - table = DiningFacility.find(table_id) + sale = Sale.find(sale_id) + if sale.bookings[0].dining_facility_id.to_i > 0 + table_id = sale.bookings[0].dining_facility_id + table = DiningFacility.find(table_id) + else + table_id = nil + table = nil + end + if discount_items.length > 0 #destroy sale item for discount @@ -91,7 +122,11 @@ class Origami::DiscountsController < BaseOrigamiController sale.total_amount = (sale.total_amount + sale_item.price.abs) action_by = current_user.id - remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- #{table.name} " + if table.nil? + remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- No Table " + else + remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- #{table.name} " + end sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEITEMDISCOUNT" ) sale_item.destroy @@ -102,9 +137,19 @@ class Origami::DiscountsController < BaseOrigamiController # sale.save # Re-calc All Amount in Sale sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount) - result = {:status=> "Success", :table_id => table_id, :table_type => table.type } + if table.nil? + result = {:status=> "Success"} + else + result = {:status=> "Success", :table_id => table_id, :table_type => table.type } + end + else - result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type } + if table.nil? + result = {:status=> "Please, Check Again!"} + else + result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type } + end + end render :json => result.to_json @@ -116,9 +161,16 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find(sale_id) - table_id = sale.bookings[0].dining_facility_id - dining = DiningFacility.find(table_id) - table_type = dining.type + + if sale.bookings[0].dining_facility_id.to_i > 0 + table_id = sale.bookings[0].dining_facility_id + table = DiningFacility.find(table_id) + table_type = table.type + else + table_id = nil + table = nil + table_type = nil + end discount_items = [] #destroy all discount sale item @@ -137,14 +189,28 @@ class Origami::DiscountsController < BaseOrigamiController sale.sale_items.destroy(discount_items) action_by = current_user.id - remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{dining.name} " + if table.nil? + remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- No Table" + else + remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{table.name} " + end sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEALLDISCOUNT" ) # Re-calc All Amount in Sale sale.compute_by_sale_items(sale_id, sale.sale_items, 0) - result = {:status=> "Success", :table_id => table_id, :dining => dining.name, :table_type => table_type } + if table.nil? + result = {:status=> "Success"} + else + result = {:status=> "Success", :table_id => table_id, :dining => table.name, :table_type => table_type } + end + else - result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => dining.name, :table_type => table_type } + if table.nil? + result = {:status=> "Please, Check Again!"} + else + result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => table.name, :table_type => table_type } + end + end render :json => result.to_json diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index e0e8e233..0604535e 100755 --- a/app/controllers/origami/jcb_controller.rb +++ b/app/controllers/origami/jcb_controller.rb @@ -2,7 +2,7 @@ class Origami::JcbController < BaseOrigamiController def index @sale_id = params[:sale_id] - + @cashier_type = params[:type] # limit jcb_amount sale_data = Sale.find_by_sale_id(@sale_id) total = sale_data.grand_total diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb index 3d08bcfa..25bebf55 100755 --- a/app/controllers/origami/master_controller.rb +++ b/app/controllers/origami/master_controller.rb @@ -2,7 +2,7 @@ class Origami::MasterController < BaseOrigamiController def index @sale_id = params[:sale_id] - + @cashier_type = params[:type] # limit master_amount sale_data = Sale.find_by_sale_id(@sale_id) total = sale_data.grand_total diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb index 7709734d..ce0dccce 100755 --- a/app/controllers/origami/mpu_controller.rb +++ b/app/controllers/origami/mpu_controller.rb @@ -1,7 +1,7 @@ class Origami::MpuController < BaseOrigamiController def index @sale_id = params[:sale_id] - + @cashier_type = params[:type] # limit mpu_amount sale_data = Sale.find_by_sale_id(@sale_id) total = sale_data.grand_total diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index 6cb9fbf9..d15edb5e 100755 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -3,9 +3,15 @@ class Origami::OtherChargesController < BaseOrigamiController def index sale_id = params[:sale_id] + @cashier_type = params[:type] if Sale.exists?(sale_id) @sale_data = Sale.find(sale_id) - @table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id) + if @sale_data.bookings[0].dining_facility_id.to_i > 0 + @table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id) + else + @table = nil + end + end end @@ -16,8 +22,14 @@ class Origami::OtherChargesController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find(sale_id) - table_id = sale.bookings[0].dining_facility_id - table = DiningFacility.find(table_id) + if sale.bookings[0].dining_facility_id.to_i > 0 + table_id = sale.bookings[0].dining_facility_id + table = DiningFacility.find(table_id) + else + table_id = nil + table = nil + end + # sale.total_amount = sub_total.to_f # sale.grand_total = sub_total.to_f + sale.total_tax; @@ -44,7 +56,12 @@ class Origami::OtherChargesController < BaseOrigamiController sale_item.save action_by = current_user.id - remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->#{table.name}" + if table.nil? + remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->" + else + remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->#{table.name}" + end + sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id,sale.cashier_id, action_by,remark,"ADDOTHERCHARGES" ) end @@ -53,9 +70,11 @@ class Origami::OtherChargesController < BaseOrigamiController # Re-calc All Amount in Sale sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount) end - - dining = {:table_id => table_id, :table_type => table.type } + if !table.nil? + dining = {:table_id => table_id, :table_type => table.type } render :json => dining.to_json + end + end #Shop Name in Navbor diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb index 6b034ed3..ab755ea1 100755 --- a/app/controllers/origami/others_payments_controller.rb +++ b/app/controllers/origami/others_payments_controller.rb @@ -2,6 +2,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController def index @membership_rebate_balance = 0 @sale_id = params[:sale_id] + @cashier_type = params[:type] @payment_method_setting = PaymentMethodSetting.all @rebate = MembershipSetting.find_by_rebate(1) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 978d424f..82761dd1 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -12,15 +12,21 @@ class Origami::PaymentsController < BaseOrigamiController # For Cashier by Zone bookings = Booking.where("sale_id='#{sale_id}'") - if bookings.count > 1 - # for Multiple Booking - table = DiningFacility.find(bookings[0].dining_facility_id) - else - table = DiningFacility.find(bookings[0].dining_facility_id) - end + # if bookings.count > 1 + # # for Multiple Booking + # table = DiningFacility.find(bookings[0].dining_facility_id) + # else + # table = DiningFacility.find(bookings[0].dining_facility_id) + # end - cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) - cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + if bookings[0].dining_facility_id.to_i > 0 + table = DiningFacility.find(bookings[0].dining_facility_id) + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + else + shift = ShiftSale.find(saleObj.shift_sale_id) + cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) + end if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # Print for First Bill to Customer @@ -66,8 +72,8 @@ class Origami::PaymentsController < BaseOrigamiController end def create - cash = params[:cash] - sale_id = params[:sale_id] + cash = params[:cash] + sale_id = params[:sale_id] member_info = nil if(Sale.exists?(sale_id)) @@ -96,15 +102,21 @@ class Origami::PaymentsController < BaseOrigamiController # For Cashier by Zone bookings = Booking.where("sale_id='#{sale_id}'") - if bookings.count > 1 - # for Multiple Booking - table = DiningFacility.find(bookings[0].dining_facility_id) - else - table = DiningFacility.find(bookings[0].dining_facility_id) - end + # if bookings.count > 1 + # # for Multiple Booking + # table = DiningFacility.find(bookings[0].dining_facility_id) + # else + # table = DiningFacility.find(bookings[0].dining_facility_id) + # end - cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) - cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + if bookings[0].dining_facility_id.to_i > 0 + table = DiningFacility.find(bookings[0].dining_facility_id) + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + else + shift = ShiftSale.find(saleObj.shift_sale_id) + cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) + end # For Print if ENV["SERVER_MODE"] != "cloud" #no print in cloud server @@ -142,12 +154,20 @@ class Origami::PaymentsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data,survey) + + if params[:type] == "quick_service" + booking = Booking.find_by_sale_id(sale_id) + booking.booking_orders.each do |order| + Order.pay_process_order_queue(order.order_id,booking.dining_facility_id) + end + end end end end def show sale_id = params[:sale_id] + @cashier_type = params[:type] @member_discount = MembershipSetting.find_by_discount(1) @@ -164,6 +184,7 @@ class Origami::PaymentsController < BaseOrigamiController @balance = 0.00 @accountable_type = '' @table_no = '' + @dining = '' @shop = Shop::ShopDetail @@ -213,10 +234,17 @@ class Origami::PaymentsController < BaseOrigamiController #end customer amount @sale_data.bookings.each do |sbk| - df = DiningFacility.find(sbk.dining_facility_id) - @table_no = df.type + ' ' + df.name - @checkin_time = sbk.checkin_at - break + if sbk.dining_facility_id.to_i >0 + df = DiningFacility.find(sbk.dining_facility_id) + @table_no = df.type + ' ' + df.name + @checkin_time = sbk.checkin_at + @dining = df + break + else + @table_no = nil + @checkin_time = nil + @dining = nil + end end @sale_data.sale_payments.each do |spay| @@ -251,15 +279,21 @@ class Origami::PaymentsController < BaseOrigamiController # For Cashier by Zone bookings = Booking.where("sale_id='#{sale_id}'") - if bookings.count > 1 - # for Multiple Booking - table = DiningFacility.find(bookings[0].dining_facility_id) - else - table = DiningFacility.find(bookings[0].dining_facility_id) - end + # if bookings.count > 1 + # # for Multiple Booking + # table = DiningFacility.find(bookings[0].dining_facility_id) + # else + # table = DiningFacility.find(bookings[0].dining_facility_id) + # end - cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) - cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + if bookings[0].dining_facility_id.to_i > 0 + table = DiningFacility.find(bookings[0].dining_facility_id) + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + else + shift = ShiftSale.find(saleObj.shift_sale_id) + cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) + end if ENV["SERVER_MODE"] != "cloud" #no print in cloud server unique_code = "ReceiptBillPdf" @@ -321,15 +355,21 @@ class Origami::PaymentsController < BaseOrigamiController # For Cashier by Zone bookings = Booking.where("sale_id='#{sale_id}'") - if bookings.count > 1 - # for Multiple Booking + # if bookings.count > 1 + # # for Multiple Booking + # table = DiningFacility.find(bookings[0].dining_facility_id) + # else + # table = DiningFacility.find(bookings[0].dining_facility_id) + # end + if bookings[0].dining_facility_id.to_i > 0 table = DiningFacility.find(bookings[0].dining_facility_id) + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) else - table = DiningFacility.find(bookings[0].dining_facility_id) + shift = ShiftSale.find(saleObj.shift_sale_id) + cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) end - - cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) - cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + # Re-call Sale Data saleObj = Sale.find(sale_id) diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index 9b23a12f..04a52f0f 100755 --- a/app/controllers/origami/paypar_payments_controller.rb +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -1,6 +1,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController def create sale_id = params[:sale_id] + @cashier_type = params[:type] redeem_amount = params[:redeem_amount] membership_id = params[:membership_id] payment_method = "paypar" diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb new file mode 100644 index 00000000..dd2f4cc7 --- /dev/null +++ b/app/controllers/origami/pending_order_controller.rb @@ -0,0 +1,26 @@ +class Origami::PendingOrderController < BaseOrigamiController + def index + # @dining= DiningFacility.where("status = 'occupied'") + # @order = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status = 'billed' and source = 'quick_service'",DateTime.now.strftime('%Y-%m-%d')) + @sale = Sale.pending_order + end + def show + @sales = Sale.pending_order + @sale = Sale.find(params[:sale_id]) + @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id + @booking = BookingOrder.find_by_order_id(@order).booking_id + puts "sssssssssss" + puts @booking + if Booking.find(@booking).dining_facility_id.to_i > 0 + @table_id = Booking.find(@booking).dining_facility_id + @dining = DiningFacility.find(@table_id) + else + @table_id = nil + @dining = nil + end + end + helper_method :shop_detail + def shop_detail + @shop = Shop.first + end +end diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb new file mode 100644 index 00000000..ef170480 --- /dev/null +++ b/app/controllers/origami/quick_service_controller.rb @@ -0,0 +1,221 @@ +class Origami::QuickServiceController < ApplicationController + # before_action :set_dining, only: [:detail] + + def index + today = DateTime.now + day = Date.today.wday + @menus = Menu.all + @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + @zone = Zone.all + @customer = Customer.all + @tables = Table.all.active.order('status desc') + @rooms = Room.all.active.order('status desc') + # @tables = Table.all.active.order('zone_id asc').group("zone_id") + # @rooms = Room.all.active.order('zone_id asc').group("zone_id") + # @all_table = Table.all.active.order('status desc') + # @all_room = Room.all.active.order('status desc') + render "origami/addorders/detail" + end + + def modify_order + today = DateTime.now + day = Date.today.wday + @menus = Menu.all + @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + if(params[:id][0,3] == "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 + + @sale_id = params[:sale_id] + + if @booking + @booking_id = @booking.booking_id + @order_items = Array.new + @booking.booking_orders.each do |booking_order| + order = Order.find(booking_order.order_id) + if (order.status == "new") + @obj_order = order + @customer = order.customer + @date = order.created_at + order.order_items.each do |item| + @order_items.push(item) + end + end + end + else + @booking = nil + end + render "origami/addorders/detail" + end + + def update_modify_order + Rails.logger.debug "Order Source - " + params[:order_source].to_s + Rails.logger.debug "Table ID - " + params[:table_id].to_s + is_extra_time = false + extra_time = '' + + 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] == ""? "CUS-000000000001" : params[: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.new_booking = true + @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 + + #Create Table Booking or Room Booking + if !params["booking_id"].nil? + # check booking id is already completed. + booking = Booking.find(params[:booking_id]) + if params[:table_id].to_i > 0 + table_status = booking.dining_facility_id.to_i == params[:table_id].to_i + else + table_status = true + end + if booking + if table_status && booking.booking_status != 'moved' + if !booking.sale_id.nil? + sale_status = check_order_with_booking(booking) + if sale_status + return return_json_status_with_code(400, "bill requested") + end + else + @order.new_booking = false + @order.booking_id = params[:booking_id] + end + else + if params[:table_id].to_i > 0 + sale_status = check_order_with_table(params[:table_id]) + if sale_status + return return_json_status_with_code(400, "bill requested") + end + end + end + end #booking exists + else + if params[:table_id].to_i > 0 + sale_status = check_order_with_table(params[:table_id]) + if sale_status + # return false , @message = "bill requested" + return return_json_status_with_code(400, "bill requested") + end + end + end + + @status, @booking = @order.generate + + if @status && @booking && @order.source == 'quick_service' + if params[:sale_id] + @sale = Sale.find(params[:sale_id]) + if @order.table_id.to_i > 0 + @table_id = @order.table_id + else + @table_id = nil + end + update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking) + end + + result = {:status=> true, :data => @sale } + render :json => result.to_json + end + end + + def get_menu_category () + if (params[:id]) + puts params[:id] + #Pull this menu + @menu = MenuCategory.find_by_id(params[:id]) + # puts @menu.menu_items[1].item_attributes.to_json + return @menu + else + MenuCategory.current_menu + end + end + + + def get_menu_sub_category () + id = params[:id] + if (id) + #Pull this menu + @sub_menu = MenuCategory.where("menu_category_id = #{id}").active + # puts @menu.menu_items[1].item_attributes.to_json + return @sub_menu + end + end + + def get_all_product() + @product = Product.all + end + + # render json for http status code + def return_json_status_with_code(code, msg) + render status: code, json: { + message: msg, + booking_id: booking_id + }.to_json + end + + def check_order_with_table(table_id) + table = DiningFacility.find(table_id) + if table + booking = table.get_current_booking + # puts booking + if booking + if !booking.sale_id.nil? + if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new" + @order.new_booking = true + return false + end + else + @order.new_booking = false + @order.booking_id = booking.booking_id + return false + end + end + end + end + + # this can always true + def check_order_with_booking(booking) + if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new" + @order.new_booking = true + return false + else + @order.new_booking = false + @order.booking_id = params[:booking_id] + return false + end + end + +end diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 56fcb738..76517e8a 100755 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -2,6 +2,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController def index @sale_id = params[:sale_id] payment_method = params[:payment_method] + @cashier_type = params[:type] @membership_rebate_balance=0 sale_data = Sale.find_by_sale_id(@sale_id) diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index a4b50689..f78c0f53 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -2,9 +2,15 @@ class Origami::SaleEditController < BaseOrigamiController authorize_resource class: false # Index for sale item void OR edit def edit - sale_id = params[:sale_id] - @table_id = params[:table_id] - @saleobj = Sale.find(sale_id) + sale_id = params[:sale_id] + if params[:table_id] + @table_id = params[:table_id] + else + @table_id = nil + end + + @cashier_type = params[:type] + @saleobj = Sale.find(sale_id) end # create item void. make duplicate old record and update qty and price diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb index c522f9e7..513bdb2c 100755 --- a/app/controllers/origami/sales_controller.rb +++ b/app/controllers/origami/sales_controller.rb @@ -7,8 +7,13 @@ class Origami::SalesController < BaseOrigamiController @sale = Sale.find(params[:sale_id]) @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id @booking = BookingOrder.find_by_order_id(@order).booking_id - @table_id = Booking.find(@booking).dining_facility_id - @dining = DiningFacility.find(@table_id) + if Booking.find(@booking).dining_facility_id.to_i>0 + @table_id = Booking.find(@booking).dining_facility_id + @dining = DiningFacility.find(@table_id) + else + @table_id = nil + @dining = nil + end end def add_to_existing_invoice diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb index 0baec650..5e33fde9 100644 --- a/app/controllers/origami/surveys_controller.rb +++ b/app/controllers/origami/surveys_controller.rb @@ -1,20 +1,30 @@ class Origami::SurveysController < BaseOrigamiController def new - @survey = Survey.new() - @id = params[:id] + + @survey = Survey.new + @id = params[:id] + @cashier_type = params[:type] + if(@id[0,3] == "SAL") @sale = Sale.find(@id) @receipt_no = @sale.receipt_no @grand_total = @sale.grand_total @booking = Booking.find_by_sale_id(@id) - @dining_facility = DiningFacility.find(@booking.dining_facility_id) - @table_type = @dining_facility.type - @survey_data = Survey.find_by_dining_name(@dining_facility.name) - survey_process = Survey.find_by_receipt_no(@receipt_no) - if !survey_process.nil? - @survey_data = survey_process + + if @booking.dining_facility_id.to_i>0 + @dining_facility = DiningFacility.find(@booking.dining_facility_id) + @table_type = @dining_facility.type + @survey_data = Survey.find_by_dining_name(@dining_facility.name) + survey_process = Survey.find_by_receipt_no(@receipt_no) + if !survey_process.nil? + @survey_data = survey_process + end + else + @dining_facility = nil + @table_type = nil end + else @dining_facility = DiningFacility.find(@id) @table_type = @dining_facility.type @@ -25,10 +35,25 @@ class Origami::SurveysController < BaseOrigamiController end def create - @dining_facility = DiningFacility.find(params[:table_id]) - @url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id] - cashier_zone = CashierTerminalByZone.find_by_zone_id(@dining_facility.zone_id) - shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil) + @type = params[:cashier_type] + @sale_id = params[:sale_id] + + if params[:table_id].to_i>0 + @dining_facility = DiningFacility.find(params[:table_id]) + cashier_zone = CashierTerminalByZone.find_by_zone_id(@dining_facility.zone_id) + shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil) + else + sale = Sale.find(@sale_id) + shift = ShiftSale.find(sale.shift_sale_id) + shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(shift.cashier_terminal_id,nil) + end + + if @type == "quick_service" + @url = "/origami/sale/"+@sale_id+"/"+@type+"/payment" + else + @url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id] + end + if params[:survey_id].nil? || params[:survey_id] == "" @survey = Survey.new(survey_params) @@ -61,15 +86,34 @@ class Origami::SurveysController < BaseOrigamiController def create_survey if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id) - dining_facility = DiningFacility.find(params[:dining_id]) - cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id) - shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil) + @type = params[:cashier_type] + @sale_id = params[:sale_id] + sale = Sale.find(@sale_id) + + if @type != "quick_service" + dining_facility = DiningFacility.find(params[:dining_id]) + cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id) + cashier_zone = cashier_zone.cashier_terminal_id + else + shift = ShiftSale.find(sale.shift_sale_id) + cashier_zone = shift.cashier_terminal_id + end + + shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_terminal_id,nil) + + if @type != "quick_service" + survey = Survey.find_by_dining_name(dining_facility.name) + else + survey = nil + end - survey = Survey.find_by_dining_name(dining_facility.name) if survey.nil? survey = Survey.new - survey.dining_name = dining_facility.name + if @type != "quick_service" + survey.dining_name = dining_facility.name + end + survey.receipt_no = params[:receipt_no] survey.shift_id = shift_by_terminal.id survey.created_by = current_user.name diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb index 813f4eb5..89adfd3e 100644 --- a/app/controllers/origami/unionpay_controller.rb +++ b/app/controllers/origami/unionpay_controller.rb @@ -1,7 +1,7 @@ class Origami::UnionpayController < BaseOrigamiController def index @sale_id = params[:sale_id] - + @cashier_type = params[:type] # limit unionpay_amount sale_data = Sale.find_by_sale_id(@sale_id) total = sale_data.grand_total @@ -23,8 +23,6 @@ class Origami::UnionpayController < BaseOrigamiController others = others + sale_payment.payment_amount end end - puts "unionpaycount" - puts @unionpaycount @can_unionpay = total - @unionpaycount - others @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index 8bdd8a90..5404789c 100755 --- a/app/controllers/origami/visa_controller.rb +++ b/app/controllers/origami/visa_controller.rb @@ -1,7 +1,7 @@ class Origami::VisaController < BaseOrigamiController def index @sale_id = params[:sale_id] - + @cashier_type = params[:type] # limit visa_amount sale_data = Sale.find_by_sale_id(@sale_id) total = sale_data.grand_total diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 8fb7c0ae..e4190cf7 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -41,33 +41,41 @@ class Origami::VoidController < BaseOrigamiController # end # end - table_avaliable = true - table_count = 0 - table = sale.bookings[0].dining_facility - table.bookings.each do |booking| - if booking.booking_status != 'moved' - if booking.sale_id - if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' + if sale.bookings[0].dining_facility_id.to_i > 0 + table_avaliable = true + table_count = 0 + table = sale.bookings[0].dining_facility + table.bookings.each do |booking| + if booking.booking_status != 'moved' + if booking.sale_id + if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' + table_avaliable = false + table_count += 1 + else + table_avaliable = true + end + else table_avaliable = false table_count += 1 - else - table_avaliable = true end - else - table_avaliable = false - table_count += 1 end end - end - if table_avaliable && table_count == 0 - table.status = 'available' - table.save + if table_avaliable && table_count == 0 + table.status = 'available' + table.save + end + else + table = nil end # FOr Sale Audit action_by = current_user.id - remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" + if table.nil? + remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table -> nil" + else + remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" + end sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" ) # For Print @@ -80,13 +88,21 @@ class Origami::VoidController < BaseOrigamiController bookings = Booking.where("sale_id='#{sale_id}'") if bookings.count > 1 # for Multiple Booking - table = DiningFacility.find(bookings[0].dining_facility_id) - else - table = DiningFacility.find(bookings[0].dining_facility_id) + if bookings[0].dining_facility_id.to_i>0 + table = DiningFacility.find(bookings[0].dining_facility_id) + end + + end - cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) - cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + if bookings[0].dining_facility_id.to_i > 0 + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + else + shift = ShiftSale.find(sale.shift_sale_id) + cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) + end + if ENV["SERVER_MODE"] != "cloud" #no print in cloud server unique_code = "ReceiptBillPdf" diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index c897b278..50fc6a52 100755 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -165,4 +165,5 @@ class DiningFacility < ApplicationRecord ActionCable.server.broadcast "checkin_channel",table: table end end + end diff --git a/app/models/menu.rb b/app/models/menu.rb index 65d00d90..b96fe03a 100755 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -4,7 +4,7 @@ class Menu < ApplicationRecord validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to # validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i #Default Scope to pull the active version only - default_scope { where(is_active: true).order("created_at desc") } + default_scope { where(is_active: true).order("created_at asc") } def self.current_menu today = DateTime.now diff --git a/app/models/order.rb b/app/models/order.rb index 5b1601d8..15ce56c3 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -23,25 +23,31 @@ class Order < ApplicationRecord def generate booking = nil - if self.new_booking + if self.table_id.to_i > 0 + table_id = self.table_id + else + table_id = nil + end #add extra time if self.is_extra_time && self.extra_time - booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking", + booking = Booking.create({:dining_facility_id => table_id,:type => "TableBooking", :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i, :checkin_by => self.employee_name, :booking_status => "assign" }) else - booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking", + booking = Booking.create({:dining_facility_id => table_id,:type => "TableBooking", :checkin_at => Time.now.utc, :checkin_by => self.employee_name, :booking_status => "assign" }) end #end extra time + if self.table_id.to_i > 0 + table = DiningFacility.find(self.table_id) + table.status = "occupied" + table.save + end - table = DiningFacility.find(self.table_id) - table.status = "occupied" - table.save else booking = Booking.find(self.booking_id) #add extra time @@ -65,7 +71,9 @@ class Order < ApplicationRecord BookingOrder.create({:booking_id => booking.booking_id, :order => self}) #Send order to queue one it done! - process_order_queue + if self.source != "quick_service" + process_order_queue + end #send order to broadcast job send_order_broadcast(booking) @@ -100,7 +108,9 @@ class Order < ApplicationRecord BookingOrder.create({:booking_id => booking.booking_id, :order => self}) #Send order to queue one it done! - process_order_queue + if self.source != "quick_service" + process_order_queue + end #send order to broadcast job send_order_broadcast(booking) @@ -203,8 +213,6 @@ class Order < ApplicationRecord def re_order_items(form_items) #reorder inputs items as parents and child parent_id = Array.new parents = Array.new - puts form_items - puts "hhhhh" parents_and_children_items = Array.new new_items_list = Array.new @@ -299,6 +307,12 @@ class Order < ApplicationRecord end end + + #Process order items and send to order queue + def self.pay_process_order_queue(id,table_id) + #Send to background job for processing + OrderQueueProcessorJob.perform_later(id, table_id) + end def check_cup_status(status) if status.include? "Active: active (running)" || "Active: active (exited)" #"Cup Server is already running" @@ -309,11 +323,13 @@ class Order < ApplicationRecord #send order items and send to order queue def send_order_broadcast(booking) - table = DiningFacility.find(booking.dining_facility_id) - type = 'order' - #Send to background job for processing - # OrderBroadcastJob.perform_later(table,type) - ActionCable.server.broadcast "order_channel",table: table,type:type + if self.table_id.to_i > 0 + table = DiningFacility.find(booking.dining_facility_id) + type = 'order' + #Send to background job for processing + # OrderBroadcastJob.perform_later(table,type) + ActionCable.server.broadcast "order_channel",table: table,type:type + end end #Origami: Cashier : to view order Table diff --git a/app/models/sale.rb b/app/models/sale.rb index efdc8d30..fcf345e4 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1225,6 +1225,83 @@ end return query end + def self.add_to_existing_pending_invoice(dining,sale_id,booking) + + existing_booking = Booking.find_by_sale_id(sale_id) + if dining.to_i > 0 + table = DiningFacility.find(dining) + table.bookings.each do |booking| + # if !booking.checkout_at.nil? + # existing_booking.update_attributes(checkout_at: checkout_at) + # end + if booking.sale_id.nil? + booking.booking_orders.each do |booking_order| + + booking.booking_status = 'moved' + order = Order.find(booking_order.order_id) + order.status = 'billed' + order.order_items.each do |item| + item.order_item_status = 'billed' + end + # create sale item + saleobj = Sale.find(sale_id) + order.order_items.each do |orer_item| + saleobj.add_item (orer_item) + end + + # Re-compute for add + saleobj.compute + saleobj.save + order.save + booking.save + end + + booking_order = BookingOrder.where('booking_id=?',booking) + booking_order.each do |bo| + bo.booking_id = existing_booking.booking_id + bo.save + end + end + end + else + if booking.sale_id.nil? + booking.booking_orders.each do |booking_order| + + booking.booking_status = 'moved' + order = Order.find(booking_order.order_id) + order.status = 'billed' + order.order_items.each do |item| + item.order_item_status = 'billed' + end + # create sale item + saleobj = Sale.find(sale_id) + order.order_items.each do |orer_item| + saleobj.add_item (orer_item) + end + + # Re-compute for add + saleobj.compute + saleobj.save + order.save + booking.save + end + + booking_order = BookingOrder.where('booking_id=?',booking) + booking_order.each do |bo| + bo.booking_id = existing_booking.booking_id + bo.save + end + end + end + end + + def self.pending_order + query = Sale.all + query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id") + .joins("join orders as orders on orders.order_id = sale_orders.order_id") + query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service") + end + private def generate_custom_id diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 661eb57b..c2fce169 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -385,32 +385,34 @@ class SalePayment < ApplicationRecord sale_count = 0 booking = Booking.find_by_sale_id(sale_obj.id) if booking - table = DiningFacility.find(booking.dining_facility_id) - bookings = table.bookings - bookings.each do |tablebooking| - if tablebooking.booking_status != 'moved' - if tablebooking.sale_id - if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' + if booking.dining_facility_id.to_i > 0 + table = DiningFacility.find(booking.dining_facility_id) + bookings = table.bookings + bookings.each do |tablebooking| + if tablebooking.booking_status != 'moved' + if tablebooking.sale_id + if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' + status = false + sale_count += 1 + else + status = true + end + else status = false sale_count += 1 - else - status = true end - else - status = false - sale_count += 1 end end - end - if status && sale_count == 0 - table.status = "available" - table.save - end + if status && sale_count == 0 + table.status = "available" + table.save + end - type = 'payment' - #Send to background job for processing - # OrderBroadcastJob.perform_later(table,type) - ActionCable.server.broadcast "order_channel",table: table,type:type + type = 'payment' + #Send to background job for processing + # OrderBroadcastJob.perform_later(table,type) + ActionCable.server.broadcast "order_channel",table: table,type:type + end end end diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index a2a6ce5a..2f7fa0eb 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -110,9 +110,12 @@ class ReceiptBillPdf < Prawn::Document bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left end - bounding_box([self.description_width - 2,y_position], :width => self.price_num_width, :height => self.item_height) do + if sale_data.bookings[0].dining_facility_id.to_i > 0 + bounding_box([self.description_width - 2,y_position], :width => self.price_num_width, :height => self.item_height) do text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right + end end + move_down 5 y_position = cursor @@ -125,8 +128,14 @@ class ReceiptBillPdf < Prawn::Document move_down 5 y_position = cursor + if sale_data.bookings[0].dining_facility_id.to_i > 0 + time =sale_data.receipt_date.strftime('%d-%m-%Y') +"("+ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') +"-"+ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p')+")" + else + time = time = sale_data.receipt_date.strftime('%d-%m-%Y %H:%M %p') + end + bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do - text "Date : #{ sale_data.receipt_date.strftime('%d-%m-%Y') } ( #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } - #{ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p') } )",:size => self.item_font_size,:align => :left + text "Date : #{ time }",:size => self.item_font_size,:align => :left end diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index c196ce21..75428949 100755 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -45,7 +45,7 @@ <% end %> <% if can? :index, :home %>
  • - + monetization_on <%= t :origami %> diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index ab813ec6..ff72d2bc 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -1,17 +1,72 @@ + <%= stylesheet_link_tag 'addorder', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> +<% type = request.path_info.include?('quick_service')%> +<% modify_order = request.path_info.include?('modify_order')%> + +
    -
    + <% @menu.each do |menu| %> + <% if !menu.valid_time.nil? %> + <% if menu.menu_category_id.nil? %> + + <% if type %> + <% if !menu.code.include? "SPL" %> +
    +
    +

    <%=menu.name%>

    +

    <%=menu.code%>

    +

    +
    + <% end%> + + <% else %> + <% if @table.get_current_checkout_booking.nil? %> + <% if !menu.code.include? "SPL" %> +
    +
    +

    <%=menu.name%>

    +

    <%=menu.code%>

    +

    +
    + <% end%> + <% else %> +
    +
    +

    <%=menu.name%>

    +

    <%=menu.code%>

    +

    +
    + <% end%> + + <% end %> + <% end%> + <% end %> + <%end %>
    - + + <% if type && modify_order%> + + + <%elsif !modify_order && type%> + + + Select + + + <%else%> + + <%end%>
    -
    -
    +
    + <% if type %> +
    +
    + ORDER DETAILS +
    + + <% if modify_order %> + <% if @table.nil? %> +
    Table :
    + + + <% else%> +
    Table : <%=@table.name%>
    + + + <% end%> + + + + + <% else%> + + <% end%> +
    + <% else %> +
    ORDER DETAILS | Table-<%=@table.name%> -
    + <% end%> +
    -
    - +
    +
    @@ -73,19 +197,33 @@ - +
    #Price
    -
    - +
    + + + <% if type && modify_order%> + + + + <%elsif !modify_order && type%> + + + + + <%else%> + + <%end%> + +
    @@ -180,7 +318,6 @@
    Attributes
    -
    Options
    @@ -194,11 +331,7 @@

    Total :

    - - -
    -
    @@ -280,5 +413,148 @@
    + + <% if type && !modify_order%> + + <% end %> + \ No newline at end of file diff --git a/app/views/origami/addorders/get_menu.json.jbuilder b/app/views/origami/addorders/get_menu.json.jbuilder new file mode 100644 index 00000000..bbe18fff --- /dev/null +++ b/app/views/origami/addorders/get_menu.json.jbuilder @@ -0,0 +1 @@ +json.array! @menu_category \ No newline at end of file diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb index 82e66d7e..d92ad452 100755 --- a/app/views/origami/credit_payments/index.html.erb +++ b/app/views/origami/credit_payments/index.html.erb @@ -111,10 +111,11 @@
    - +
    + diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb new file mode 100644 index 00000000..8f432e1e --- /dev/null +++ b/app/views/origami/dashboard/index.html.erb @@ -0,0 +1,245 @@ +
    +
    +

    <%= t :dashboard %>

    +
    + <% if @print_settings.precision.to_i > 0 + precision = @print_settings.precision + else + precision = 0 + end + #check delimiter + if @print_settings.delimiter + delimiter = "," + else + delimiter = "" + end + %> + +
    +
    +
    +
    + help +
    +
    +
    <%= t :sale_count %>
    +
    +
    +
    +
    +
    +
    +
    + attach_money +
    +
    +
    <%= t :total_sale %>
    +
    +
    +
    +
    + +
    +
    +
    + person_add +
    +
    +
    <%= t :total_credit %>
    +
    +
    +
    +
    +
    +
    +
    + credit_card +
    +
    +
    <%= t :total_card %>
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + arrow_forward +
    +
    Quick Service
    +
    +
    +
    +
    +
    + arrow_forward +
    +
    Cashier
    +
    +
    +
    + + +
    + + <% if !@summ_sale.nil? %> + +
    +
    +
    +
    <%= t :sale %>
    +
    + + + + + + + + + + + + + + + + + + + + +
    <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.receipt") %> : <%= @summ_sale.total_receipt %>
    <%= t("views.right_panel.detail.total") %> <%= t :sale %> : <%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %>
    <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : <%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %>
    <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : <%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%>
    <%= t("views.right_panel.detail.grand_total") %> : <%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%>
    + + <% if !(@total_payment_methods.nil?) %> + <% @total_payment_methods.each do |payment| %> + <% if !@sale_data[0].empty? %> + <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %> + + + + + <% end %> + <% end %> + <% end %> + + <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %> + <% if !total_card.nil? %> + + + + + <% end %> + + <% end %> +
    <%= payment.payment_method.to_s.capitalize %> Sale : + <% @sale_data.each do |data| %> + <% pay_mth = payment.payment_method %> + <%= data[""+pay_mth+""] %> + <% end %> +
    <%= t("views.right_panel.detail.card_sale") %> : + <%= total_card["card"].to_f %> +
    +
    +
    +
    + <% end %> +
    +
    +
    +
    <%= t :customer %>
    + + <% if !@total_customer.nil? %> + + + + + <% end %> + <% if !@total_dinein.nil? %> + + + + + <% end %> + <% if !@total_takeaway.nil? %> + + + + + <% end %> + <% if !@total_other_customer.nil? %> + + + + + <% end %> + <% if !@total_membership.nil? %> + + + + + <% end %> +
    <%= t("views.right_panel.detail.total") %> <%= t :customer %> : <%= @total_customer %>
    <%= t("views.right_panel.detail.dine_in") %> : <%= @total_dinein.total_dinein_cus %>
    <%= t("views.right_panel.detail.takeaway") %> : <%= @total_takeaway.total_take_cus %>
    <%= t :customer %> : <%= @total_other_customer.total_cus %>
    <%= t("views.right_panel.detail.membership") %> : <%= @total_membership.total_memb_cus %>
    +
    +
    +
    +
    +
    +
    +
    <%= t("views.right_panel.detail.order") %>
    + + <% if !@total_order.nil? %> + + + + + <% end %> + + <% if !@total_accounts.nil? %> + <% @total_accounts.each do |account| %> + + + + + <% end %> + <% end %> + <% if !@top_items.nil? %> + + + + + <% end %> + <% if !@total_foc_items.nil? %> + + + + + <% end %> +
    <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.order") %> : <%= @total_order.total_order %>
    <%= account.title %> (Account) : + <% @account_data.each do |data| %> + <% acc = account.title %> + <%= data[""+acc+""] %> <% if !data[''+acc+''].nil? %> ( <%= data[''+acc+'_amount'] %> ) <% end %> + <% end %> +
    <%= t :top %> <%= t("views.right_panel.detail.item") %> : <%= @top_items.item_name %> +
    (<%= @top_items.item_total_price %>)
    <%= t("views.right_panel.detail.total") %> <%= t("views.btn.foc") %> <%= t("views.right_panel.detail.item") %> : <%= @total_foc_items.to_int %>
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 72f4fd3c..ba03f8d7 100755 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -13,8 +13,14 @@
    + <%if !@table.nil?%> + <%else%> + + + <%end%> +

    Receipt No: <%=@sale_data.receipt_no rescue ' '%>

    @@ -225,18 +231,22 @@
    diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 96f69da9..8c275785 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -2,7 +2,6 @@ -
    @@ -14,13 +13,15 @@
    Table No : <%=@table_no%>
    +
    Sale ID : <% if @sale_data %><%=@sale_data.sale_id %><% end %>
    Customer : <%= @sale_data.customer.name%>
    -
    Checkin Time : <%= @checkin_time.utc.getlocal.strftime("%I:%M %p") %>
    +
    Checkin Time : <%if !@checkin_time.nil?%><%= @checkin_time.utc.getlocal.strftime("%I:%M %p") %> + <%end%>
    @@ -296,13 +297,23 @@ + <% if @cashier_type=="quick_service" %> +
    + + + +
    - +
    \ No newline at end of file diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb new file mode 100644 index 00000000..a3df293c --- /dev/null +++ b/app/views/origami/pending_order/index.html.erb @@ -0,0 +1,47 @@ +
    +
    + +
    +
    +
    + PENDING ORDER +
    +
    +
    +
    + <% @sale.each do |sale| %> +
    +
    + <%= sale.receipt_no %><%= sale.sale_status %> +
    +
    + <% end %> +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    + diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb new file mode 100644 index 00000000..c7233400 --- /dev/null +++ b/app/views/origami/pending_order/show.html.erb @@ -0,0 +1,147 @@ +
    +
    + +
    +
    +
    + PENDING ORDER +
    +
    +
    +
    + <% @sales.each do |sale| %> +
    +
    + <%= sale.receipt_no %><%= sale.sale_status %> +
    +
    + <% end %> +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    INVOICE DETAILS | Table <%= @dining.name rescue "" %>
    +
    +
    +
    +
    +   Receipt No: + <%= @sale.receipt_no rescue '' %> + +
    +
    + Date: <%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>   +
    +
    +
    +
    +   Customer : <%= @sale.customer.name rescue "-" %> + +
    + +
    +
    +
    + + + + + + + + + + <% + sub_total = 0 + @sale.sale_items.each do |sale_item| + sub_total = sub_total + sale_item.price + %> + + <% #unless sale_item.price <= 0 %> + + + + + + <% + + #end + end + + %> + +
    ItemsQTYPrice
    <%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
    +
    +
    +
    + + + + + + + <%if @sale.discount_type == 'member_discount'%> + + <%else%> + + <%end%> + + + + + + + + + + + + + + + +
    Sub Total:<%= sub_total %>
    Member Discount:Discount:(<%= @sale.total_discount rescue 0%>)
    Tax:<%= @sale.total_tax rescue 0%>
    Rounding Adj:<%= @sale.rounding_adjustment rescue 0%>
    Grand Total:<%= @sale.grand_total rescue 0%>
    +
    +
    +
    +
    + +
    + + + +
    +
    +
    + diff --git a/app/views/origami/quick_service/index.html.erb b/app/views/origami/quick_service/index.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index d250e0b7..1d29e563 100755 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -103,11 +103,12 @@
    - +