From 2f024e86915b6f8324c4c6e1b7b7ac47bcf4c03d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 1 Feb 2018 10:29:24 +0630 Subject: [PATCH 01/37] update qurick raw --- app/assets/javascripts/addorder.js | 124 +++++++-- app/assets/stylesheets/addorder.scss | 9 +- app/controllers/api/bill_controller.rb | 3 +- .../api/call_waiters_controller.rb | 3 +- app/controllers/base_origami_controller.rb | 3 +- app/controllers/home_controller.rb | 3 +- .../origami/addorders_controller.rb | 9 + .../origami/dashboard_controller.rb | 59 +++++ .../origami/quick_service_controller.rb | 42 +++ app/models/order.rb | 2 - app/models/sale.rb | 35 +++ app/models/sale_payment.rb | 2 +- app/views/origami/addorders/detail.html.erb | 92 +++++-- app/views/origami/dashboard/index.html.erb | 245 ++++++++++++++++++ app/views/origami/home/index.html.erb | 6 +- .../origami/quick_service/index.html.erb | 0 app/views/origami/shifts/new.html.erb | 2 +- config/routes.rb | 6 +- 18 files changed, 585 insertions(+), 60 deletions(-) create mode 100644 app/controllers/origami/dashboard_controller.rb create mode 100644 app/controllers/origami/quick_service_controller.rb create mode 100644 app/views/origami/dashboard/index.html.erb create mode 100644 app/views/origami/quick_service/index.html.erb diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 4b158946..60bcbcc3 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -83,9 +83,12 @@ $(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 ($('#type').val() == 'true') { + url_item = 'addorders/'+url_item + } + //Start Ajax $.ajax({ type: "GET", @@ -702,26 +705,41 @@ $(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_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 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 }; @@ -731,27 +749,61 @@ $(function() { 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 - } - // } - // }); + } } }); }); + + // Pay Discount for Payment + $("#create_pay_order").on('click', function(e){ + + $(this).attr('disabled', 'disabled'); + e.preventDefault(); + $("#oqs_loading_wrapper").show(); + + type = $('#type').val(); + type = 'quick_service' + 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 ajax_url = 'addorders/create'; + + 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 }; + $.ajax({ + type: "POST", + url: ajax_url, + data: params, + dataType: "json", + success:function(result){ + console.log(result) + if (result.status) { + window.location.href = "/origami/sale/"+result.data["sale_id"]+"/payment" + } + // window.location.href = "/origami/quick_service" + } + }); + }); + //click item row for update qty $('.summary-items').on('click', '.item_box', function(){ $(this).attr('data-active',true); @@ -863,11 +915,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 @@ -970,6 +1032,9 @@ $(function() { $(".sub_click").on("click", function(){ var menu_id = $(this).attr("data-id"); var url = "get_menu_sub_category/"+menu_id; + if ($('#type').val() == 'true') { + url = 'addorders/'+url + } sub_category = $(this).find('.sub_category_list'); show_sub_category_list(url,sub_category); }); @@ -992,7 +1057,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..e319a724 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -53,8 +53,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; diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 387b7bf8..4b58e52d 100755 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -46,7 +46,8 @@ class Api::BillController < Api::ApiController Promotion.promo_activate(@sale) - BillBroadcastJob.perform_later(table) + #BillBroadcastJob.perform_later(table) + ActionCable.server.broadcast "bill_channel",table: table else @status = false @error_message = "No Current Open Shift" diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb index bfb1023a..7cf80a5d 100644 --- a/app/controllers/api/call_waiters_controller.rb +++ b/app/controllers/api/call_waiters_controller.rb @@ -5,7 +5,8 @@ class Api::CallWaitersController < ActionController::API @table_id = params[:dining_id] @time = params[:time] @table = DiningFacility.find(@table_id) - CallWaiterJob.perform_later(@table,@time) + # CallWaiterJob.perform_later(@table,@time) + ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time # get printer info @shop = Shop::ShopDetail diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb index ec415bad..a43b596b 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..3ed9115f 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -146,7 +146,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 diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index af404d8b..b601a0e6 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -131,6 +131,15 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController @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 + puts @status + puts @sale.to_json + puts "ssssssssssssssssssss" + end end # render json for http status code diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb new file mode 100644 index 00000000..9f5e25a4 --- /dev/null +++ b/app/controllers/origami/dashboard_controller.rb @@ -0,0 +1,59 @@ +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 +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..374b9ffa --- /dev/null +++ b/app/controllers/origami/quick_service_controller.rb @@ -0,0 +1,42 @@ +class Origami::QuickServiceController < ApplicationController + # before_action :set_dining, only: [:detail] + + def index + @menu = MenuCategory.all.active + @dining = DiningFacility.all.active + @customer = Customer.all + # @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 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 + +end diff --git a/app/models/order.rb b/app/models/order.rb index 6c22cb92..3580e5f1 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -203,8 +203,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 diff --git a/app/models/sale.rb b/app/models/sale.rb index f6aed95e..0a388e0e 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -137,6 +137,41 @@ class Sale < ApplicationRecord end + #fOR Quick Service pay and create + def self.request_bill(order,current_user,current_login_employee) + @sale = Sale.new + sale_order=SaleOrder.new + + if shift = ShiftSale.current_open_shift(current_user.id) + order_id = order.order_id # order_id + bk_order = BookingOrder.find_by_order_id(order_id) + check_booking = Booking.find_by_booking_id(bk_order.booking_id) + + if check_booking.sale_id.nil? + # Create Sale if it doesn't exist + # puts "current_login_employee" + # puts current_login_employee.name + @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil) + @sale_data = Sale.find_by_sale_id(@sale_id) + @sale_items = SaleItem.where("sale_id=?",@sale_id) + else + @sale_data = Sale.find_by_sale_id(check_booking.sale_id) + @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) + end + + # Bind shift sale id to sale + @sale_data.shift_sale_id = shift.id + @sale_data.save + + # Promotion Activation + Promotion.promo_activate(@sale) + @status = true + return @status, @sale + else + @status = false + @message = "No Current Open Shift for This Employee" + end + end #This is when spilt bill is request - then we cannot link order to invoice #Cos there will be multiple orders - and items are spilt from there. #Unless order is spilt by then it is possible. diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index ed1b9170..b92a781c 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -335,7 +335,7 @@ class SalePayment < ApplicationRecord #record an payment in sale-audit remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " - sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1) + sale_audit = SaleAudit.record_paymal(sObj.sale_id, remark, 1) if !response.nil? if response["status"] == true diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index ab813ec6..6faa535a 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -4,14 +4,38 @@
    +<% type = request.path_info.include?('quick_service')%> +
    -
      +
    @@ -52,19 +67,36 @@ Back
    -
    -
    +
    + <% if type %> +
    +
    + ORDER DETAILS +
    + +
    + +
    +
    + <% else %> +
    ORDER DETAILS | Table-<%=@table.name%> -
    + <% end%> +
    -
    - +
    +
    @@ -73,19 +105,39 @@ - +
    #Price
    +
    Sub Total: 0.00
    - + + <% if type %> +
    +
    + Customer +
    + +
    + +
    +
    + + <% end %> + +
    diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb new file mode 100644 index 00000000..67f28f13 --- /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/home/index.html.erb b/app/views/origami/home/index.html.erb index a81c5bf9..3ed44abc 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -118,6 +118,10 @@
    + <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %> @@ -239,6 +243,6 @@ $('#close_cashier').on('click',function(){ window.location.href = '/origami/shift/close'; }) $('#back').on('click',function(){ - window.location.href = '/dashboard'; + window.location.href = '/origami/dashboard'; }) 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/shifts/new.html.erb b/app/views/origami/shifts/new.html.erb index eb275f89..35969b1d 100755 --- a/app/views/origami/shifts/new.html.erb +++ b/app/views/origami/shifts/new.html.erb @@ -117,7 +117,7 @@ data: "opening_balance=" + amount + "&cashier_terminal="+ cashier_terminal, success:function(result){ if(result){ - window.location.href = '/origami'; + window.location.href = '/origami/dashboard'; } } }); diff --git a/config/routes.rb b/config/routes.rb index 7d21aeb5..5c755179 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -84,6 +84,8 @@ scope "(:locale)", locale: /en|mm/ do #--------- Cashier ------------# namespace :origami do + get "dashboard" => "dashboard#index" + get "quick_service" => "quick_service#index" resources :cash_ins, only: [:new, :create] resources :cash_outs, only: [:new, :create] @@ -200,12 +202,12 @@ scope "(:locale)", locale: /en|mm/ do get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' } get '/:addorders/:id' => "addorders#detail" - post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' } + post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' } resources :commissions resources :commissioners - resources :addorders + # resources :addorders resources :in_duties # product_commission From d5c4f834a02d5cd2e1a96090e00309c261a3661d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 1 Feb 2018 11:04:56 +0630 Subject: [PATCH 02/37] update job --- app/controllers/api/bill_controller.rb | 3 +-- app/models/dining_facility.rb | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 4b58e52d..387b7bf8 100755 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -46,8 +46,7 @@ class Api::BillController < Api::ApiController Promotion.promo_activate(@sale) - #BillBroadcastJob.perform_later(table) - ActionCable.server.broadcast "bill_channel",table: table + BillBroadcastJob.perform_later(table) else @status = false @error_message = "No Current Open Shift" diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index c4da3475..b8386d88 100755 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -157,4 +157,5 @@ class DiningFacility < ApplicationRecord #Send to background job for processing CheckInBookingJob.perform_later(table) end + end From 3f584edbd886d40cffda03f01f1be85a657b8281 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 1 Feb 2018 11:08:34 +0630 Subject: [PATCH 03/37] udpate remove call waiter jon --- app/controllers/api/call_waiters_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb index 7cf80a5d..bfb1023a 100644 --- a/app/controllers/api/call_waiters_controller.rb +++ b/app/controllers/api/call_waiters_controller.rb @@ -5,8 +5,7 @@ class Api::CallWaitersController < ActionController::API @table_id = params[:dining_id] @time = params[:time] @table = DiningFacility.find(@table_id) - # CallWaiterJob.perform_later(@table,@time) - ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time + CallWaiterJob.perform_later(@table,@time) # get printer info @shop = Shop::ShopDetail From 1d9164aaf0d267d2e4ef09763f898d3351b88c50 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 2 Feb 2018 18:03:43 +0630 Subject: [PATCH 04/37] update quick service for payment --- app/assets/javascripts/addorder.js | 2 +- .../origami/addorders_controller.rb | 3 -- .../origami/credit_payments_controller.rb | 1 + app/controllers/origami/jcb_controller.rb | 2 +- app/controllers/origami/master_controller.rb | 2 +- app/controllers/origami/mpu_controller.rb | 2 +- .../origami/others_payments_controller.rb | 1 + .../origami/payments_controller.rb | 1 + .../origami/paypar_payments_controller.rb | 1 + .../origami/redeem_payments_controller.rb | 1 + .../origami/unionpay_controller.rb | 4 +- app/controllers/origami/visa_controller.rb | 2 +- .../origami/credit_payments/index.html.erb | 5 ++- app/views/origami/home/show.html.erb | 2 +- app/views/origami/jcb/index.html.erb | 5 ++- app/views/origami/master/index.html.erb | 5 ++- app/views/origami/mpu/index.html.erb | 6 ++- .../origami/others_payments/index.html.erb | 4 +- app/views/origami/payments/show.html.erb | 38 +++++++++++++++---- .../origami/redeem_payments/index.html.erb | 3 +- app/views/origami/rooms/show.html.erb | 2 +- app/views/origami/unionpay/index.html.erb | 6 ++- app/views/origami/visa/index.html.erb | 5 ++- config/routes.rb | 28 ++++++++------ 24 files changed, 85 insertions(+), 46 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 60bcbcc3..e330015a 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -797,7 +797,7 @@ $(function() { success:function(result){ console.log(result) if (result.status) { - window.location.href = "/origami/sale/"+result.data["sale_id"]+"/payment" + window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment" } // window.location.href = "/origami/quick_service" } diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index b601a0e6..a6e9c737 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -136,9 +136,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController @status, @sale = Sale.request_bill(@order,current_user,current_login_employee) result = {:status=> @status, :data => @sale } render :json => result.to_json - puts @status - puts @sale.to_json - puts "ssssssssssssssssssss" end end diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb index 404b1506..d70ef870 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/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index b8c7e7e0..e17c773e 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 b3813577..95710f11 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 7b7ef5a0..6eb2a0a0 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/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb index 16c7edae..e4a39662 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 6fa61bc7..0e3245ca 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -146,6 +146,7 @@ class Origami::PaymentsController < BaseOrigamiController def show sale_id = params[:sale_id] + @cashier_type = params[:type] @member_discount = MembershipSetting.find_by_discount(1) diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index 5a15aa8c..4a4944ca 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/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 2fdedf32..4b0c70f8 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/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb index fc15b7f5..7f084fd4 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 b872aec3..f04ec001 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/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb index 82e66d7e..827ae6d4 100755 --- a/app/views/origami/credit_payments/index.html.erb +++ b/app/views/origami/credit_payments/index.html.erb @@ -115,6 +115,7 @@
    + diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index d73a7ed6..ff7ceacc 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -295,6 +295,9 @@ + +
    \ No newline at end of file diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 5698eb41..1d29e563 100755 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -103,7 +103,7 @@
    - +
    diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb index e1425947..5dee20f1 100755 --- a/app/views/origami/unionpay/index.html.erb +++ b/app/views/origami/unionpay/index.html.erb @@ -115,7 +115,7 @@
    - +
    diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb index 49c2e23d..2970ba44 100755 --- a/app/views/origami/visa/index.html.erb +++ b/app/views/origami/visa/index.html.erb @@ -115,7 +115,7 @@
    - +
    diff --git a/app/views/origami/voucher/index.html.erb b/app/views/origami/voucher/index.html.erb index 52dc64d7..0d349116 100755 --- a/app/views/origami/voucher/index.html.erb +++ b/app/views/origami/voucher/index.html.erb @@ -92,7 +92,7 @@
    - +
    From 3ac6871a8917331d18400234332059dc8393b45f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 5 Feb 2018 14:03:30 +0630 Subject: [PATCH 06/37] update show payment --- app/views/origami/payments/show.html.erb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index ff7ceacc..6a45234c 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -295,10 +295,16 @@ + <% if @cashier_type=="quick_service" %> +
    + + + + <% if type %> + + <% end%>
    <% if type %>
    -
    +
    ORDER DETAILS
    -
    Select
    -
    - Select +
    Table
    +
    + Select + <%if @booking_id %> + + + <%end%>
    <% else %> @@ -323,7 +332,8 @@
    - + + <% if type %>
  • - + monetization_on <%= t :origami %> diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 2c23b37b..8c6a5974 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -5,7 +5,9 @@ <% type = request.path_info.include?('quick_service')%> +<% modify_order = request.path_info.include?('modify_order')%> +
    <% else %>
    @@ -125,24 +132,13 @@ <% if type %> - - + + + <% end %> + <% if !modify_order %> - + <% end %>
    @@ -333,7 +329,7 @@ - <% if type %> + <% if type && !modify_order%> -
    +
    arrow_forward From 08e372cfb516d3df27898b243c100ae4716f18a7 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 14 Feb 2018 13:46:22 +0630 Subject: [PATCH 18/37] udpdate qs --- .../origami/addorders_controller.rb | 20 +++++--- app/models/order.rb | 17 +++++-- app/models/sale.rb | 51 ------------------- 3 files changed, 26 insertions(+), 62 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 500e1ff8..9da6b7a6 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -102,9 +102,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].nil? + 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,17 +119,21 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController @order.booking_id = params[:booking_id] end else + if !params[:table_id].nil? 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].nil? + 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 diff --git a/app/models/order.rb b/app/models/order.rb index 0ca06316..5b022b57 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -25,23 +25,30 @@ class Order < ApplicationRecord booking = nil if self.new_booking + if !self.table_id.nil? + 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.nil? + 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 diff --git a/app/models/sale.rb b/app/models/sale.rb index 6c6f5795..f42b62a0 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1225,57 +1225,6 @@ end return query 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 - - def self.add_to_existing_pending_invoice(dining,sale_id) - puts sale_id - table = DiningFacility.find(dining) - existing_booking = Booking.find_by_sale_id(sale_id) - puts existing_booking.to_json - table.bookings.each do |booking| - # if !booking.checkout_at.nil? - # existing_booking.update_attributes(checkout_at: checkout_at) - # end - - if booking.sale_id.nil? - puts booking.to_json - 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) - puts "saleobj" - puts saleobj.to_json - 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 - private def generate_custom_id From b2cec950641b986d640bbaae79965cbb7dc03110 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 14 Feb 2018 14:26:36 +0630 Subject: [PATCH 19/37] test no table --- app/controllers/origami/addorders_controller.rb | 6 +++--- app/controllers/origami/payments_controller.rb | 2 ++ app/models/order.rb | 17 +++++++++-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 9da6b7a6..ab481fc3 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -102,7 +102,7 @@ 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].nil? + if params[:table_id].to_i > 0 table_status = booking.dining_facility_id.to_i == params[:table_id].to_i else table_status = true @@ -119,7 +119,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController @order.booking_id = params[:booking_id] end else - if !params[:table_id].nil? + 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") @@ -128,7 +128,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController end end #booking exists else - if !params[:table_id].nil? + if params[:table_id].to_i > 0 sale_status = check_order_with_table(params[:table_id]) if sale_status # return false , @message = "bill requested" diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 8beede44..7b97ea45 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -220,6 +220,8 @@ class Origami::PaymentsController < BaseOrigamiController #end customer amount @sale_data.bookings.each do |sbk| + puts "sssssssssss" + puts sbk.dining_facility_id df = DiningFacility.find(sbk.dining_facility_id) @table_no = df.type + ' ' + df.name @checkin_time = sbk.checkin_at diff --git a/app/models/order.rb b/app/models/order.rb index 5b022b57..15ce56c3 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -23,9 +23,8 @@ class Order < ApplicationRecord def generate booking = nil - if self.new_booking - if !self.table_id.nil? + if self.table_id.to_i > 0 table_id = self.table_id else table_id = nil @@ -43,7 +42,7 @@ class Order < ApplicationRecord end #end extra time - if !self.table_id.nil? + if self.table_id.to_i > 0 table = DiningFacility.find(self.table_id) table.status = "occupied" table.save @@ -324,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 From 80ab7e7c1224f8c3e7a10a6ea4285b4dc421219c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 14 Feb 2018 14:33:30 +0630 Subject: [PATCH 20/37] test no table --- app/controllers/origami/payments_controller.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 7b97ea45..2d3618b5 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -220,13 +220,17 @@ class Origami::PaymentsController < BaseOrigamiController #end customer amount @sale_data.bookings.each do |sbk| - puts "sssssssssss" - puts sbk.dining_facility_id - df = DiningFacility.find(sbk.dining_facility_id) - @table_no = df.type + ' ' + df.name - @checkin_time = sbk.checkin_at - @dining = df - 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| From a5c72b6540edf8c597bef1ad80448d776b9cfefa Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 14 Feb 2018 14:40:28 +0630 Subject: [PATCH 21/37] test no table --- app/views/origami/payments/show.html.erb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index c86c0284..c97e9abe 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -19,7 +19,8 @@
    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%>
    @@ -368,7 +369,9 @@ var cashier_type = "<%= @cashier_type %>"; if (sale) { var sale_id = sale } else { - var sale_id = "<%= @dining.id %>"; + if (cashier_type != "quick_service") { + var sale_id = "<%= @dining.id %>"; + } } //var table_id = $('.tables').attr("data-id"); window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys" @@ -425,7 +428,10 @@ var cashier_type = "<%= @cashier_type %>"; }); $('#edit').on('click', function () { + if (cashier_type != "quick_service") { + console.log(cashier_type) var dining_id = "<%= @dining.id %>" + } var sale_id = $('#sale_id').text(); if ($(this).attr('active')=== "true") { window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit"; From a2e7ebd27a7cb906aa17065f79dc065fc23a0e69 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 14 Feb 2018 15:00:16 +0630 Subject: [PATCH 22/37] update payment show --- app/views/origami/payments/show.html.erb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index c97e9abe..b6d08ed0 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -13,6 +13,7 @@
    Table No : <%=@table_no%>
    +
    Sale ID : <% if @sale_data %><%=@sale_data.sale_id %><% end %>
    @@ -369,9 +370,7 @@ var cashier_type = "<%= @cashier_type %>"; if (sale) { var sale_id = sale } else { - if (cashier_type != "quick_service") { - var sale_id = "<%= @dining.id %>"; - } + var sale_id = $('#dining').text(); } //var table_id = $('.tables').attr("data-id"); window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys" @@ -428,10 +427,7 @@ var cashier_type = "<%= @cashier_type %>"; }); $('#edit').on('click', function () { - if (cashier_type != "quick_service") { - console.log(cashier_type) - var dining_id = "<%= @dining.id %>" - } + var dining_id = $('#dining').text(); var sale_id = $('#sale_id').text(); if ($(this).attr('active')=== "true") { window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit"; From 47ffc5fa51046173ef9c6a6b5b399ee67ea1b993 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 14 Feb 2018 18:21:10 +0630 Subject: [PATCH 23/37] update no table quick srevice --- app/controllers/application_controller.rb | 10 +-- .../origami/customers_controller.rb | 7 +- .../origami/other_charges_controller.rb | 30 +++++-- .../origami/payments_controller.rb | 84 ++++++++++++------- app/controllers/origami/sales_controller.rb | 9 +- app/controllers/origami/surveys_controller.rb | 15 +++- app/models/sale_payment.rb | 42 +++++----- app/pdf/receipt_bill_pdf.rb | 13 ++- app/views/origami/customers/index.html.erb | 22 +++-- .../origami/other_charges/index.html.erb | 6 +- app/views/origami/surveys/_form.html.erb | 16 +++- app/views/origami/surveys/new.html.erb | 9 -- 12 files changed, 173 insertions(+), 90 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4dafef41..3a35a15b 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base end else # check for license file - if check_license - current_license(ENV["SX_PROVISION_URL"]) - else - redirect_to activate_path - end + # if check_license + # current_license(ENV["SX_PROVISION_URL"]) + # else + # redirect_to activate_path + # end end end diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index b0056fb2..db89b1d0 100755 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -53,7 +53,12 @@ class Origami::CustomersController < BaseOrigamiController 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/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index 7ed087d4..d15edb5e 100755 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -6,7 +6,12 @@ class Origami::OtherChargesController < BaseOrigamiController @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 @@ -17,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; @@ -45,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 @@ -54,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/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 2d3618b5..fe384a89 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -11,15 +11,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 @@ -94,15 +100,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 @@ -264,15 +276,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" @@ -333,15 +351,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/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 d7f97a6e..4ecdf95f 100644 --- a/app/controllers/origami/surveys_controller.rb +++ b/app/controllers/origami/surveys_controller.rb @@ -9,8 +9,14 @@ class Origami::SurveysController < BaseOrigamiController @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 + if @booking.dining_facility_id.to_i>0 + @dining_facility = DiningFacility.find(@booking.dining_facility_id) + @table_type = @dining_facility.type + else + @dining_facility = nil + @table_type = nil + end + else @dining_facility = DiningFacility.find(@id) @table_type = @dining_facility.type @@ -20,8 +26,9 @@ class Origami::SurveysController < BaseOrigamiController end def create - @dining_facility = DiningFacility.find(params[:table_id]) - + if params[:table_id].to_i>0 + @dining_facility = DiningFacility.find(params[:table_id]) + end @type = params[:cashier_type] @sale_id = params[:sale_id] if @type == "quick_service" 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 d2ad0260..dece55cb 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -104,9 +104,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 @@ -119,8 +122,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/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 88f4646d..eebaabbf 100755 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -32,7 +32,6 @@
    -
    @@ -115,8 +114,13 @@ + <%if !@dining_facility.nil?%> + <%else%> + + + <%end%> <%= f.error_notification %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
    @@ -417,6 +421,7 @@ if(customer_name != ""){ customer = '(' + customer_name + ')'; } + swal({ title: "Confirmation !", text: 'Are You Sure to assign this customer' + customer + '!', @@ -437,7 +442,6 @@ var id = $("#table_id").val(); var type = $("#type").val(); if (cashier_type == "quick_service") { - window.location.href = '/origami/table/'+id window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/'; }else{ if (type=="Table") { @@ -458,11 +462,17 @@ $('#back').on('click',function(){ var id = $("#table_id").val() var type = $("#type").val() - if (type=="Table") { - window.location.href = '/origami/table/'+id + var sale_id = $("#sale_id").val() + if (cashier_type == "quick_service") { + window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/'; }else{ - window.location.href = '/origami/room/'+id - } + if (type=="Table") { + window.location.href = '/origami/table/'+id + }else{ + window.location.href = '/origami/room/'+id + } + } + }) diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb index 9e3b7c3f..a194e03a 100755 --- a/app/views/origami/other_charges/index.html.erb +++ b/app/views/origami/other_charges/index.html.erb @@ -197,7 +197,11 @@
    - + <%if !@table.nil?%> + + <%else%> + + <%end%>
    diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb index 9f2b5d06..47cb08d0 100755 --- a/app/views/origami/surveys/_form.html.erb +++ b/app/views/origami/surveys/_form.html.erb @@ -41,10 +41,18 @@
    - + <%if !@dining_facility.nil?%> + + + <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %> + <%else%> + + + <%= f.input :dining_name, :as => :hidden, :input_html => { :value => 0 } %> + <%end%> - <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %> + <%= f.input :created_by, :as => :hidden, :input_html => { :value => current_login_employee.name } %> <%= f.input :receipt_no, :as => :hidden, :input_html => { :value => @receipt_no} %> <%= f.input :total_amount, :as => :hidden, :input_html => { :value => @grand_total } %> @@ -228,8 +236,8 @@ var cashier_type = "<%= @cashier_type %>"; }); // click back button for redirect $('#back').on('click',function(){ - table_type = '<%=@table_type%>'; - table_id = '<%=@dining_facility.id%>'; + table_type = $('#table_type').val() + table_id = $('#table_id').val() if (cashier_type == "quick_service") { window.location.href = '/origami/sale/<%= @id %>/<%= @cashier_type %>/payment/'; diff --git a/app/views/origami/surveys/new.html.erb b/app/views/origami/surveys/new.html.erb index bee0f843..ee4d9a57 100755 --- a/app/views/origami/surveys/new.html.erb +++ b/app/views/origami/surveys/new.html.erb @@ -1,12 +1,3 @@ - <%= render 'form', survey: @survey %> From 0d515d9c93f53874e087b99f497a208ffbc96774 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Feb 2018 10:27:00 +0630 Subject: [PATCH 24/37] paending order sale model --- app/models/sale.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/sale.rb b/app/models/sale.rb index f42b62a0..a5ffa8d9 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1225,6 +1225,13 @@ end return query 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 From a2bd8795ccec9c0b23132c08bfdc60f74e0b6ff4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Feb 2018 11:23:40 +0630 Subject: [PATCH 25/37] update discount for qs --- .../origami/discounts_controller.rb | 26 +++++++++++++++---- app/views/origami/discounts/index.html.erb | 6 +++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index bea6e381..1905fd9a 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -7,7 +7,11 @@ class Origami::DiscountsController < BaseOrigamiController @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) @@ -23,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; @@ -34,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 @@ -55,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 @@ -63,7 +74,12 @@ 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- #{table.name} " + 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) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 33141666..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 ' '%>

    From a8fdf2ec30598815e073d0281afe2f121ce6f67f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Feb 2018 11:49:01 +0630 Subject: [PATCH 26/37] update discount for qs --- .../origami/discounts_controller.rb | 46 +++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 1905fd9a..4b8c18f0 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -75,7 +75,7 @@ class Origami::DiscountsController < BaseOrigamiController if overall_discount.to_f > 0 action_by = current_user.id if table.nil? - remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} " + 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 @@ -83,9 +83,17 @@ class Origami::DiscountsController < BaseOrigamiController 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 @@ -97,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 @@ -108,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 @@ -119,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 From cf644892c92094b61ba5e611c3090014562f6559 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Feb 2018 15:26:34 +0630 Subject: [PATCH 27/37] update pending and quick service --- .../origami/discounts_controller.rb | 33 +++++++-- .../origami/pending_order_controller.rb | 11 ++- .../origami/quick_service_controller.rb | 41 ++++++++--- .../origami/sale_edit_controller.rb | 7 +- app/models/sale.rb | 69 +++++++++++++++++++ app/views/origami/addorders/detail.html.erb | 7 +- app/views/origami/payments/show.html.erb | 10 ++- app/views/origami/pending_order/show.html.erb | 11 ++- config/routes.rb | 2 + 9 files changed, 164 insertions(+), 27 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 4b8c18f0..46dd65d0 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -161,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 @@ -182,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/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb index 766c7e47..dd2f4cc7 100644 --- a/app/controllers/origami/pending_order_controller.rb +++ b/app/controllers/origami/pending_order_controller.rb @@ -9,8 +9,15 @@ class Origami::PendingOrderController < 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) + 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 diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb index 0c90530f..8dfc901c 100644 --- a/app/controllers/origami/quick_service_controller.rb +++ b/app/controllers/origami/quick_service_controller.rb @@ -16,10 +16,18 @@ class Origami::QuickServiceController < ApplicationController def modify_order @menu = MenuCategory.all.active - @table_id = params[:id] + 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] - @table = DiningFacility.find(@table_id) - @booking = @table.get_booking + if @booking @booking_id = @booking.booking_id @order_items = Array.new @@ -84,9 +92,13 @@ class Origami::QuickServiceController < ApplicationController 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 @@ -97,17 +109,21 @@ class Origami::QuickServiceController < ApplicationController @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 @@ -116,7 +132,12 @@ class Origami::QuickServiceController < ApplicationController if @status && @booking && @order.source == 'quick_service' if params[:sale_id] @sale = Sale.find(params[:sale_id]) - update = Sale.add_to_existing_pending_invoice(@order.table_id,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 } diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index fa40e41f..f78c0f53 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -3,7 +3,12 @@ class Origami::SaleEditController < BaseOrigamiController # Index for sale item void OR edit def edit sale_id = params[:sale_id] - @table_id = params[:table_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 diff --git a/app/models/sale.rb b/app/models/sale.rb index a5ffa8d9..680f37b6 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1225,6 +1225,75 @@ end return query end + def self.add_to_existing_pending_invoice(dining,sale_id,booking) + table = DiningFacility.find(dining) + existing_booking = Booking.find_by_sale_id(sale_id) + if dining.to_i > 0 + 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") diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 8c6a5974..7c8d0324 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -11,6 +11,9 @@
    diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index b6d08ed0..8c275785 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -326,9 +326,10 @@ var cashier_type = "<%= @cashier_type %>"; payment_type = ''; if ($("#server_mode").val() != "cloud") { // first bill not used in cloud + console.log("ssssssssssss") payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment") if (member_id && member_discount) { - +console.log("fffffffffffff") if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){ $("#credit_payment").hide(); } else{ @@ -430,7 +431,12 @@ var cashier_type = "<%= @cashier_type %>"; var dining_id = $('#dining').text(); var sale_id = $('#sale_id').text(); if ($(this).attr('active')=== "true") { - window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit"; + if (dining_id) { + window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit"; + }else{ + window.location.href = "/origami/table/sale/" + sale_id + "/"+cashier_type+"/edit"; + } + }else{ swal("Opps","You are not authorized for void","warning") } diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb index 3b0aad83..c7233400 100644 --- a/app/views/origami/pending_order/show.html.erb +++ b/app/views/origami/pending_order/show.html.erb @@ -42,7 +42,7 @@
    - Customer : <%= @sale.customer.name rescue "-" %> +   Customer : <%= @sale.customer.name rescue "-" %>
    @@ -112,7 +112,6 @@
    -
    @@ -136,7 +135,13 @@ $(document).ready(function(){ }); $('#addorder').on('click', function () { var table_id = "<%=@table_id%>"; - window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+$('#sale_id').val(); + var booking_id = "<%=@booking%>"; + if (table_id) { + window.location.href = '/origami/quick_service/modify_order/' + table_id+"/"+$('#sale_id').val(); + }else{ + window.location.href = '/origami/quick_service/modify_order/'+ booking_id+"/" +$('#sale_id').val(); + } + }); }); diff --git a/config/routes.rb b/config/routes.rb index 141220a6..2b563b69 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -92,6 +92,7 @@ scope "(:locale)", locale: /en|mm/ do get "quick_service/pending_order/:sale_id" => "pending_order#show" get "quick_service/modify_order/:id/:sale_id" => "quick_service#modify_order" + get "quick_service/modify_order/:sale_id" => "quick_service#modify_order" post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' } @@ -104,6 +105,7 @@ scope "(:locale)", locale: /en|mm/ do end post 'moving' => "movetable#moving" get "/table/:table_id/sale/:sale_id/:type/edit" => "sale_edit#edit" + get "/table/sale/:sale_id/:type/edit" => "sale_edit#edit" post 'item_void' => "sale_edit#item_void" post 'item_foc' => "sale_edit#item_foc" post 'item_edit' => "sale_edit#item_edit" From 2f7f412150a7da5c0f1410a47d10825efde1dde0 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 16 Feb 2018 09:46:55 +0630 Subject: [PATCH 28/37] update addorder move + and box --- app/assets/javascripts/addorder.js | 35 ++++++---- app/models/sale.rb | 3 +- app/views/origami/addorders/detail.html.erb | 76 +++++++++++++-------- 3 files changed, 71 insertions(+), 43 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index bebc6f99..bc0b2721 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -164,29 +164,33 @@ $(function() { }else{ image_path = "/image/logo.png"; } + if (menu_item_box == "set_item_box") { + add_icon = "set_item_box" + }else{ + add_icon = "add_icon" + } row = '
    ' +'
    ' +'
    '+ menu_items[field].name +'
    ' - +"
    " - +"" - +add+ '' - +'
    ' - +'
    ' - - +"
    " + +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >" + +"" + +add+ '' + +'
    ' + +'
    ' + +"
    " +"
    " +"" @@ -434,7 +438,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'); diff --git a/app/models/sale.rb b/app/models/sale.rb index 680f37b6..8979f452 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1226,9 +1226,10 @@ end end def self.add_to_existing_pending_invoice(dining,sale_id,booking) - table = DiningFacility.find(dining) + 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) diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 7c8d0324..36f45b74 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -65,15 +65,28 @@
    - - <% if type %> - - <% end%> + + <% if type && modify_order%> + + + <%elsif !modify_order && type%> + + + Select + + <%else%> + + <%end%>
    <% if type %> @@ -81,19 +94,23 @@
    ORDER DETAILS
    + <% if modify_order %> -
    Table : <%=@table.name%>
    - - + <% if @table.nil? %> +
    Table :
    + + + <% else%> +
    Table : <%=@table.name%>
    + + + <% end%> + <% else%> -
    Table
    -
    - Select - -
    + <% end%>
    <% else %> @@ -123,23 +140,28 @@
    -
    +
    - + + <% if type && modify_order%> - - <% end %> - <% if !modify_order %> - - <% end %> + + <%elsif !modify_order && type%> + + + + + <%else%> + + <%end%> + + From 941204afc1a64871d852c8882e4ce6b9163849a8 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 16 Feb 2018 14:30:53 +0630 Subject: [PATCH 29/37] update add order --- app/assets/javascripts/addorder.js | 76 ++++++----- .../origami/quick_service_controller.rb | 2 +- app/views/origami/addorders/detail.html.erb | 123 ++++++------------ 3 files changed, 89 insertions(+), 112 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index bc0b2721..91c02552 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -123,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; @@ -144,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) { @@ -164,11 +168,11 @@ $(function() { }else{ image_path = "/image/logo.png"; } - if (menu_item_box == "set_item_box") { - add_icon = "set_item_box" - }else{ - add_icon = "add_icon" - } + // if (menu_item_box == "set_item_box") { + + // }else{ + + // } row = '
    ' +'
    ' @@ -190,7 +194,10 @@ $(function() { + price +"' data-instance-code = '"+ code +"' data-instance = '" + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '" + JSON.stringify(item_attributes) +"' data-options = '" - + options +"' data-image='"+image_path+"' >" + + options +"' data-image='"+image_path+"' data-toggle='" + +data_modal+"' data-target='."+data_target+"' data-item-sets = '" + +JSON.stringify(menu_items[field].item_sets)+"'data-instances = '" + +JSON.stringify(menu_items[field].instances)+"'>" +"
    " +"" @@ -218,10 +225,12 @@ $(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'); +console.log(instances) for(var field in item_sets) { $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]); @@ -274,11 +283,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 @@ -735,7 +744,7 @@ $(function() { if (type == 'true') { type = 'cashier' - var table_type = $('#table_id').find("option:selected").data('type'); + var table_type = $('#table_type').text(); var table_id = $('#table_id').val(); var customer_id = $('#customer_id').val(); var booking_id = $('#booking_id').text(); @@ -762,21 +771,28 @@ $(function() { 'customer_id': customer_id, 'guest_info': "", 'table_id': table_id, 'order_items': order_items }; - $.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 - } - } - }); + 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"); + } }); diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb index 8dfc901c..c6ad1383 100644 --- a/app/controllers/origami/quick_service_controller.rb +++ b/app/controllers/origami/quick_service_controller.rb @@ -3,7 +3,7 @@ class Origami::QuickServiceController < ApplicationController def index @menu = MenuCategory.all.active - @dining = DiningFacility.all.active + @zone = Zone.all @customer = Customer.all @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 36f45b74..2ec7ad24 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -78,10 +78,11 @@ Back - Select + <%else%>
    <% else %> @@ -361,92 +362,46 @@
    -
    Table
    + <%@zone.each do |zone| %> +
    Zone : <%=zone.name%>
    - <% @tables.each do |table| %> - <% if table.status == 'occupied' %> - <% if table.get_booking.nil? %> - <% if table.get_checkout_booking.nil? %> -
    - <% else %> -
    - <% end %> -
    - <%= table.name %> - -
    -
    - <% else %> - <% if table.get_checkout_booking.nil? %> -
    - <% else %> -
    - <% end %> -
    - <%= table.name %> - new -
    -
    - <% end %> - <% else %> -
    -
    - <%= table.name %> - new -
    -
    - <% end %> - <% end %> -
    -
    -
    Room
    -
    - <% @rooms.each do |table| %> - <% if table.status == 'occupied' %> - <% if table.get_booking.nil? %> - <% if table.get_checkout_booking.nil? %> -
    - <% else %> -
    - <% end %> -
    - <%= table.name %> - -
    -
    - <% else %> - <% if table.get_checkout_booking.nil? %> -
    - <% else %> -
    - <% end %> -
    - <%= table.name %> - new -
    -
    - <% end %> + <%zone.tables.each do |table| %> + <% if table.status == 'occupied' %> + <% if table.get_booking.nil? %> + <% if table.get_checkout_booking.nil? %> + <% color="red"%> + <% else %> + <% color="orange"%> + <% end %> + + <% else %> + <% if table.get_checkout_booking.nil? %> + <% color="blue"%> + <% else %> + <% color="orange"%> + <% end %> + <% end %> <% else %> -
    -
    - <%= table.name %> - new -
    -
    - <% end %> + <% color="green"%> <% end %> +
    +
    + <%= table.name %> +
    -
    -
    - -     - -
    +
    + <%end%> +
    + <%end%> +
    + +     +
    +
    +
    <% 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/config/routes.rb b/config/routes.rb index 2b563b69..bee3538e 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -207,6 +207,7 @@ scope "(:locale)", locale: /en|mm/ do get '/:id/:type/surveys', to: "surveys#new" post '/:id/create_survey' => "surveys#create", :as => "create_surveys" + get '/addorders/get_menu/:id' => "addorders#get_menu",:as => "get_menu", :defaults => { :format => 'json' } get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' } get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' } get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' } From 476f7425a22c4cf31a088d295d47373107065f09 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 19 Feb 2018 13:53:36 +0630 Subject: [PATCH 34/37] update add order for menu and void foc for no table --- app/assets/stylesheets/addorder.scss | 32 +++++++++++ app/controllers/origami/void_controller.rb | 60 +++++++++++++-------- app/views/origami/addorders/detail.html.erb | 22 ++++++-- 3 files changed, 89 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 9634c050..028b9002 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -209,3 +209,35 @@ i.logout_icon{ .blue{ background-color: blue; } + +/*For Menu List*/ +.dropdown-toggle:after{ + margin-left:30px; +} +.my-toggle{ + padding: 15px 35px 10px 20px; + line-height:2; + border-bottom: 1px solid #fff; +} +.list-menu{ + list-style: none; + margin-top:5px; + background-color: #eee; +} +.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/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index f9fbe55a..d535c767 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -39,33 +39,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 @@ -78,13 +86,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/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index a4f27bc7..ff72d2bc 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -1,3 +1,4 @@ + <%= stylesheet_link_tag 'addorder', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> ' - +"
    " // +"
    " - +'
    ' + +'
    ' +''+ price +'' +'
    ' +'
    '; diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 028b9002..a1590087 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -5,7 +5,7 @@ section .content{ height: 40px; #background-color: #54A5AF; background-color: #a1aade; - opacity: 0.5; + opacity: 0.8; padding:5px; color :#000000; @@ -212,10 +212,10 @@ i.logout_icon{ /*For Menu List*/ .dropdown-toggle:after{ - margin-left:30px; + margin-left:20px; } .my-toggle{ - padding: 15px 35px 10px 20px; + padding: 15px 25px 10px 20px; line-height:2; border-bottom: 1px solid #fff; } From eef54320923d9785bf933484a06452590c9f1dd5 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 19 Feb 2018 15:57:01 +0630 Subject: [PATCH 37/37] update add order css --- app/assets/stylesheets/addorder.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index a1590087..7b29dcd4 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -212,17 +212,18 @@ i.logout_icon{ /*For Menu List*/ .dropdown-toggle:after{ - margin-left:20px; + margin-left:15px; } .my-toggle{ - padding: 15px 25px 10px 20px; + padding: 15px 20px 10px 10px; line-height:2; - border-bottom: 1px solid #fff; + } .list-menu{ list-style: none; margin-top:5px; background-color: #eee; + border-bottom: 1px solid #fff; } .menu_list{ display: block;