From 8bcb145a682545e70d2b2aa51c7bf1aac7480bb8 Mon Sep 17 00:00:00 2001 From: praWeb Date: Fri, 9 Oct 2020 11:22:16 +0100 Subject: [PATCH 1/2] Add optional param --- app/models/customer_account.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/customer_account.rb b/app/models/customer_account.rb index fe8c76e..a148288 100644 --- a/app/models/customer_account.rb +++ b/app/models/customer_account.rb @@ -54,22 +54,22 @@ def self.authenticate(attributes = {}) nil end - def self.find_by_email(email) - requestor.custom("email:#{URI.encode_www_form_component(email)}", {request_method: :get}, {}).first + def self.find_by_email(email, options = {}) + requestor.custom("email:#{URI.encode_www_form_component(email)}", {request_method: :get}, options).first rescue ::FlexCommerceApi::Error::NotFound nil end - def self.find_by_reference(reference) - requestor.custom("reference:#{reference}", {request_method: :get}, {}).first + def self.find_by_reference(reference, options = {}) + requestor.custom("reference:#{reference}", {request_method: :get}, options).first rescue ::FlexCommerceApi::Error::NotFound nil end # Find customer account by password reset token provided in email's link # Used in reset password scenario - def self.find_by_token(token) - requestor.custom("token:#{token}", {request_method: :get}, {}).first + def self.find_by_token(token, options = {}) + requestor.custom("token:#{token}", {request_method: :get}, options).first rescue ::FlexCommerceApi::Error::NotFound nil end From e24390569cce183d9ea189bbb2b8100cec5dda42 Mon Sep 17 00:00:00 2001 From: praWeb Date: Mon, 26 Oct 2020 12:15:40 +0000 Subject: [PATCH 2/2] Update the stock check query --- app/models/cart.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/cart.rb b/app/models/cart.rb index c7b88d0..4928c2c 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -128,9 +128,7 @@ def available_shipping_methods private def stock_levels - StockLevel.where(skus: line_items.map { |li| li.item.sku }.join(",")).all + StockLevel.with_params(fields: {stock_levels: "stock_available"}).where(skus: line_items.map { |li| li.item.sku }.join(",")).all end - - end end