diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 2bbf07bb..1409c829 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -93,8 +93,7 @@ $(document).on('turbolinks:load', function() { var oqs_append = $('.oqs_append'); oqs_append.empty(); var filter = $('.filter').text(); - - console.log(table_id) + //Start Ajax $.ajax({ type: "GET", diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index a8de44b1..9563131d 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -12,6 +12,16 @@ $(function() { var menu_list = $('.menu_items_list'); menu_list.empty(); + + if (type != -1 && modify_order != -1) { + url_item = '../../../../../'+url_item; + } + if(modify_order == -1 && type != -1){ + url_item = '../../../../'+url_item; + } + if (type ==-1 && modify_order == -1){ + url_item = url_item + } //Start Ajax $.ajax({ type: "GET", @@ -31,37 +41,47 @@ $(function() { item_attributes = []; if (product[field].image_path) { - image_path = product[field].image_path.url; + if (type != -1 && modify_order != -1) { + image_path = '../../'+product[field].image_path.url; + } + if(modify_order == -1 && type != -1){ + image_path = '../../../../'+product[field].image_path.url; + } + if (type ==-1 && modify_order == -1){ + image_path = product[field].image_path.url; + } }else{ image_path = "/image/logo.png"; } - row = '
' + row = '
' +'
' +'
'+ product[field].name +'
' - +"
" + +"
" +"" +'view_list' +'
' +'
' - +"
" + +"
" - +"
" - +"" - +"
" + // +"
" + // +"" + // +"
" +'
' +''+ product[field].unit_price +'' @@ -231,6 +251,7 @@ $(function() { $(document).on('click', '.set_item_box', function(event){ $(".instance-list").empty(); $(".options-list").empty(); + $(".selected-set-list").empty(); $('.set_change_qty').val(1); change_qty_plus_minus("set_count","set_plus","set_minus"); data = $(this).parent().children().children('.add_icon'); @@ -353,7 +374,7 @@ $(function() { sub_total = $('#set_total_price').text(); name = $(this).data('name'); price = $(this).data('price'); - options = $(this).attr('data-options',''); + options = $(this).attr('data-options','[]'); // qty = $('#set_change_qty').val(); qty = document.getElementById("set_count").value; total = qty*price; @@ -364,7 +385,8 @@ $(function() { +"' data-name='"+$(this).data('name') +"' data-code='"+code +"' data-price='"+$(this).data('price') - +"' data-option='"+JSON.stringify($(this).data('option')) + +"' data-option='[]" + +"' data-options='"+JSON.stringify($(this).data('options')) +"' data-min-qty='"+$(this).data('min-qty') +"' data-max-qty='"+$(this).data('max-qty') +"' data-parent-code='"+$(this).data('parent-code') @@ -387,7 +409,11 @@ $(function() { +'
' $(".selected-set-list").append(set); }else{ +<<<<<<< HEAD swal("Alert !", 'Maximum Qty is ' + max_qty + " items", "warning"); +======= + swal("Alert !", 'Maximum Select is ' + max_qty + " items", "warning"); +>>>>>>> 8217b7c2f27f5b38b27425929d01b789da0583fd } // } $('#set_unit_price').text(price); @@ -419,8 +445,7 @@ $(function() { default_instance = $('.set-item'); - var items = $('.selected-instance'); - + var items = $('.selected-set'); if (items.length >= min_qty) { item = get_set_item(items); @@ -432,11 +457,10 @@ $(function() { code = $('.set-item').attr('data-code'); name = $('.set-item').attr('data-name'); price = $('.set-item').attr('data-price'); - option_name = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options'); + option_name = ($('.set-item').attr('data-options') === 'undefined') ? ' ' :$('.set-item').attr('data-options'); option = ($('.set-item').attr('data-options') === '') ? '[]' :$('.set-item').attr('data-options'); parent = $('.set-item').attr('data-parent'); total = qty * price ; - row ="0) { var instances = jQuery.parseJSON(item_row.attr('data-instances')); @@ -748,6 +774,7 @@ $(function() { $('.add_to_order').attr('data-name',$('#title_name').text()); $('.add_to_order').attr('data-attributes',JSON.stringify(attribute_arr)); $('.add_to_order').attr('data-options',JSON.stringify(option_arr)); + $('.add_to_order').attr('data-opt',JSON.stringify(option_arr)); var item_data = $(this); item = get_item(item_data,"add_to_order"); customer_display_view(item,"add"); @@ -785,8 +812,7 @@ $(function() { option_name = ' '; data_option = '[]'; } - - +console.log(d_option) var rowCount = $('.summary-items tbody tr').length+1; var item_row = $('.summary-items tbody tr'); @@ -794,7 +820,8 @@ $(function() { item_code = $(item_row[i]).attr('data-code'); instance_code = $(item_row[i]).attr('data-instance-code'); r_option = $(item_row[i]).attr('data-opt'); - if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) { + console.log(r_option) + if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) { if (qty > 1) { qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty; }else{ @@ -804,7 +831,7 @@ $(function() { $(item_row[i]).children('#item_qty').text(qty); parseFloat($(item_row[i]).children('#item_price').text(parseFloat(price*qty).toFixed(2))); append =1; - }else{ + }else{ if (qty > 1) { qty = qty; }else{ diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 573f7c9e..8319dc10 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -387,3 +387,22 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun function setHeaderBreadCrumb(params){ $("#others_payment").html(params); } + +//show hide nav bar for webview +function showHideNavbar(webview,page){ + if(webview){ + $("nav.navbar").addClass("hidden"); + $("section").addClass("section-margin"); + $(".page-loader-wrapper").addClass("hidden"); + if(page!=undefined){ + $("#back").hide(); + } + }else{ + $("nav.navbar").removeClass("hidden"); + $("section").removeClass("section-margin"); + $(".page-loader-wrapper").removeClass("hidden"); + if(page!=undefined){ + $("#back").show(); + } + } +} diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index f882e526..601b8f89 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -431,4 +431,9 @@ iframe { width: 150%; height: 100%; } -/* End iframe */ \ No newline at end of file +/* End iframe */ + +/* section class for webview */ +.section-margin { + margin-top: -50px; +} \ No newline at end of file diff --git a/app/controllers/api/survey_controller.rb b/app/controllers/api/survey_controller.rb index 879c9ea7..04480864 100644 --- a/app/controllers/api/survey_controller.rb +++ b/app/controllers/api/survey_controller.rb @@ -1,5 +1,6 @@ class Api::SurveyController < Api::ApiController - skip_before_action :authenticate + + # before_action :authenticate def index dining_facility = DiningFacility.find(params[:id]) diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb index e14a6959..b627ae01 100755 --- a/app/controllers/base_origami_controller.rb +++ b/app/controllers/base_origami_controller.rb @@ -7,7 +7,8 @@ class BaseOrigamiController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception - helper_method :shop_detail + helper_method :shop_detail, :current_token + rescue_from CanCan::AccessDenied do |exception| flash[:warning] = exception.message # redirect_to origami_root_path @@ -33,5 +34,21 @@ class BaseOrigamiController < ActionController::Base def shop_detail @shop = Shop.first end - + + #check webview + def check_mobile + status = false + authenticate_with_http_token do |token, options| + if token + session[:webview] = true + end + session[:session_token] = token + end + + if session[:webview] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i + status = true + end + + return status + end end diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 0e905724..4abab9c8 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -2,13 +2,23 @@ class Origami::AddordersController < BaseOrigamiController # before_action :set_dining, only: [:detail] def index - @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') + @webview = false + if check_mobile + @webview = true + end + + @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') end def detail + @webview = false + if check_mobile + @webview = true + end + today = DateTime.now day = Date.today.wday @menus = Menu.all diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index c3a3d3b9..70e5260f 100755 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -9,7 +9,6 @@ class Origami::CustomersController < BaseOrigamiController end def get_customer - filter = params[:filter] type = params[:type] @@ -47,7 +46,11 @@ class Origami::CustomersController < BaseOrigamiController end def add_customer - + @webview = false + if check_mobile + @webview = true + end + @sale_id = params[:sale_id] @cashier_type = params[:type] @page = params[:page] diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 6add4a12..0d3899bd 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -3,6 +3,11 @@ class Origami::DiscountsController < BaseOrigamiController #discount page show from origami index with selected order def index + @webview = false + if check_mobile + @webview = true + end + sale_id = params[:id] @cashier_type = params[:type] if Sale.exists?(sale_id) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 759cb1b6..5ed006a1 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -1,8 +1,13 @@ class Origami::HomeController < BaseOrigamiController authorize_resource :class => false - before_action :set_dining, only: [:show] + before_action :set_dining, only: [:show] def index + @webview = false + if check_mobile + @webview = true + end + @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @@ -14,6 +19,11 @@ class Origami::HomeController < BaseOrigamiController # origami table detail def show + @webview = false + if check_mobile + @webview = true + end + @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index 3181d470..2a600294 100755 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -1,5 +1,10 @@ class Origami::OrdersController < BaseOrigamiController def show + @webview = false + if check_mobile + @webview = true + end + @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index def94a1f..28ab2c06 100755 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -2,6 +2,11 @@ class Origami::OtherChargesController < BaseOrigamiController authorize_resource :class => false def index + @webview = false + if check_mobile + @webview = true + end + sale_id = params[:sale_id] @cashier_type = params[:type] if Sale.exists?(sale_id) diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 5c0cd454..505d747c 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -5,9 +5,18 @@ class Origami::RoomsController < BaseOrigamiController @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') # @shift = ShiftSale.current_open_shift(current_user.id) + @webview = false + if check_mobile + @webview = true + end end def show + @webview = false + if check_mobile + @webview = true + end + @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb index e18828fc..8cd68d9c 100755 --- a/app/controllers/origami/split_bill_controller.rb +++ b/app/controllers/origami/split_bill_controller.rb @@ -2,6 +2,11 @@ class Origami::SplitBillController < BaseOrigamiController authorize_resource :class => false def index + @webview = false + if check_mobile + @webview = true + end + dining_id = params[:dining_id] @cashier_type = params[:type] @table = DiningFacility.find(dining_id) diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb index b30ff1b0..663fa805 100644 --- a/app/controllers/origami/surveys_controller.rb +++ b/app/controllers/origami/surveys_controller.rb @@ -1,6 +1,10 @@ class Origami::SurveysController < BaseOrigamiController def new - + @webview = false + if check_mobile + @webview = true + end + @survey = Survey.new @id = params[:id] @cashier_type = params[:type] diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb index f12778af..991f4ad2 100755 --- a/app/controllers/print_settings_controller.rb +++ b/app/controllers/print_settings_controller.rb @@ -18,10 +18,12 @@ class PrintSettingsController < ApplicationController # GET /print_settings/new def new @print_setting = PrintSetting.new + @server_mode = ENV["SERVER_MODE"] end # GET /print_settings/1/edit def edit + @server_mode = ENV["SERVER_MODE"] end # POST /print_settings diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb index a3cfc597..0760b59f 100755 --- a/app/models/print_setting.rb +++ b/app/models/print_setting.rb @@ -1,6 +1,6 @@ class PrintSetting < ApplicationRecord # validations - validates_presence_of :name, :unique_code, :printer_name, :brand_name, :api_settings, :page_width, :page_height, :print_copies + validates_presence_of :name, :unique_code, :printer_name, :brand_name, :api_settings, :page_width, :page_height, :print_copies, :header_font_size, :item_font_size def self.get_precision_delimiter PrintSetting.find_by_unique_code("ReceiptBillPdf") diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index ec0469fe..329e9240 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -11,8 +11,8 @@ - + <%= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 93569170..235e958a 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -405,7 +405,7 @@

-
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index fc05b630..59341bcb 100755 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -257,6 +257,9 @@ var cashier_type = "<%= @cashier_type %>"; $(document).ready(function(){ setHeaderBreadCrumb(_DISCOUNTS_); + /* check webview loaded*/ + var webview = <%= @webview %>; + showHideNavbar(webview); $('#back').on('click',function(){ var id = $("#table_id").text(); diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index aa000aab..38f0cc79 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -1,7 +1,7 @@
-
+
    @@ -116,7 +116,7 @@
-
+