diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 030b0fe1..66252d60 100755 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -75,3 +75,13 @@ background-color: #fff; border-top: none; } + +.p-card{ + margin: 20px 0; + text-align: center; +} + +.p-name{ + padding-bottom: 20px; + font-size: 14px; +} diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb index 1bf5b4d4..aad5c676 100755 --- a/app/controllers/base_controller.rb +++ b/app/controllers/base_controller.rb @@ -1,5 +1,12 @@ class BaseController < ActionController::Base layout "installation" protect_from_forgery with: :exception + + helper_method :shop_detail + + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end end diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb index e66c67b9..675b3060 100755 --- a/app/controllers/base_crm_controller.rb +++ b/app/controllers/base_crm_controller.rb @@ -5,6 +5,8 @@ class BaseCrmController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception + helper_method :shop_detail + rescue_from CanCan::AccessDenied do |exception| flash[:warning] = exception.message redirect_to root_path @@ -23,5 +25,10 @@ class BaseCrmController < ActionController::Base def current_user @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] end + + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end end diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb index 4059ac25..b3a9141d 100755 --- a/app/controllers/base_inventory_controller.rb +++ b/app/controllers/base_inventory_controller.rb @@ -5,6 +5,8 @@ class BaseInventoryController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception + helper_method :shop_detail + rescue_from CanCan::AccessDenied do |exception| flash[:warning] = exception.message redirect_to root_path @@ -14,4 +16,9 @@ class BaseInventoryController < ActionController::Base @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] end + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end + end diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb index db9f8231..436be205 100755 --- a/app/controllers/base_oqs_controller.rb +++ b/app/controllers/base_oqs_controller.rb @@ -4,6 +4,8 @@ class BaseOqsController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception + + helper_method :shop_detail rescue_from CanCan::AccessDenied do |exception| flash[:warning] = exception.message @@ -24,4 +26,9 @@ class BaseOqsController < ActionController::Base @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] end + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end + end diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb index c6a302a4..fdd0a57b 100755 --- a/app/controllers/base_origami_controller.rb +++ b/app/controllers/base_origami_controller.rb @@ -6,6 +6,9 @@ class BaseOrigamiController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception + + helper_method :shop_detail + rescue_from CanCan::AccessDenied do |exception| flash[:warning] = exception.message # redirect_to origami_root_path @@ -24,4 +27,10 @@ class BaseOrigamiController < ActionController::Base def get_cashier @cashier = Employee.where("role = 'cashier' AND token_session <> ''") end + + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end + end diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb index af9ec4fc..16c68397 100755 --- a/app/controllers/base_report_controller.rb +++ b/app/controllers/base_report_controller.rb @@ -5,6 +5,8 @@ class BaseReportController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception + helper_method :shop_detail + rescue_from CanCan::AccessDenied do |exception| flash[:warning] = exception.message redirect_to root_path @@ -86,5 +88,10 @@ class BaseReportController < ActionController::Base end + + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end end diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb index e86433dc..1a8a7648 100755 --- a/app/controllers/base_waiter_controller.rb +++ b/app/controllers/base_waiter_controller.rb @@ -5,5 +5,11 @@ class BaseWaiterController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception + helper_method :shop_detail + + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end end diff --git a/app/controllers/crm/bookings_controller.rb b/app/controllers/crm/bookings_controller.rb index 30a9eb92..7e6c3c83 100755 --- a/app/controllers/crm/bookings_controller.rb +++ b/app/controllers/crm/bookings_controller.rb @@ -15,9 +15,4 @@ class Crm::BookingsController < BaseCrmController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 12944632..0168e326 100755 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -398,10 +398,5 @@ end params.require(:customer).permit(:id, :name, :company, :contact_no, :email, :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type) end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb index 4b1eddcc..e52abeea 100755 --- a/app/controllers/crm/dining_queues_controller.rb +++ b/app/controllers/crm/dining_queues_controller.rb @@ -142,10 +142,5 @@ class Crm::DiningQueuesController < BaseCrmController def dining_queue_params params.require(:dining_queue).permit(:customer_id, :name, :contact_no, :queue_no,:status,:seater,:remark) end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb index b5acf59a..398fc96a 100755 --- a/app/controllers/crm/home_controller.rb +++ b/app/controllers/crm/home_controller.rb @@ -56,10 +56,5 @@ class Crm::HomeController < BaseCrmController # end # end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1c006be1..357bb0b7 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,6 +1,8 @@ class HomeController < ApplicationController # layout "application", except: [:index, :show] - skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] + skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] + + helper_method :shop_detail def index # @employees = Employee.all_emp_except_waiter.order("name asc") @@ -126,12 +128,6 @@ class HomeController < ApplicationController render :json => {:status=> "Success", :url => root_path }.to_json end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end - private # Never trust parameters from the scary internet, only allow the white list through. @@ -170,4 +166,9 @@ class HomeController < ApplicationController end end + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end + end diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb index 353509c3..195c3379 100755 --- a/app/controllers/install_controller.rb +++ b/app/controllers/install_controller.rb @@ -2,6 +2,8 @@ class InstallController < BaseController skip_before_action :verify_authenticity_token # before_action :check_license + helper_method :shop_detail + def index end @@ -74,4 +76,9 @@ class InstallController < BaseController # return nil # end # end + + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end end diff --git a/app/controllers/oqs/backhome_controller.rb b/app/controllers/oqs/backhome_controller.rb index 990fa459..4ac5f0a2 100755 --- a/app/controllers/oqs/backhome_controller.rb +++ b/app/controllers/oqs/backhome_controller.rb @@ -30,12 +30,6 @@ class Oqs::HomeController < BaseOqsController @queue_stations_items end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end - # Get Order items def get_order_items items = [] @@ -129,9 +123,4 @@ class Oqs::HomeController < BaseOqsController # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true'); end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb index f8bef2de..cda55f31 100755 --- a/app/controllers/oqs/edit_controller.rb +++ b/app/controllers/oqs/edit_controller.rb @@ -51,9 +51,4 @@ class Oqs::EditController < BaseOqsController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 371425ca..e71075ec 100755 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -226,10 +226,4 @@ class Oqs::HomeController < BaseOqsController .group("order_queue_stations.id") end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end - end diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index 5f973c7a..baa4af40 100755 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -102,9 +102,4 @@ class Oqs::PrintController < ApplicationController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end \ No newline at end of file diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index add3065b..13c1e246 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -208,9 +208,4 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController # @dining = DiningFacility.find(params[:id]) # end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/bank_integration_controller.rb b/app/controllers/origami/bank_integration_controller.rb index 6dde10da..cb735873 100644 --- a/app/controllers/origami/bank_integration_controller.rb +++ b/app/controllers/origami/bank_integration_controller.rb @@ -96,9 +96,4 @@ class Origami::BankIntegrationController < ApplicationController #BaseOrigamiCon render json: response end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb index cd08c16a..e0c56971 100755 --- a/app/controllers/origami/card_payments_controller.rb +++ b/app/controllers/origami/card_payments_controller.rb @@ -24,9 +24,4 @@ class Origami::CardPaymentsController < BaseOrigamiController def create end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/cash_ins_controller.rb b/app/controllers/origami/cash_ins_controller.rb index 4d7c2b64..441cd94e 100755 --- a/app/controllers/origami/cash_ins_controller.rb +++ b/app/controllers/origami/cash_ins_controller.rb @@ -14,10 +14,5 @@ class Origami::CashInsController < BaseOrigamiController shift.cash_in = shift.cash_in + amount.to_i shift.save end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/cash_mgmt_controller.rb b/app/controllers/origami/cash_mgmt_controller.rb index 1f48370e..916f5d8b 100755 --- a/app/controllers/origami/cash_mgmt_controller.rb +++ b/app/controllers/origami/cash_mgmt_controller.rb @@ -8,9 +8,4 @@ class Origami::CashMgmtController < ApplicationController def create end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/cash_outs_controller.rb b/app/controllers/origami/cash_outs_controller.rb index cc22516c..8c81b5cb 100755 --- a/app/controllers/origami/cash_outs_controller.rb +++ b/app/controllers/origami/cash_outs_controller.rb @@ -13,9 +13,4 @@ class Origami::CashOutsController < BaseOrigamiController shift.save end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb index 48d55c9a..ad3efee0 100644 --- a/app/controllers/origami/check_in_process_controller.rb +++ b/app/controllers/origami/check_in_process_controller.rb @@ -36,9 +36,4 @@ class Origami::CheckInProcessController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb index 4fd9ba71..d70ef870 100755 --- a/app/controllers/origami/credit_payments_controller.rb +++ b/app/controllers/origami/credit_payments_controller.rb @@ -47,10 +47,4 @@ class Origami::CreditPaymentsController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end - end diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index db89b1d0..d93e5040 100755 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -136,10 +136,5 @@ class Origami::CustomersController < BaseOrigamiController render json: JSON.generate({:status => false, :error_message => "Record not found"}) end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index e47a8e48..a7f6ff15 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -57,8 +57,4 @@ class Origami::DashboardController < BaseOrigamiController @print_settings = PrintSetting.get_precision_delimiter() end - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 46dd65d0..87931f8c 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -355,9 +355,5 @@ class Origami::DiscountsController < BaseOrigamiController # redirect_to origami_path(sale_id) # end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 3a7501e6..43fb104f 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -131,12 +131,6 @@ class Origami::HomeController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end - private def set_dining diff --git a/app/controllers/origami/home_controller_bk.rb b/app/controllers/origami/home_controller_bk.rb index 3e414665..4839f15c 100755 --- a/app/controllers/origami/home_controller_bk.rb +++ b/app/controllers/origami/home_controller_bk.rb @@ -81,9 +81,4 @@ class Origami::HomeController < ApplicationController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/in_duties_controller.rb b/app/controllers/origami/in_duties_controller.rb index 945f3bd9..9846516e 100755 --- a/app/controllers/origami/in_duties_controller.rb +++ b/app/controllers/origami/in_duties_controller.rb @@ -169,9 +169,4 @@ class Origami::InDutiesController < BaseOrigamiController params.require(:in_duty).permit(:id, :dinning_id, :commissioner_ids, :in_time, :out_time) end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index 0604535e..e17c773e 100755 --- a/app/controllers/origami/jcb_controller.rb +++ b/app/controllers/origami/jcb_controller.rb @@ -58,9 +58,4 @@ class Origami::JcbController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb index 25bebf55..95710f11 100755 --- a/app/controllers/origami/master_controller.rb +++ b/app/controllers/origami/master_controller.rb @@ -57,9 +57,4 @@ class Origami::MasterController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb index 5b53f68c..316ab894 100755 --- a/app/controllers/origami/moveroom_controller.rb +++ b/app/controllers/origami/moveroom_controller.rb @@ -35,11 +35,5 @@ class Origami::MoveroomController < BaseOrigamiController end end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index 8da417ac..dfdfcabf 100755 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -70,10 +70,5 @@ class Origami::MovetableController < BaseOrigamiController @get_type = Booking.update_dining_facility(booking_array,change_to,change_from) end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb index ce0dccce..6eb2a0a0 100755 --- a/app/controllers/origami/mpu_controller.rb +++ b/app/controllers/origami/mpu_controller.rb @@ -57,9 +57,4 @@ class Origami::MpuController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index 13f5b684..3181d470 100755 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -80,10 +80,5 @@ class Origami::OrdersController < BaseOrigamiController end end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index d15edb5e..e7f9f9b2 100755 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -76,10 +76,5 @@ class Origami::OtherChargesController < BaseOrigamiController end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end \ No newline at end of file diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb index ab755ea1..e4a39662 100755 --- a/app/controllers/origami/others_payments_controller.rb +++ b/app/controllers/origami/others_payments_controller.rb @@ -37,9 +37,4 @@ class Origami::OthersPaymentsController < BaseOrigamiController def create end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index cd32b418..beb95671 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -416,10 +416,5 @@ class Origami::PaymentsController < BaseOrigamiController end end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end \ No newline at end of file diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index 04a52f0f..faaeca8e 100755 --- a/app/controllers/origami/paypar_payments_controller.rb +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -29,9 +29,4 @@ class Origami::PayparPaymentsController < BaseOrigamiController end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb index a1942a27..4333046c 100644 --- a/app/controllers/origami/pending_order_controller.rb +++ b/app/controllers/origami/pending_order_controller.rb @@ -17,8 +17,5 @@ class Origami::PendingOrderController < BaseOrigamiController @dining = nil end end - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb index 2ab9a618..2f209a7a 100755 --- a/app/controllers/origami/product_commissions_controller.rb +++ b/app/controllers/origami/product_commissions_controller.rb @@ -137,9 +137,4 @@ class Origami::ProductCommissionsController < BaseOrigamiController params.fetch(:product_commission, {}) end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 76517e8a..347fd3ea 100755 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -68,10 +68,5 @@ class Origami::RedeemPaymentsController < BaseOrigamiController end @out = false, 0 end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index ad46ede6..10c1dc9f 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -53,10 +53,5 @@ class Origami::RequestBillsController < ApplicationController # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details) end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/room_invoices_controller.rb b/app/controllers/origami/room_invoices_controller.rb index 9c3b16a6..8d805771 100755 --- a/app/controllers/origami/room_invoices_controller.rb +++ b/app/controllers/origami/room_invoices_controller.rb @@ -37,9 +37,4 @@ class Origami::RoomInvoicesController < BaseOrigamiController @customer = @sale.customer end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 03e864fa..d4f1cd67 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -131,9 +131,4 @@ class Origami::RoomsController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index f78c0f53..524f4895 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -166,10 +166,5 @@ class Origami::SaleEditController < BaseOrigamiController ProductCommission.remove_product_commission(item) end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb index 513bdb2c..eee75e37 100755 --- a/app/controllers/origami/sales_controller.rb +++ b/app/controllers/origami/sales_controller.rb @@ -56,9 +56,4 @@ class Origami::SalesController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index 435a98d1..cb2cc830 100755 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -108,9 +108,4 @@ class Origami::ShiftsController < BaseOrigamiController end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb index 4c74d4a7..db9e0418 100644 --- a/app/controllers/origami/split_bill_controller.rb +++ b/app/controllers/origami/split_bill_controller.rb @@ -360,10 +360,4 @@ class Origami::SplitBillController < BaseOrigamiController orderItem.save! end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end - end diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb index 02ec9795..0e4ecd7b 100644 --- a/app/controllers/origami/surveys_controller.rb +++ b/app/controllers/origami/surveys_controller.rb @@ -137,10 +137,5 @@ class Origami::SurveysController < BaseOrigamiController def survey_params params.require(:survey).permit(:child, :adult,:male,:female,:local,:foreigner, :dining_name,:receipt_no,:shift_id,:created_by,:total_customer,:total_amount,:survey_id) end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb index f2dd132a..880df1c7 100755 --- a/app/controllers/origami/table_invoices_controller.rb +++ b/app/controllers/origami/table_invoices_controller.rb @@ -67,9 +67,4 @@ class Origami::TableInvoicesController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb index 89adfd3e..905a1ffb 100644 --- a/app/controllers/origami/unionpay_controller.rb +++ b/app/controllers/origami/unionpay_controller.rb @@ -57,9 +57,4 @@ class Origami::UnionpayController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index 5404789c..f04ec001 100755 --- a/app/controllers/origami/visa_controller.rb +++ b/app/controllers/origami/visa_controller.rb @@ -57,9 +57,4 @@ class Origami::VisaController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index e4190cf7..df9aa439 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -139,10 +139,5 @@ class Origami::VoidController < BaseOrigamiController end end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end \ No newline at end of file diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb index 750189df..c4b3c840 100755 --- a/app/controllers/origami/voucher_controller.rb +++ b/app/controllers/origami/voucher_controller.rb @@ -78,9 +78,4 @@ class Origami::VoucherController < BaseOrigamiController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb index a72319b3..710e6ea4 100755 --- a/app/controllers/print_settings_controller.rb +++ b/app/controllers/print_settings_controller.rb @@ -2,6 +2,8 @@ class PrintSettingsController < ApplicationController load_and_authorize_resource except: [:create] before_action :set_print_setting, only: [:show, :edit, :update, :destroy] + helper_method :shop_detail + # GET /print_settings # GET /print_settings.json def index @@ -72,4 +74,9 @@ class PrintSettingsController < ApplicationController def print_setting_params params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :font, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space) end + + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end end diff --git a/app/controllers/reports/bksaleitem_controller.rb b/app/controllers/reports/bksaleitem_controller.rb index 118269bb..0f91681d 100755 --- a/app/controllers/reports/bksaleitem_controller.rb +++ b/app/controllers/reports/bksaleitem_controller.rb @@ -16,10 +16,4 @@ class Reports::SaleitemController < BaseReportController end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end - end diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb index 9e13bd75..9a7f4ca1 100755 --- a/app/controllers/reports/commission_controller.rb +++ b/app/controllers/reports/commission_controller.rb @@ -49,11 +49,6 @@ class Reports::CommissionController < BaseReportController format.json { render json: out } end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/reports/credit_payment_controller.rb b/app/controllers/reports/credit_payment_controller.rb index abf7a6af..f46b008f 100755 --- a/app/controllers/reports/credit_payment_controller.rb +++ b/app/controllers/reports/credit_payment_controller.rb @@ -60,9 +60,4 @@ authorize_resource :class => false end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end \ No newline at end of file diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb index d43355fa..4f6d8e68 100755 --- a/app/controllers/reports/dailysale_controller.rb +++ b/app/controllers/reports/dailysale_controller.rb @@ -19,10 +19,5 @@ class Reports::DailysaleController < BaseReportController def show end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb index 0262594f..928f17d6 100644 --- a/app/controllers/reports/payment_method_controller.rb +++ b/app/controllers/reports/payment_method_controller.rb @@ -62,9 +62,4 @@ class Reports::PaymentMethodController < BaseReportController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end \ No newline at end of file diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index ead85d72..cff7887c 100755 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -61,10 +61,5 @@ authorize_resource :class => false format.json { render json: out } end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end \ No newline at end of file diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index 58421342..daeb86f4 100755 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -76,10 +76,5 @@ class Reports::SaleitemController < BaseReportController format.json { render json: out } end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb index cf722495..21ca498b 100755 --- a/app/controllers/reports/shiftsale_controller.rb +++ b/app/controllers/reports/shiftsale_controller.rb @@ -48,10 +48,5 @@ class Reports::ShiftsaleController < BaseReportController end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb index 9a033956..9d5ee37d 100755 --- a/app/controllers/reports/stock_check_controller.rb +++ b/app/controllers/reports/stock_check_controller.rb @@ -46,11 +46,6 @@ class Reports::StockCheckController < BaseReportController format.json { render json: out } end end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end + end diff --git a/app/controllers/reports/void_sale_controller.rb b/app/controllers/reports/void_sale_controller.rb index 50a7c57d..32926d63 100755 --- a/app/controllers/reports/void_sale_controller.rb +++ b/app/controllers/reports/void_sale_controller.rb @@ -59,9 +59,4 @@ authorize_resource :class => false end end - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first - end end \ No newline at end of file diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb index 8ef6fd78..d2923bf2 100644 --- a/app/controllers/sym_control_controller.rb +++ b/app/controllers/sym_control_controller.rb @@ -2,6 +2,8 @@ class SymControlController < BaseController skip_before_action :verify_authenticity_token http_basic_authenticate_with name: "vip", password: "!abcABC01" + helper_method :shop_detail + def run sym_path = File.expand_path("~/symmetric/") check_sym_proc_str = `#{"sudo service SymmetricDS status"}` @@ -43,4 +45,9 @@ class SymControlController < BaseController end end + #Shop Name in Navbor + def shop_detail + @shop = Shop.first + end + end \ No newline at end of file diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 104c4c67..c3dce804 100755 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -135,7 +135,7 @@ <%= @summ_sale.total_receipt %> - <%= t("views.right_panel.detail.total") %> <%= t :sale %> : + <%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : <%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %> @@ -147,7 +147,7 @@ <%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%> - <%= t("views.right_panel.detail.grand_total") %> : + <%= t("views.right_panel.detail.total_sale") %> : <%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%> @@ -157,7 +157,11 @@ <% if !@sale_data[0].empty? %> <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' && payment.payment_method != 'unionpay' %> - <%= payment.payment_method.to_s.capitalize %> Sale : + <% if payment.payment_method == 'paypar' %> + Redeem Sale : + <% else %> + <%= payment.payment_method.to_s.capitalize %> Sale : + <% end %> <% @sale_data.each do |data| %> <% pay_mth = payment.payment_method %> @@ -172,7 +176,7 @@ <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %> <% if !total_card.nil? %> - <%= t("views.right_panel.detail.card_sale") %> : + <%= t("views.right_panel.detail.other_payment") %> : <%= total_card["card"].to_f %> @@ -185,7 +189,7 @@ - <% end %> + <% end %>
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index 24b0f2e5..4c2dda42 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -57,15 +57,15 @@
-
-
+
+
-

