solidus_multi_domain 1.4.2 → 1.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6efd8a195f9ef9cce20361a7fda8a8a97a32d769
4
- data.tar.gz: ee4102db3fbc47787f5d4446a92d1ac53d73a8af
3
+ metadata.gz: 0d2545d2253799a83e872eb70e9f44a499469a6e
4
+ data.tar.gz: d50bb04b3174b6db83c15a71000e5965d0ce688a
5
5
  SHA512:
6
- metadata.gz: 8a9f833abc9d7bbd3f5c22281093d773305e1a19e6c68ff9c9d15adaf68c8832803f3c328c18ea6a360309c84cb3bd22bcd12b31ae6e782c76b78efa4bf06d78
7
- data.tar.gz: 76e9eca1a23e3c0e96fc2eb4a56357c26cad4b97fe3e7f518735c05b5ad36fdca6a1fca8b14901e139b0a9c91ac34beaf78ce2f20f6dc1b8795cf14203fd1224
6
+ metadata.gz: a0d32348d42d2ab6119ff213a535bb89de4d332e854eaaa3e7b4fdacb225820e2a7d1c8fe48904084dc4a213eee141b4a665d2078b83c9b5df531fb9cbb03aa2
7
+ data.tar.gz: f6811468a5e38c01716f57f219f526ce1877707e39f69be11fca62142d78ca3d907af3bc9a5174b658c12ef17614b925febd4ebac4a76a5eac7fc252c8b5cb07
@@ -2,11 +2,11 @@ Spree::Admin::ProductsController.class_eval do
2
2
  update.before :set_stores
3
3
 
4
4
  private
5
+
5
6
  def set_stores
6
7
  # Remove all store associations if store data is being passed and no stores are selected
7
8
  if params[:update_store_ids] && !params[:product].key?(:store_ids)
8
9
  @product.stores.clear
9
10
  end
10
11
  end
11
-
12
- end
12
+ end if SpreeMultiDomain::Engine.admin_available?
@@ -1 +1,3 @@
1
- Spree::Api::LineItemsController.include SpreeMultiDomain::CreateLineItemSupport
1
+ if SpreeMultiDomain::Engine.api_available?
2
+ Spree::Api::LineItemsController.include(SpreeMultiDomain::CreateLineItemSupport)
3
+ end
@@ -1 +1,3 @@
1
- Spree::Api::ProductsController.include(SpreeMultiDomain::ShowProductSupport)
1
+ if SpreeMultiDomain::Engine.api_available?
2
+ Spree::Api::ProductsController.include(SpreeMultiDomain::ShowProductSupport)
3
+ end
@@ -13,5 +13,7 @@ module SpreeMultiStore
13
13
  end
14
14
  end
15
15
 
16
- Spree::Api::ShipmentsController.include SpreeMultiStore::Api::ShipmentsControllerDecorator
17
- Spree::Api::ShipmentsController.include SpreeMultiDomain::CreateLineItemSupport
16
+ if SpreeMultiDomain::Engine.api_available?
17
+ Spree::Api::ShipmentsController.include(SpreeMultiStore::Api::ShipmentsControllerDecorator)
18
+ Spree::Api::ShipmentsController.include(SpreeMultiDomain::CreateLineItemSupport)
19
+ end
@@ -4,4 +4,4 @@ Spree::HomeController.class_eval do
4
4
  @products = @searcher.retrieve_products
5
5
  @taxonomies = get_taxonomies
6
6
  end
7
- end
7
+ end if SpreeMultiDomain::Engine.frontend_available?
@@ -1 +1,3 @@
1
- Spree::ProductsController.include(SpreeMultiDomain::ShowProductSupport)
1
+ if SpreeMultiDomain::Engine.frontend_available?
2
+ Spree::ProductsController.include(SpreeMultiDomain::ShowProductSupport)
3
+ end
@@ -7,4 +7,4 @@ Spree::TaxonsController.class_eval do
7
7
  @products = @searcher.retrieve_products
8
8
  @taxonomies = get_taxonomies
9
9
  end
10
- end
10
+ end if SpreeMultiDomain::Engine.frontend_available?
@@ -1,7 +1,7 @@
1
1
  module Spree::Search
2
2
  class MultiDomain < Spree::Core::Search::Base
3
3
  def get_base_scope
4
- base_scope = @cached_product_group ? @cached_product_group.products.active : Spree::Product.active
4
+ base_scope = @cached_product_group ? @cached_product_group.products.available : Spree::Product.available
5
5
  base_scope = base_scope.by_store(current_store_id) if current_store_id
6
6
  base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
7
7
 
@@ -4,15 +4,29 @@ module SpreeMultiDomain
4
4
 
5
5
  config.autoload_paths += %W(#{config.root}/lib)
6
6
 
7
- def self.activate
8
- ['app', 'lib'].each do |dir|
9
- Dir.glob(File.join(File.dirname(__FILE__), "../../#{dir}/**/*_decorator*.rb")) do |c|
10
- Rails.application.config.cache_classes ? require(c) : load(c)
7
+ class << self
8
+ def activate
9
+ ['app', 'lib'].each do |dir|
10
+ Dir.glob(File.join(File.dirname(__FILE__), "../../#{dir}/**/*_decorator*.rb")) do |c|
11
+ Rails.application.config.cache_classes ? require(c) : load(c)
12
+ end
11
13
  end
14
+
15
+ Spree::Config.searcher_class = Spree::Search::MultiDomain
16
+ ApplicationController.send :include, SpreeMultiDomain::MultiDomainHelpers
17
+ end
18
+
19
+ def admin_available?
20
+ const_defined?('Spree::Backend::Engine')
12
21
  end
13
22
 
14
- Spree::Config.searcher_class = Spree::Search::MultiDomain
15
- ApplicationController.send :include, SpreeMultiDomain::MultiDomainHelpers
23
+ def api_available?
24
+ const_defined?('Spree::Api::Engine')
25
+ end
26
+
27
+ def frontend_available?
28
+ const_defined?('Spree::Frontend::Engine')
29
+ end
16
30
  end
17
31
 
18
32
  config.to_prepare &method(:activate).to_proc
@@ -3,7 +3,7 @@
3
3
  Gem::Specification.new do |s|
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.name = "solidus_multi_domain"
6
- s.version = "1.4.2"
6
+ s.version = "1.4.3"
7
7
  s.summary = "Adds multiple site support to Solidus"
8
8
  s.description = "Multiple Solidus stores on different domains - single unified backed for processing orders."
9
9
  s.required_ruby_version = ">= 2.1"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_multi_domain
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.2
4
+ version: 1.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-23 00:00:00.000000000 Z
11
+ date: 2016-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: solidus
OSZAR »