diff --git a/Gemfile b/Gemfile index 5344bdc5..fa2990ad 100644 --- a/Gemfile +++ b/Gemfile @@ -72,6 +72,10 @@ gem 'filterrific' gem 'cancancan', '~> 1.10' +#pageless no need for current +# gem 'will_paginate' +# gem 'pageless-rails', github: 'rorlab/pageless-rails' + # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 81db4f47..4b045221 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -84,7 +84,6 @@ class Crm::CustomersController < BaseCrmController member_group_id = params[:member_group_id] if member_group_id.present? - puts "aaaaaaaaa" membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("create_membership_customer") merchant_uid = memberaction.merchant_account_id.to_s @@ -106,18 +105,18 @@ class Crm::CustomersController < BaseCrmController ) rescue HTTParty::Error - response = {status: false, message: "Can't open membership server "} + response = {"status" => false, "message" => "Can't open membership server "} rescue Net::OpenTimeout - - response = { status: false , message: "Can't open membership server "} + response = {"status" => false, "message" => "Can't open membership server "} rescue OpenURI::HTTPError - response = { status: false, message: "Can't open membership server "} + response = {"status" => false, "message" => "Can't open membership server "} rescue SocketError - response = { status: false, message: "Can't open membership server "} - end + response = {"status" => false, "message" => "Can't open membership server "} + end + if response["status"] == true customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) @@ -132,9 +131,9 @@ class Crm::CustomersController < BaseCrmController customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_type:member_group_id ) if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response[:message]} + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response["message"]} else - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response[:message] } + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response["message"] } end end else diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index e0e53b12..d8731ecb 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -26,6 +26,7 @@ class Oqs::HomeController < BaseOqsController @queue_stations_items.push({:zone_id => zone_id , :station_name => que.station_name, :is_active => que.is_active , :is_ap => que.auto_print, :item_count => i }) end + # @queue_items_details = @queue_items_details.paginate(:per_page => 10, :page => params[:page]) @queue_stations_items end @@ -99,6 +100,7 @@ class Oqs::HomeController < BaseOqsController left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0") .group("assigned_order_items.assigned_order_item_id") + .order("assigned_order_items.created_at") end # Completed Order @@ -114,6 +116,8 @@ class Oqs::HomeController < BaseOqsController left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'") .group("assigned_order_items.order_id") + .limit(20) + .order("assigned_order_items.created_at") # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true'); diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index d9f1f4fb..e6ddf11f 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -181,11 +181,10 @@ class Origami::DiscountsController < BaseOrigamiController rescue SocketError response = {:status=> false, :message => "Can't open membership server " } end - + table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type - puts response - puts "sssssssssss" + # Re-calc All Amount in Sale if response["status"] == true discount_amount = response["discount_earned"] diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 96956958..ae3934e4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,11 +1,25 @@ module ApplicationHelper - def flash_class(level) - case level - when :notice then "alert alert-info fade-in" - when :success then "alert alert-success fade-in" - when :error then "alert alert-error fade-in" - when :alert then "alert alert-error fade-in" - end -end + def flash_class(level) + case level + when :notice then "alert alert-info fade-in" + when :success then "alert alert-success fade-in" + when :error then "alert alert-error fade-in" + when :alert then "alert alert-error fade-in" + end + end + + # For Pageless + # def pageless(total_pages, url=nil, container=nil) + # opts = { + # :totalPages => total_pages, + # :url => url, + # :loaderMsg => 'Loading more pages...', + # :loaderImage => image_path('load.gif') + # } + + # container && opts[:container] ||= container + + # javascript_tag("$('#{container}').pageless(#{opts.to_json});") + # end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 06f7f1d1..ef777c2d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -10,7 +10,7 @@ class Customer < ApplicationRecord validates :contact_no, uniqueness: true validates :email, uniqueness: true validates :card_no, uniqueness: true - validates :paypar_account_no, uniqueness: true + # validates :paypar_account_no paginates_per 50 diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index d6ad14ca..3c09d20f 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -131,10 +131,12 @@ $("#paypar_account_no").on('focus', function(e){ var cardNo = ""; $("#sxModal").show(); - setTimeout(function(){ - getCardNo(); - $("#sxModal").hide(); - },100); + if($(this).val() == ''){ + setTimeout(function(){ + getCardNo(); + $("#sxModal").hide(); + },100); + } }); }); diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 571de1a2..ca652d26 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -130,7 +130,7 @@ end end %> - + diff --git a/db/seeds.rb b/db/seeds.rb index 317194c1..504862a5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -163,25 +163,25 @@ close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: " crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) -member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, - {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"am-15QFGS9xGBxDrV6bV",auth_token:"code2lab"}, ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"am-15QFGS9xGBxDrV6bV"}) cashier_terminal = CashierTerminal.create({name:"Terminal 1"}) cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"})