- Version - 1.0.1 -

-
-
-
+

+ Version - 1.0.1 +

+
+
+
@@ -102,112 +102,112 @@
- -
+
-
- -
- -
-
- Supervisor -
-
-
-
-
- -
+
    <% @employees.each do |employee| %> <%if employee.role == "supervisor" %> -
    -
    -
    -
    -
    - <%= employee.name%> -
    -
    -
    +
  • + Supervisor + <% break %> +
    • <% end %> <% end %> -
-
-
- Cashier -
-
-
-
-
- -
<% @employees.each do |employee| %> <%if employee.role == "cashier" %> -
-
-
-
-
- <%= employee.name%> -
-
-
+
  • + Cashier + <% break %> +
    • <% end %> <% end %> -
    -
    -
    - Accountant -
    -
    -
    -
    -
    - -
    <% @employees.each do |employee| %> - <%if employee.role == "account" %> -
    -
    -
    -
    -
    - <%= employee.name%> -
    -
    -
    - <% end %> - <% end %> -
    + <%if employee.role == "account" %> +
  • + Accountant + <% break %> +
    • + <% end %> + <% end %> -
    -
    - Waiter -
    -
    -
    -
    -
    - -
    <% @employees.each do |employee| %> <%if employee.role == "waiter" %> -
    -
    -
    -
    -
    - <%= employee.name%> -
    -
    -
    +
  • + Waiter + <% break %> +
    • <% end %> <% end %> -
    + + +
    + +
    + <% @employees.each do |employee| %> + <%if employee.role == "supervisor" %> +
    +
    +
    + +
    + <% end %> + <% end %> +
    + +
    + <% @employees.each do |employee| %> + <%if employee.role == "cashier" %> +
    +
    +
    + +
    + <% end %> + <% end %> +
    + +
    + <% @employees.each do |employee| %> + <%if employee.role == "account" %> +
    +
    +
    + +
    + <% end %> + <% end %> +
    + +
    + <% @employees.each do |employee| %> + <%if employee.role == "waiter" %> +
    +
    +
    + +
    + <% end %> + <% end %> +
    +
    @@ -237,6 +237,10 @@ $(item).submit(); }); + $('ul.nav.nav-tabs li a').click(function() { + $(this).parent().addClass('login_dashboard').siblings().removeClass('login_dashboard'); + }); + $("#emp_id").focus(); $(".pin_pad").click(function (event) { event.preventDefault(); diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 8f58ceb0..4c712015 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -88,69 +88,69 @@ <% 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.sale") %> <%= t :revenue %> : <%= 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.total") %> <%= t :sale %> : <%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%>
    <%= t("views.right_panel.detail.total") %> <%= t :redeem %> : <%= 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 %> +
    +
    +
    +
    <%= t :sale %>
    +
    <%= 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.total") %> <%= t("views.right_panel.detail.receipt") %> : <%= @summ_sale.total_receipt %>
    <%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : <%= 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.total") %> <%= t :sale %> : <%= 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' %> + + <% if payment.payment_method == 'paypar' %> + + <% else %> + + <% end %> + + + <% end %> + <% end %> + <% end %> - <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %> - <% if !total_card.nil? %> - - - - - <% end %> + <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %> + <% if !total_card.nil? %> + + + + + <% end %> - <% end %> -
    Redeem Sale : <%= 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.other_payment") %> : - <%= total_card["card"].to_f %> -
    <%= t("views.right_panel.detail.other_payment") %> : + <%= total_card["card"].to_f %> +
    + <% end %> + +
    -
    <% end %>