diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 2aca4c29..f882e526 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -198,6 +198,18 @@ select.form-control { background-color: blue !important; } +.selected-payment { + color: #fff !important; + background-color: blue !important; +} +.payment_btn { + white-space: normal !important; + margin-bottom: 15px; + margin-right: 15px; + color:#fff !important; + # background-color: green !important; +} + /* Reciept Style */ #order-charges-table td { border-top: none !important; diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index dd648bb4..383a6606 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -219,7 +219,7 @@ class Api::OrdersController < Api::ApiController if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # print - assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) + assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) # order queue stations oqs = assigned_item.order_queue_station diff --git a/app/controllers/settings/commissioners_controller.rb b/app/controllers/settings/commissioners_controller.rb index f8314bcb..fb8c1993 100755 --- a/app/controllers/settings/commissioners_controller.rb +++ b/app/controllers/settings/commissioners_controller.rb @@ -1,6 +1,7 @@ class Settings::CommissionersController < ApplicationController load_and_authorize_resource except: [:create] before_action :set_commissioner, only: [:show, :edit, :update, :destroy] + before_action :check_user # GET /commissioners # GET /commissioners.json @@ -82,7 +83,11 @@ class Settings::CommissionersController < ApplicationController end render json: @transactions end - + def check_user + if current_user.nil? + redirect_to root_path + end + end private # Use callbacks to share common setup or constraints between actions. def set_commissioner diff --git a/app/controllers/settings/commissions_controller.rb b/app/controllers/settings/commissions_controller.rb index 5a41de17..1ac6b2cc 100755 --- a/app/controllers/settings/commissions_controller.rb +++ b/app/controllers/settings/commissions_controller.rb @@ -1,6 +1,7 @@ class Settings::CommissionsController < ApplicationController load_and_authorize_resource except: [:create] before_action :set_commission, only: [:show, :edit, :update, :destroy] + before_action :check_user # GET /commissions # GET /commissions.json @@ -68,6 +69,12 @@ class Settings::CommissionsController < ApplicationController # end end + def check_user + if current_user.nil? + redirect_to root_path + end + end + private # Use callbacks to share common setup or constraints between actions. def set_commission diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index b6baf64d..adcbc507 100755 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -1,6 +1,7 @@ class Settings::OrderQueueStationsController < ApplicationController load_and_authorize_resource except: [:create] before_action :set_settings_order_queue_station, only: [:show, :edit, :update, :destroy] + before_action :check_user # GET /settings/order_queue_stations # GET /settings/order_queue_stations.json @@ -67,6 +68,12 @@ class Settings::OrderQueueStationsController < ApplicationController # end end + def check_user + if current_user.nil? + redirect_to root_path + end + end + private # Use callbacks to share common setup or constraints between actions. def set_settings_order_queue_station diff --git a/app/controllers/settings/products_controller.rb b/app/controllers/settings/products_controller.rb index c0be149e..66e8f162 100755 --- a/app/controllers/settings/products_controller.rb +++ b/app/controllers/settings/products_controller.rb @@ -1,6 +1,7 @@ class Settings::ProductsController < ApplicationController load_and_authorize_resource except: [:create] before_action :set_settings_product, only: [:show, :edit, :update, :destroy] + before_action :check_user # GET /settings/products # GET /settings/products.json @@ -65,6 +66,12 @@ load_and_authorize_resource except: [:create] # end end + def check_user + if current_user.nil? + redirect_to root_path + end + end + private # Use callbacks to share common setup or constraints between actions. def set_settings_product diff --git a/app/controllers/settings/promotion_products_controller.rb b/app/controllers/settings/promotion_products_controller.rb index d297fb71..c66761d7 100755 --- a/app/controllers/settings/promotion_products_controller.rb +++ b/app/controllers/settings/promotion_products_controller.rb @@ -1,6 +1,7 @@ class Settings::PromotionProductsController < ApplicationController before_action :set_promotion, only: [:show, :edit, :update, :destroy,:new] before_action :set_promotion_product, only: [:show, :edit, :update, :destroy] + before_action :check_user # GET /promotion_products # GET /promotion_products.json @@ -63,6 +64,12 @@ class Settings::PromotionProductsController < ApplicationController # end end + def check_user + if current_user.nil? + redirect_to root_path + end + end + private # Use callbacks to share common setup or constraints between actions. def set_promotion diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb index ec00c5f6..7272ab0c 100755 --- a/app/controllers/settings/promotions_controller.rb +++ b/app/controllers/settings/promotions_controller.rb @@ -1,6 +1,7 @@ class Settings::PromotionsController < ApplicationController load_and_authorize_resource except: [:create] before_action :set_promotion, only: [:show, :edit, :update, :destroy] + before_action :check_user # GET /promotions # GET /promotions.json @@ -119,6 +120,12 @@ class Settings::PromotionsController < ApplicationController render json: res end + def check_user + if current_user.nil? + redirect_to root_path + end + end + private # Use callbacks to share common setup or constraints between actions. def set_promotion diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb index e35baa77..27f52f12 100755 --- a/app/controllers/transactions/credit_notes_controller.rb +++ b/app/controllers/transactions/credit_notes_controller.rb @@ -1,6 +1,7 @@ class Transactions::CreditNotesController < ApplicationController before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy] + before_action :check_user # GET /transactions/sales # GET /transactions/sales.json @@ -25,12 +26,18 @@ class Transactions::CreditNotesController < ApplicationController @credit_notes = 0 end end -puts "sssssssssssss" -puts @credit_notes.to_json + respond_to do |format| format.html # index.html.erb format.json { render json: @credit_notes } end - end - end \ No newline at end of file + end + + def check_user + if current_user.nil? + redirect_to root_path + end + end + +end \ No newline at end of file diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb index 52abf7fd..c2132ff6 100755 --- a/app/controllers/transactions/orders_controller.rb +++ b/app/controllers/transactions/orders_controller.rb @@ -1,5 +1,7 @@ class Transactions::OrdersController < ApplicationController load_and_authorize_resource except: [:create] + before_action :check_user + def index filter = params[:filter] @@ -39,4 +41,10 @@ class Transactions::OrdersController < ApplicationController end end + def check_user + if current_user.nil? + redirect_to root_path + end + end + end diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index f996142d..bae9c353 100755 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -1,6 +1,7 @@ class Transactions::SalesController < ApplicationController load_and_authorize_resource except: [:create] before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy] + before_action :check_user # GET /transactions/sales # GET /transactions/sales.json @@ -147,6 +148,12 @@ class Transactions::SalesController < ApplicationController end end + def check_user + if current_user.nil? + redirect_to root_path + end + end + private # Use callbacks to share common setup or constraints between actions. def set_transactions_sale diff --git a/app/controllers/transactions/shift_sales_controller.rb b/app/controllers/transactions/shift_sales_controller.rb index ce226d30..f3a9fc05 100644 --- a/app/controllers/transactions/shift_sales_controller.rb +++ b/app/controllers/transactions/shift_sales_controller.rb @@ -1,6 +1,7 @@ class Transactions::ShiftSalesController < ApplicationController load_and_authorize_resource except: [:create] before_action :set_transactions_shift_sale, only: [:show, :edit, :update, :destroy] + before_action :check_user def index @@ -53,6 +54,12 @@ class Transactions::ShiftSalesController < ApplicationController end end + def check_user + if current_user.nil? + redirect_to root_path + end + end + private # Use callbacks to share common setup or constraints between actions. def set_transactions_shift_sale diff --git a/app/models/license.rb b/app/models/license.rb index 7d935185..ac82721c 100755 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -1,7 +1,7 @@ class License include HTTParty - base_uri "connect.smartsales.dev/api" + base_uri "connect.smartsales.asia/api" attr_accessor :name, :address_1, :address_2, :township, :city, :country, :email, :phone, :fax, :logo, :subdomain, :plan_activation_date, :plan_next_renewal_date, :plan_max_products,:plan_max_customers, :plan_active_connections, diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 73ab8ea7..4922c1df 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -520,30 +520,31 @@ + @@ -735,11 +736,27 @@ }); }); + // click select option icon for add + $(document).on('click', '.payment_btn', function(event){ + active = $(this).hasClass('selected-payment'); + value = $(this).data('value'); + type = $(this).data('type'); + group = $(this).data('group'); + payments = $(".payment_btn"); + + if (active) { + $(this).removeClass('selected-payment'); + }else{ + $(this).addClass('selected-payment'); + } + }); //End selecct attribute buttom + $(".choose_payment").on('click', function () { $( "#loading_wrapper").show(); var sale_id = $('#sale_id').val(); - type = $('.payment_method').val(); + // type = $('.payment_method').val(); + type = get_selected_attributes('selected-payment'); if(parseInt(jQuery.inArray("Credit", type)) == -1){ if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) { calculate_member_discount(sale_id,"Card"); @@ -985,4 +1002,16 @@ window.location.href = '/oqs/'+ assigned_order_item_id + "/edit/"+dining_id; } }); + + // Get Selected Class + function get_selected_attributes(selected_class) { + var item_row = $('.'+selected_class); + var attribute_arr = []; + $(item_row).each(function(i){ + value = $(item_row[i]).attr('data-value'); + str = value; + attribute_arr.push(str); + }); + return attribute_arr; + } diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 5b026ba1..1b034655 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -489,16 +489,13 @@
- + + + <%end %>
@@ -680,6 +677,21 @@ $(document).ready(function(){ }); + // click select option icon for add + $(document).on('click', '.payment_btn', function(event){ + active = $(this).hasClass('selected-payment'); + value = $(this).data('value'); + type = $(this).data('type'); + group = $(this).data('group'); + payments = $(".payment_btn"); + + if (active) { + $(this).removeClass('selected-payment'); + }else{ + $(this).addClass('selected-payment'); + } +}); //End selecct attribute buttom + // Print for first bill $("#first_bill").on('click', function(){ var sale_id = $('#sale_id').val(); @@ -704,7 +716,9 @@ $(".choose_payment").on('click', function () { $( "#loading_wrapper").show(); var sale_id = $('#sale_id').val(); - type = $('.payment_method').val(); + type = get_selected_attributes('selected-payment'); + + // type = $('.payment_method').val(); if(parseInt(jQuery.inArray("Credit", type)) == -1){ if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) { calculate_member_discount(sale_id,"Card"); @@ -954,4 +968,15 @@ $('#add_invoice').on('click',function(){ window.location.href = '/oqs/'+ assigned_order_item_id + "/edit/"+dining_id; } }); + // Get Selected Class + function get_selected_attributes(selected_class) { + var item_row = $('.'+selected_class); + var attribute_arr = []; + $(item_row).each(function(i){ + value = $(item_row[i]).attr('data-value'); + str = value; + attribute_arr.push(str); + }); + return attribute_arr; + } diff --git a/config/.database.yml.swp b/config/.database.yml.swp deleted file mode 100755 index 09f1aac2..00000000 Binary files a/config/.database.yml.swp and /dev/null differ diff --git a/config/secrets.yml b/config/secrets.yml index 7930204e..076b6691 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -24,8 +24,8 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: connect.smartsales.dev/api #192.168.1.147:3002/api - server_mode: cloud + sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api + server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L diff --git a/config/sidekiq.yml b/config/sidekiq.yml index ac1bb2d5..672a4e9a 100755 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -8,7 +8,7 @@ --- :concurrency: 25 -:pidfile: ./tmp/pids/sidekiq.pid +:pidfile: ./tmp/sidekiq.pid :logfile: ./log/sidekiq.log :queues: - default