spree_core 4.2.5 → 4.3.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/finders/concerns/spree/product_filterable.rb +9 -0
- data/app/finders/spree/cms_pages/find.rb +41 -0
- data/app/finders/spree/menus/find.rb +11 -0
- data/app/finders/spree/option_values/find_available.rb +20 -0
- data/app/finders/spree/orders/find_complete.rb +14 -2
- data/app/finders/spree/orders/find_current.rb +1 -13
- data/app/finders/spree/product_properties/find_available.rb +20 -0
- data/app/finders/spree/products/find.rb +55 -20
- data/app/finders/spree/stores/find_current.rb +24 -0
- data/app/helpers/spree/base_helper.rb +62 -2
- data/app/helpers/spree/locale_helper.rb +5 -1
- data/app/helpers/spree/products_helper.rb +7 -3
- data/app/models/concerns/spree/display_link.rb +42 -0
- data/app/models/concerns/spree/filter_param.rb +21 -0
- data/app/models/concerns/spree/memoized_data.rb +24 -0
- data/app/models/concerns/spree/multi_store_resource.rb +24 -0
- data/app/models/concerns/spree/product_scopes.rb +59 -8
- data/app/models/concerns/spree/single_store_resource.rb +9 -0
- data/app/models/concerns/spree/user_address.rb +19 -0
- data/app/models/concerns/spree/user_methods.rb +5 -4
- data/app/models/concerns/spree/user_payment_source.rb +1 -1
- data/app/models/spree/ability.rb +3 -1
- data/app/models/spree/address.rb +27 -6
- data/app/models/spree/app_configuration.rb +8 -0
- data/app/models/spree/app_dependencies.rb +18 -6
- data/app/models/spree/base.rb +18 -0
- data/app/models/spree/classification.rb +3 -0
- data/app/models/spree/cms/pages/feature_page.rb +7 -0
- data/app/models/spree/cms/pages/homepage.rb +20 -0
- data/app/models/spree/cms/pages/standard_page.rb +4 -0
- data/app/models/spree/cms/sections/featured_article.rb +29 -0
- data/app/models/spree/cms/sections/hero_image.rb +47 -0
- data/app/models/spree/cms/sections/image_gallery.rb +103 -0
- data/app/models/spree/cms/sections/product_carousel.rb +14 -0
- data/app/models/spree/cms/sections/rich_text_content.rb +13 -0
- data/app/models/spree/cms/sections/side_by_side_images.rb +74 -0
- data/app/models/spree/cms_page.rb +66 -0
- data/app/models/spree/cms_section.rb +57 -0
- data/app/models/spree/country.rb +14 -6
- data/app/models/spree/credit_card.rb +2 -8
- data/app/models/spree/customer_return.rb +8 -2
- data/app/models/spree/icon.rb +9 -0
- data/app/models/spree/image/configuration/active_storage.rb +2 -0
- data/app/models/spree/inventory_unit.rb +1 -1
- data/app/models/spree/line_item.rb +1 -1
- data/app/models/spree/menu.rb +63 -0
- data/app/models/spree/menu_item.rb +76 -0
- data/app/models/spree/option_type.rb +1 -1
- data/app/models/spree/option_value.rb +11 -0
- data/app/models/spree/option_value_variant.rb +1 -1
- data/app/models/spree/order.rb +46 -45
- data/app/models/spree/order/address_book.rb +3 -5
- data/app/models/spree/order/currency_updater.rb +1 -1
- data/app/models/spree/order/emails.rb +32 -0
- data/app/models/spree/order/payments.rb +1 -1
- data/app/models/spree/order/store_credit.rb +1 -1
- data/app/models/spree/payment.rb +7 -0
- data/app/models/spree/payment_method.rb +4 -0
- data/app/models/spree/preferences/preferable.rb +12 -0
- data/app/models/spree/preferences/preferable_class_methods.rb +10 -1
- data/app/models/spree/product.rb +27 -22
- data/app/models/spree/product_property.rb +19 -4
- data/app/models/spree/promotion.rb +6 -15
- data/app/models/spree/promotion/rules/country.rb +1 -1
- data/app/models/spree/promotion/rules/first_order.rb +4 -3
- data/app/models/spree/promotion/rules/taxon.rb +10 -7
- data/app/models/spree/promotion_handler/cart.rb +7 -2
- data/app/models/spree/promotion_handler/coupon.rb +5 -4
- data/app/models/spree/promotion_handler/free_shipping.rb +5 -6
- data/app/models/spree/promotion_handler/page.rb +3 -2
- data/app/models/spree/promotion_handler/promotion_duplicator.rb +1 -0
- data/app/models/spree/promotion_rule.rb +2 -0
- data/app/models/spree/property.rb +27 -0
- data/app/models/spree/reimbursement.rb +3 -1
- data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +2 -1
- data/app/models/spree/shipment_handler.rb +4 -2
- data/app/models/spree/stock/quantifier.rb +6 -6
- data/app/models/spree/store.rb +90 -7
- data/app/models/spree/store_credit.rb +7 -3
- data/app/models/spree/store_credit_event.rb +2 -2
- data/app/models/spree/store_payment_method.rb +11 -0
- data/app/models/spree/store_product.rb +11 -0
- data/app/models/spree/store_promotion.rb +11 -0
- data/app/models/spree/taxon.rb +21 -1
- data/app/models/spree/taxon_image/configuration/active_storage.rb +2 -0
- data/app/models/spree/taxonomy.rb +3 -1
- data/app/models/spree/variant.rb +13 -4
- data/app/presenters/spree/filters/options_presenter.rb +27 -0
- data/app/presenters/spree/filters/price_presenter.rb +22 -0
- data/app/presenters/spree/filters/price_range_presenter.rb +29 -0
- data/app/presenters/spree/filters/properties_presenter.rb +23 -0
- data/app/presenters/spree/filters/property_presenter.rb +22 -0
- data/app/presenters/spree/filters/quantified_price_range_presenter.rb +44 -0
- data/app/services/spree/account/addresses/create.rb +1 -0
- data/app/services/spree/account/addresses/helper.rb +6 -0
- data/app/services/spree/account/addresses/update.rb +9 -3
- data/app/services/spree/account/create.rb +17 -0
- data/app/services/spree/account/update.rb +15 -0
- data/app/services/spree/build_localized_redirect_url.rb +1 -1
- data/app/services/spree/cart/create.rb +5 -3
- data/app/services/spree/cart/destroy.rb +40 -0
- data/app/services/spree/cart/empty.rb +36 -0
- data/app/services/spree/cart/estimate_shipping_rates.rb +3 -3
- data/app/services/spree/checkout/add_store_credit.rb +1 -1
- data/app/services/spree/classifications/reposition.rb +18 -0
- data/app/services/spree/credit_cards/destroy.rb +41 -0
- data/app/validators/db_maximum_length_validator.rb +5 -0
- data/app/validators/email_validator.rb +3 -1
- data/app/views/spree/shared/_purchased_items_table.text.erb +25 -0
- data/config/initializers/active_storage.rb +2 -0
- data/config/locales/en.yml +166 -2
- data/config/routes.rb +0 -5
- data/db/migrate/20201023152810_add_filterable_to_spree_properties.rb +8 -0
- data/db/migrate/20210407200948_create_spree_menus.rb +16 -0
- data/db/migrate/20210408092939_create_spree_menu_items.rb +31 -0
- data/db/migrate/20210504163720_add_filter_param_to_spree_product_properties.rb +8 -0
- data/db/migrate/20210505114659_add_filter_param_to_spree_properties.rb +8 -0
- data/db/migrate/20210512191732_create_spree_cms_pages.rb +24 -0
- data/db/migrate/20210514204251_create_spree_cms_sections.rb +22 -0
- data/db/migrate/20210527094055_create_spree_products_stores.rb +29 -0
- data/db/migrate/20210608045519_ensure_store_default_country_is_set.rb +5 -0
- data/db/migrate/20210702112334_add_missing_timestamp_columns.rb +46 -0
- data/db/migrate/20210713131614_add_unique_index_on_property_id_and_product_id_to_product_properties.rb +29 -0
- data/db/migrate/20210715091956_add_store_id_to_spree_store_credits.rb +10 -0
- data/db/migrate/20210716093151_add_store_id_to_spree_taxonomies.rb +11 -0
- data/db/migrate/20210716104141_add_index_on_name_parent_id_and_taxonomy_id_on_spree_taxons.rb +31 -0
- data/db/migrate/20210721120857_add_index_on_permalink_parent_id_and_taxonomy_id_on_spree_taxons.rb +31 -0
- data/db/migrate/20210721125657_create_spree_promotions_stores.rb +29 -0
- data/db/migrate/20210722090705_add_store_id_to_spree_customer_returns.rb +11 -0
- data/db/migrate/20210726065456_change_integer_id_columns_into_bigint.rb +305 -0
- data/db/migrate/20210730154425_fix_promotion_code_and_path_unique_indexes.rb +9 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +11 -6
- data/lib/generators/spree/dummy_model/templates/model.rb.tt +1 -1
- data/lib/generators/spree/install/install_generator.rb +12 -24
- data/lib/spree/core.rb +8 -4
- data/lib/spree/core/components.rb +8 -0
- data/lib/spree/core/controller_helpers/auth.rb +7 -1
- data/lib/spree/core/controller_helpers/common.rb +1 -1
- data/lib/spree/core/controller_helpers/order.rb +4 -4
- data/lib/spree/core/controller_helpers/search.rb +1 -0
- data/lib/spree/core/controller_helpers/store.rb +10 -1
- data/lib/spree/core/engine.rb +6 -0
- data/lib/spree/core/importer/product.rb +3 -1
- data/lib/spree/core/product_duplicator.rb +1 -0
- data/lib/spree/core/search/base.rb +17 -22
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/i18n.rb +1 -1
- data/lib/spree/money.rb +2 -1
- data/lib/spree/permitted_attributes.rb +14 -3
- data/lib/spree/testing_support/authorization_helpers.rb +6 -3
- data/lib/spree/testing_support/capybara_config.rb +3 -1
- data/lib/spree/testing_support/common_rake.rb +17 -4
- data/lib/spree/testing_support/extension_rake.rb +2 -2
- data/lib/spree/testing_support/factories/address_factory.rb +1 -1
- data/lib/spree/testing_support/factories/classification_factory.rb +8 -0
- data/lib/spree/testing_support/factories/cms_page_factory.rb +20 -0
- data/lib/spree/testing_support/factories/cms_section_factory.rb +31 -0
- data/lib/spree/testing_support/factories/customer_return_factory.rb +24 -17
- data/lib/spree/testing_support/factories/icon_factory.rb +7 -0
- data/lib/spree/testing_support/factories/line_item_factory.rb +6 -2
- data/lib/spree/testing_support/factories/menu_factory.rb +16 -0
- data/lib/spree/testing_support/factories/menu_item_factory.rb +10 -0
- data/lib/spree/testing_support/factories/options_factory.rb +5 -0
- data/lib/spree/testing_support/factories/order_factory.rb +11 -2
- data/lib/spree/testing_support/factories/payment_method_factory.rb +6 -2
- data/lib/spree/testing_support/factories/product_factory.rb +11 -1
- data/lib/spree/testing_support/factories/product_property_factory.rb +1 -1
- data/lib/spree/testing_support/factories/promotion_factory.rb +18 -9
- data/lib/spree/testing_support/factories/property_factory.rb +22 -0
- data/lib/spree/testing_support/factories/stock_location_factory.rb +5 -4
- data/lib/spree/testing_support/factories/store_credit_factory.rb +1 -0
- data/lib/spree/testing_support/factories/store_factory.rb +11 -0
- data/lib/spree/testing_support/factories/taxon_factory.rb +3 -1
- data/lib/spree/testing_support/factories/taxon_image_factory.rb +7 -0
- data/lib/spree/testing_support/factories/taxonomy_factory.rb +1 -0
- data/lib/spree/testing_support/factories/user_factory.rb +7 -2
- data/lib/spree/testing_support/factories/variant_factory.rb +2 -2
- data/lib/spree/testing_support/flatpickr_capybara.rb +58 -35
- data/lib/spree/testing_support/order_walkthrough.rb +9 -9
- data/lib/tasks/core.rake +1 -1
- data/spec/fixtures/favicon.ico +0 -0
- data/spec/fixtures/files/icon_256x256.gif +0 -0
- data/spec/fixtures/files/icon_256x256.png +0 -0
- data/spec/fixtures/files/icon_512x512.png +0 -0
- data/spec/fixtures/files/img_256x128.png +0 -0
- data/spree_core.gemspec +11 -10
- metadata +206 -157
- data/app/assets/images/logo/spree_50.png +0 -0
- data/app/assets/images/noimage/large.png +0 -0
- data/app/assets/images/noimage/mini.png +0 -0
- data/app/assets/images/noimage/product.png +0 -0
- data/app/assets/images/noimage/small.png +0 -0
- data/app/assets/javascripts/spree.js +0 -78
- data/app/controllers/spree/errors_controller.rb +0 -11
- data/app/helpers/spree/mail_helper.rb +0 -29
- data/app/mailers/spree/base_mailer.rb +0 -46
- data/app/mailers/spree/order_mailer.rb +0 -26
- data/app/mailers/spree/reimbursement_mailer.rb +0 -12
- data/app/mailers/spree/shipment_mailer.rb +0 -12
- data/app/mailers/spree/test_mailer.rb +0 -8
- data/app/models/spree/validations/db_maximum_length_validator.rb +0 -22
- data/app/views/layouts/spree/base_mailer.html.erb +0 -46
- data/app/views/spree/errors/forbidden.html.erb +0 -0
- data/app/views/spree/errors/unauthorized.html.erb +0 -0
- data/app/views/spree/order_mailer/cancel_email.html.erb +0 -24
- data/app/views/spree/order_mailer/cancel_email.text.erb +0 -38
- data/app/views/spree/order_mailer/confirm_email.html.erb +0 -23
- data/app/views/spree/order_mailer/confirm_email.text.erb +0 -39
- data/app/views/spree/order_mailer/store_owner_notification_email.html.erb +0 -23
- data/app/views/spree/order_mailer/store_owner_notification_email.text.erb +0 -38
- data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb +0 -56
- data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb +0 -24
- data/app/views/spree/shared/_base_mailer_footer.html.erb +0 -12
- data/app/views/spree/shared/_base_mailer_header.html.erb +0 -13
- data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +0 -456
- data/app/views/spree/shared/_error_messages.html.erb +0 -11
- data/app/views/spree/shared/_mailer_line_item.html.erb +0 -16
- data/app/views/spree/shared/_paths.html.erb +0 -8
- data/app/views/spree/shared/_purchased_items_table.html.erb +0 -69
- data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb +0 -13
- data/app/views/spree/shared/purchased_items_table/_line_item.html.erb +0 -27
- data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb +0 -13
- data/app/views/spree/shared/purchased_items_table/_total.html.erb +0 -13
- data/app/views/spree/shipment_mailer/shipped_email.html.erb +0 -36
- data/app/views/spree/shipment_mailer/shipped_email.text.erb +0 -17
- data/app/views/spree/test_mailer/test_email.html.erb +0 -40
- data/app/views/spree/test_mailer/test_email.text.erb +0 -4
- data/config/initializers/assets.rb +0 -2
- data/config/initializers/premailer_assets.rb +0 -1
- data/config/initializers/premailer_rails.rb +0 -3
- data/db/migrate/20140805171219_make_existing_credit_cards_default.rb +0 -10
- data/lib/generators/spree/dummy/templates/initializers/bullet.rb +0 -5
- data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +0 -15
- data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -16
- data/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css +0 -16
- data/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css +0 -16
- data/lib/generators/spree/mailers_preview/mailers_preview_generator.rb +0 -23
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb +0 -13
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb +0 -5
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb +0 -5
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb +0 -11
- data/lib/tasks/email.rake +0 -10
- data/vendor/assets/javascripts/cleave.js +0 -1669
- data/vendor/assets/javascripts/fetch.umd.js +0 -531
- data/vendor/assets/javascripts/jquery.payment.js +0 -652
- data/vendor/assets/javascripts/jsuri.js +0 -458
- data/vendor/assets/javascripts/polyfill.min.js +0 -1
@@ -1,29 +1,44 @@
|
|
1
1
|
module Spree
|
2
2
|
class ProductProperty < Spree::Base
|
3
|
+
include Spree::FilterParam
|
4
|
+
|
5
|
+
auto_strip_attributes :value
|
6
|
+
|
3
7
|
acts_as_list scope: :product
|
4
8
|
|
5
9
|
with_options inverse_of: :product_properties do
|
6
10
|
belongs_to :product, touch: true, class_name: 'Spree::Product'
|
7
|
-
belongs_to :property, class_name: 'Spree::Property'
|
11
|
+
belongs_to :property, touch: true, class_name: 'Spree::Property'
|
8
12
|
end
|
9
13
|
|
10
14
|
validates :property, presence: true
|
11
|
-
|
12
|
-
validates :value, db_maximum_length: true
|
15
|
+
validates :property_id, uniqueness: { scope: :product_id }
|
13
16
|
|
14
17
|
default_scope { order(:position) }
|
15
18
|
|
16
|
-
|
19
|
+
scope :filterable, -> { joins(:property).where(Property.table_name => { filterable: true }) }
|
20
|
+
scope :for_products, ->(products) { joins(:product).merge(products) }
|
21
|
+
|
22
|
+
self.whitelisted_ransackable_attributes = ['value', 'filter_param']
|
17
23
|
self.whitelisted_ransackable_associations = ['property']
|
18
24
|
|
19
25
|
# virtual attributes for use with AJAX completion stuff
|
20
26
|
delegate :name, :presentation, to: :property, prefix: true, allow_nil: true
|
21
27
|
|
22
28
|
def property_name=(name)
|
29
|
+
ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
|
30
|
+
`ProductProperty#property_name=` is deprecated and will be removed in Spree 5.0.
|
31
|
+
DEPRECATION
|
23
32
|
if name.present?
|
24
33
|
# don't use `find_by :name` to workaround globalize/globalize#423 bug
|
25
34
|
self.property = Property.where(name: name).first_or_create(presentation: name)
|
26
35
|
end
|
27
36
|
end
|
37
|
+
|
38
|
+
protected
|
39
|
+
|
40
|
+
def param_candidate
|
41
|
+
value
|
42
|
+
end
|
28
43
|
end
|
29
44
|
end
|
@@ -1,5 +1,7 @@
|
|
1
1
|
module Spree
|
2
2
|
class Promotion < Spree::Base
|
3
|
+
include MultiStoreResource
|
4
|
+
|
3
5
|
MATCH_POLICIES = %w(all any)
|
4
6
|
UNACTIVATABLE_ORDER_STATES = ['complete', 'awaiting_return', 'returned']
|
5
7
|
|
@@ -16,19 +18,18 @@ module Spree
|
|
16
18
|
has_many :order_promotions, class_name: 'Spree::OrderPromotion'
|
17
19
|
has_many :orders, through: :order_promotions, class_name: 'Spree::Order'
|
18
20
|
|
21
|
+
has_and_belongs_to_many :stores, class_name: 'Spree::Store', join_table: 'spree_promotions_stores'
|
22
|
+
|
19
23
|
accepts_nested_attributes_for :promotion_actions, :promotion_rules
|
20
24
|
|
21
25
|
validates_associated :rules
|
22
26
|
|
23
27
|
validates :name, presence: true
|
24
|
-
validates :path, :code, uniqueness: { case_sensitive: false, allow_blank: true }
|
25
28
|
validates :usage_limit, numericality: { greater_than: 0, allow_nil: true }
|
26
29
|
validates :description, length: { maximum: 255 }, allow_blank: true
|
27
30
|
validate :expires_at_must_be_later_than_starts_at, if: -> { starts_at && expires_at }
|
28
31
|
|
29
|
-
|
30
|
-
|
31
|
-
before_validation :normalize_code
|
32
|
+
auto_strip_attributes :code, :path, :name
|
32
33
|
|
33
34
|
scope :coupons, -> { where.not(code: nil) }
|
34
35
|
scope :advertised, -> { where(advertise: true) }
|
@@ -44,7 +45,7 @@ module Spree
|
|
44
45
|
def self.with_coupon_code(coupon_code)
|
45
46
|
where("lower(#{table_name}.code) = ?", coupon_code.strip.downcase).
|
46
47
|
includes(:promotion_actions).where.not(spree_promotion_actions: { id: nil }).
|
47
|
-
|
48
|
+
last
|
48
49
|
end
|
49
50
|
|
50
51
|
def self.active
|
@@ -212,16 +213,6 @@ module Spree
|
|
212
213
|
end
|
213
214
|
end
|
214
215
|
|
215
|
-
def normalize_blank_values
|
216
|
-
[:code, :path].each do |column|
|
217
|
-
self[column] = nil if self[column].blank?
|
218
|
-
end
|
219
|
-
end
|
220
|
-
|
221
|
-
def normalize_code
|
222
|
-
self.code = code.strip if code.present?
|
223
|
-
end
|
224
|
-
|
225
216
|
def match_all?
|
226
217
|
match_policy == 'all'
|
227
218
|
end
|
@@ -11,7 +11,7 @@ module Spree
|
|
11
11
|
|
12
12
|
def eligible?(order, options = {})
|
13
13
|
country_id = options[:country_id] || order.ship_address.try(:country_id)
|
14
|
-
unless country_id.eql?(preferred_country_id ||
|
14
|
+
unless country_id.eql?(preferred_country_id || order.store.default_country_id)
|
15
15
|
eligibility_errors.add(:base, eligibility_error_message(:wrong_country))
|
16
16
|
end
|
17
17
|
|
@@ -2,7 +2,7 @@ module Spree
|
|
2
2
|
class Promotion
|
3
3
|
module Rules
|
4
4
|
class FirstOrder < PromotionRule
|
5
|
-
attr_reader :user, :email
|
5
|
+
attr_reader :user, :email, :store
|
6
6
|
|
7
7
|
def applicable?(promotable)
|
8
8
|
promotable.is_a?(Spree::Order)
|
@@ -11,6 +11,7 @@ module Spree
|
|
11
11
|
def eligible?(order, options = {})
|
12
12
|
@user = order.try(:user) || options[:user]
|
13
13
|
@email = order.email
|
14
|
+
@store = order.store
|
14
15
|
|
15
16
|
if user || email
|
16
17
|
if !completed_orders.blank? && completed_orders.first != order
|
@@ -26,11 +27,11 @@ module Spree
|
|
26
27
|
private
|
27
28
|
|
28
29
|
def completed_orders
|
29
|
-
user ? user.orders.complete : orders_by_email
|
30
|
+
user ? user.orders.for_store(store).complete : orders_by_email
|
30
31
|
end
|
31
32
|
|
32
33
|
def orders_by_email
|
33
|
-
|
34
|
+
store.orders.where(email: email).complete
|
34
35
|
end
|
35
36
|
end
|
36
37
|
end
|
@@ -30,7 +30,12 @@ module Spree
|
|
30
30
|
end
|
31
31
|
|
32
32
|
def actionable?(line_item)
|
33
|
-
|
33
|
+
store = line_item.order.store
|
34
|
+
|
35
|
+
store.products.
|
36
|
+
joins(:classifications).
|
37
|
+
where(Spree::Classification.table_name => { taxon_id: taxon_ids, product_id: line_item.product_id }).
|
38
|
+
exists?
|
34
39
|
end
|
35
40
|
|
36
41
|
def taxon_ids_string
|
@@ -39,14 +44,16 @@ module Spree
|
|
39
44
|
|
40
45
|
def taxon_ids_string=(s)
|
41
46
|
ids = s.to_s.split(',').map(&:strip)
|
42
|
-
self.taxons = Spree::Taxon.find(ids)
|
47
|
+
self.taxons = Spree::Taxon.for_stores(stores).find(ids)
|
43
48
|
end
|
44
49
|
|
45
50
|
private
|
46
51
|
|
47
52
|
# All taxons in an order
|
48
53
|
def order_taxons(order)
|
49
|
-
Spree::
|
54
|
+
taxon_ids = Spree::Classification.where(product_id: order.product_ids).pluck(:taxon_id).uniq
|
55
|
+
|
56
|
+
order.store.taxons.where(id: taxon_ids)
|
50
57
|
end
|
51
58
|
|
52
59
|
# ids of taxons rules and taxons rules children
|
@@ -62,10 +69,6 @@ module Spree
|
|
62
69
|
def taxons_in_order_including_parents(order)
|
63
70
|
order_taxons_in_taxons_and_children(order).inject([]) { |taxons, taxon| taxons << taxon.self_and_ancestors }.flatten.uniq
|
64
71
|
end
|
65
|
-
|
66
|
-
def taxon_product_ids
|
67
|
-
Spree::Product.joins(:taxons).where(spree_taxons: { id: taxons.pluck(:id) }).pluck(:id).uniq
|
68
|
-
end
|
69
72
|
end
|
70
73
|
end
|
71
74
|
end
|
@@ -13,12 +13,13 @@ module Spree
|
|
13
13
|
# the promotions system accurate and performant. Here they can plug custom
|
14
14
|
# handler to activate promos as they wish once an item is added to cart
|
15
15
|
class Cart
|
16
|
-
attr_reader :line_item, :order
|
16
|
+
attr_reader :line_item, :order, :store
|
17
17
|
attr_accessor :error, :success
|
18
18
|
|
19
19
|
def initialize(order, line_item = nil)
|
20
20
|
@order = order
|
21
21
|
@line_item = line_item
|
22
|
+
@store = order.store
|
22
23
|
end
|
23
24
|
|
24
25
|
def activate
|
@@ -34,7 +35,11 @@ module Spree
|
|
34
35
|
private
|
35
36
|
|
36
37
|
def promotions
|
37
|
-
|
38
|
+
promotion_scope.find_by_sql("#{order.promotions.active.to_sql} UNION #{promotion_scope.active.where(code: nil, path: nil).to_sql}")
|
39
|
+
end
|
40
|
+
|
41
|
+
def promotion_scope
|
42
|
+
::Spree::Promotion.for_store(store)
|
38
43
|
end
|
39
44
|
end
|
40
45
|
end
|
@@ -1,18 +1,19 @@
|
|
1
1
|
module Spree
|
2
2
|
module PromotionHandler
|
3
3
|
class Coupon
|
4
|
-
attr_reader :order
|
4
|
+
attr_reader :order, :store
|
5
5
|
attr_accessor :error, :success, :status_code
|
6
6
|
|
7
7
|
def initialize(order)
|
8
8
|
@order = order
|
9
|
+
@store = order.store
|
9
10
|
end
|
10
11
|
|
11
12
|
def apply
|
12
13
|
if order.coupon_code.present?
|
13
14
|
if promotion.present? && promotion.actions.exists?
|
14
15
|
handle_present_promotion
|
15
|
-
elsif
|
16
|
+
elsif store.promotions.with_coupon_code(order.coupon_code).try(:expired?)
|
16
17
|
set_error_code :coupon_code_expired
|
17
18
|
else
|
18
19
|
set_error_code :coupon_code_not_found
|
@@ -51,7 +52,7 @@ module Spree
|
|
51
52
|
end
|
52
53
|
|
53
54
|
def promotion
|
54
|
-
@promotion ||=
|
55
|
+
@promotion ||= store.promotions.active.includes(
|
55
56
|
:promotion_rules, :promotion_actions
|
56
57
|
).with_coupon_code(order.coupon_code)
|
57
58
|
end
|
@@ -75,7 +76,7 @@ module Spree
|
|
75
76
|
line_item = order.find_line_item_by_variant(item.variant)
|
76
77
|
next if line_item.blank?
|
77
78
|
|
78
|
-
Spree::Dependencies.cart_remove_item_service.constantize.call(order: order,
|
79
|
+
Spree::Dependencies.cart_remove_item_service.constantize.call(order: order, variant: item.variant, quantity: item.quantity)
|
79
80
|
end
|
80
81
|
end
|
81
82
|
|
@@ -2,12 +2,13 @@ module Spree
|
|
2
2
|
module PromotionHandler
|
3
3
|
# Used for activating promotions with shipping rules
|
4
4
|
class FreeShipping
|
5
|
-
attr_reader :order, :order_promo_ids
|
5
|
+
attr_reader :order, :order_promo_ids, :store
|
6
6
|
attr_accessor :error, :success
|
7
7
|
|
8
8
|
def initialize(order)
|
9
9
|
@order = order
|
10
|
-
@
|
10
|
+
@store = order.store
|
11
|
+
@order_promo_ids = order.promotions.ids
|
11
12
|
end
|
12
13
|
|
13
14
|
def activate
|
@@ -21,10 +22,8 @@ module Spree
|
|
21
22
|
private
|
22
23
|
|
23
24
|
def promotions
|
24
|
-
|
25
|
-
|
26
|
-
path: nil
|
27
|
-
)
|
25
|
+
store.promotions.active.joins(:promotion_actions).
|
26
|
+
where(Spree::PromotionAction.table_name => { type: 'Spree::Promotion::Actions::FreeShipping' }, path: nil).distinct
|
28
27
|
end
|
29
28
|
end
|
30
29
|
end
|
@@ -1,10 +1,11 @@
|
|
1
1
|
module Spree
|
2
2
|
module PromotionHandler
|
3
3
|
class Page
|
4
|
-
attr_reader :order, :path
|
4
|
+
attr_reader :order, :path, :store
|
5
5
|
|
6
6
|
def initialize(order, path)
|
7
7
|
@order = order
|
8
|
+
@store = order.store
|
8
9
|
@path = path.gsub(/\A\//, '')
|
9
10
|
end
|
10
11
|
|
@@ -17,7 +18,7 @@ module Spree
|
|
17
18
|
private
|
18
19
|
|
19
20
|
def promotion
|
20
|
-
@promotion ||=
|
21
|
+
@promotion ||= store.promotions.active.find_by(path: path)
|
21
22
|
end
|
22
23
|
end
|
23
24
|
end
|
@@ -11,6 +11,7 @@ module Spree
|
|
11
11
|
@new_promotion.path = "#{@promotion.path}_#{@random_string}"
|
12
12
|
@new_promotion.name = "New #{@promotion.name}"
|
13
13
|
@new_promotion.code = "#{@promotion.code}_#{@random_string}"
|
14
|
+
@new_promotion.stores = @promotion.stores
|
14
15
|
|
15
16
|
ActiveRecord::Base.transaction do
|
16
17
|
@new_promotion.save
|
@@ -1,5 +1,9 @@
|
|
1
1
|
module Spree
|
2
2
|
class Property < Spree::Base
|
3
|
+
include Spree::FilterParam
|
4
|
+
|
5
|
+
auto_strip_attributes :name, :presentation
|
6
|
+
|
3
7
|
has_many :property_prototypes, class_name: 'Spree::PropertyPrototype'
|
4
8
|
has_many :prototypes, through: :property_prototypes, class_name: 'Spree::Prototype'
|
5
9
|
|
@@ -9,15 +13,38 @@ module Spree
|
|
9
13
|
validates :name, :presentation, presence: true
|
10
14
|
|
11
15
|
scope :sorted, -> { order(:name) }
|
16
|
+
scope :filterable, -> { where(filterable: true) }
|
12
17
|
|
13
18
|
after_touch :touch_all_products
|
19
|
+
after_save :ensure_product_properties_have_filter_params
|
14
20
|
|
15
21
|
self.whitelisted_ransackable_attributes = ['presentation']
|
16
22
|
|
23
|
+
def uniq_values(product_properties_scope: nil)
|
24
|
+
with_uniq_values_cache_key(product_properties_scope) do
|
25
|
+
properties = product_properties
|
26
|
+
properties = properties.where(id: product_properties_scope) if product_properties_scope.present?
|
27
|
+
properties.where.not(value: [nil, '']).pluck(:filter_param, :value).uniq
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
17
31
|
private
|
18
32
|
|
19
33
|
def touch_all_products
|
20
34
|
products.update_all(updated_at: Time.current)
|
21
35
|
end
|
36
|
+
|
37
|
+
def with_uniq_values_cache_key(product_properties_scope, &block)
|
38
|
+
return block.call if product_properties_scope.present?
|
39
|
+
|
40
|
+
uniq_values_cache_key = ['property-uniq-values', cache_key_with_version]
|
41
|
+
Rails.cache.fetch(uniq_values_cache_key) { block.call }
|
42
|
+
end
|
43
|
+
|
44
|
+
def ensure_product_properties_have_filter_params
|
45
|
+
return unless filterable?
|
46
|
+
|
47
|
+
product_properties.where(filter_param: [nil, '']).where.not(value: [nil, '']).find_each(&:save)
|
48
|
+
end
|
22
49
|
end
|
23
50
|
end
|
@@ -139,7 +139,9 @@ module Spree
|
|
139
139
|
end
|
140
140
|
|
141
141
|
def send_reimbursement_email
|
142
|
-
|
142
|
+
# you can overwrite this method in your application / extension to send out the confirmation email
|
143
|
+
# or use `spree_emails` gem
|
144
|
+
# YourEmailVendor.deliver_reimbursement_email(id) # `id` = ID of the Reimbursement being sent, you can also pass the entire object using `self`
|
143
145
|
end
|
144
146
|
|
145
147
|
# If there are multiple different reimbursement types for a single
|
@@ -51,7 +51,8 @@ module Spree
|
|
51
51
|
category: category,
|
52
52
|
created_by: Spree::StoreCredit.default_created_by,
|
53
53
|
memo: "Refund for uncreditable payments on order #{reimbursement.order.number}",
|
54
|
-
currency: reimbursement.order.currency
|
54
|
+
currency: reimbursement.order.currency,
|
55
|
+
store: reimbursement.order.store
|
55
56
|
}
|
56
57
|
end
|
57
58
|
|
@@ -25,10 +25,12 @@ module Spree
|
|
25
25
|
send_shipped_email
|
26
26
|
end
|
27
27
|
|
28
|
-
|
28
|
+
protected
|
29
29
|
|
30
30
|
def send_shipped_email
|
31
|
-
|
31
|
+
# you can overwrite this method in your application / extension to send out the confirmation email
|
32
|
+
# or use `spree_emails` gem
|
33
|
+
# YourEmailVendor.deliver_shipment_notification_email(@shipment.id)
|
32
34
|
end
|
33
35
|
|
34
36
|
def update_order_shipment_state
|
@@ -9,15 +9,15 @@ module Spree
|
|
9
9
|
end
|
10
10
|
|
11
11
|
def total_on_hand
|
12
|
-
if variant.should_track_inventory?
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
12
|
+
@total_on_hand ||= if variant.should_track_inventory?
|
13
|
+
stock_items.sum(:count_on_hand)
|
14
|
+
else
|
15
|
+
Float::INFINITY
|
16
|
+
end
|
17
17
|
end
|
18
18
|
|
19
19
|
def backorderable?
|
20
|
-
stock_items.any?(&:backorderable)
|
20
|
+
@backorderable ||= stock_items.any?(&:backorderable)
|
21
21
|
end
|
22
22
|
|
23
23
|
def can_supply?(required = 1)
|
data/app/models/spree/store.rb
CHANGED
@@ -1,7 +1,41 @@
|
|
1
1
|
module Spree
|
2
2
|
class Store < Spree::Base
|
3
|
+
MAILER_LOGO_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/jpeg'].freeze
|
4
|
+
FAVICON_CONTENT_TYPES = ['image/png', 'image/x-icon', 'image/vnd.microsoft.icon'].freeze
|
5
|
+
|
3
6
|
has_many :orders, class_name: 'Spree::Order'
|
4
|
-
has_many :
|
7
|
+
has_many :line_items, through: :orders, class_name: 'Spree::LineItem'
|
8
|
+
has_many :shipments, through: :orders, class_name: 'Spree::Shipment'
|
9
|
+
has_many :payments, through: :orders, class_name: 'Spree::Payment'
|
10
|
+
has_many :return_authorizations, through: :orders, class_name: 'Spree::ReturnAuthorization'
|
11
|
+
# has_many :reimbursements, through: :orders, class_name: 'Spree::Reimbursement' FIXME: we should fetch this via Customer Return
|
12
|
+
|
13
|
+
has_many :store_payment_methods, class_name: 'Spree::StorePaymentMethod'
|
14
|
+
has_many :payment_methods, through: :store_payment_methods, class_name: 'Spree::PaymentMethod'
|
15
|
+
|
16
|
+
has_many :cms_pages, class_name: 'Spree::CmsPage'
|
17
|
+
has_many :cms_sections, through: :cms_pages, class_name: 'Spree::CmsSection'
|
18
|
+
|
19
|
+
has_many :menus, class_name: 'Spree::Menu'
|
20
|
+
has_many :menu_items, through: :menus, class_name: 'Spree::MenuItem'
|
21
|
+
|
22
|
+
has_many :store_products, class_name: 'Spree::StoreProduct', dependent: :destroy
|
23
|
+
has_many :products, through: :store_products, class_name: 'Spree::Product'
|
24
|
+
has_many :product_properties, through: :products, class_name: 'Spree::ProductProperty'
|
25
|
+
has_many :variants, through: :products, class_name: 'Spree::Variant', source: :variants_including_master
|
26
|
+
has_many :stock_items, through: :variants, class_name: 'Spree::StockItem'
|
27
|
+
has_many :inventory_units, through: :variants, class_name: 'Spree::InventoryUnit'
|
28
|
+
has_many :customer_returns, class_name: 'Spree::CustomerReturn', inverse_of: :store
|
29
|
+
|
30
|
+
has_many :store_credits, class_name: 'Spree::StoreCredit'
|
31
|
+
has_many :store_credit_events, through: :store_credits, class_name: 'Spree::StoreCreditEvent'
|
32
|
+
|
33
|
+
has_many :taxonomies, class_name: 'Spree::Taxonomy'
|
34
|
+
has_many :taxons, through: :taxonomies, class_name: 'Spree::Taxon'
|
35
|
+
|
36
|
+
has_many :store_promotions, class_name: 'Spree::StorePromotion'
|
37
|
+
has_many :promotions, through: :store_promotions, class_name: 'Spree::Promotion'
|
38
|
+
|
5
39
|
belongs_to :default_country, class_name: 'Spree::Country'
|
6
40
|
belongs_to :checkout_zone, class_name: 'Spree::Zone'
|
7
41
|
|
@@ -18,13 +52,20 @@ module Spree
|
|
18
52
|
validates :new_order_notifications_email, email: { allow_blank: true }
|
19
53
|
end
|
20
54
|
|
55
|
+
default_scope { order(created_at: :asc) }
|
56
|
+
|
21
57
|
has_one_attached :logo
|
22
58
|
has_one_attached :mailer_logo
|
59
|
+
has_one_attached :favicon_image
|
23
60
|
|
24
|
-
validates :mailer_logo, content_type:
|
61
|
+
validates :mailer_logo, content_type: MAILER_LOGO_CONTENT_TYPES
|
62
|
+
validates :favicon_image, content_type: FAVICON_CONTENT_TYPES,
|
63
|
+
dimension: { max: 256..256 },
|
64
|
+
aspect_ratio: :square,
|
65
|
+
size: { less_than_or_equal_to: 1.megabyte }
|
25
66
|
|
26
67
|
before_save :ensure_default_exists_and_is_unique
|
27
|
-
before_save :ensure_supported_currencies, :ensure_supported_locales
|
68
|
+
before_save :ensure_supported_currencies, :ensure_supported_locales, :ensure_default_country
|
28
69
|
before_destroy :validate_not_default
|
29
70
|
|
30
71
|
scope :by_url, ->(url) { where('url like ?', "%#{url}%") }
|
@@ -33,9 +74,12 @@ module Spree
|
|
33
74
|
|
34
75
|
alias_attribute :contact_email, :customer_support_email
|
35
76
|
|
36
|
-
def self.current(
|
37
|
-
|
38
|
-
|
77
|
+
def self.current(url = nil)
|
78
|
+
ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
|
79
|
+
`Spree::Store.current` is deprecated and will be removed in Spree 5
|
80
|
+
Spree::Stores::FindCurrent.new(url: "http://example.com") instead
|
81
|
+
DEPRECATION
|
82
|
+
Stores::FindCurrent.new(url: url).execute
|
39
83
|
end
|
40
84
|
|
41
85
|
def self.default
|
@@ -50,12 +94,34 @@ module Spree
|
|
50
94
|
end
|
51
95
|
end
|
52
96
|
|
97
|
+
def default_menu(location)
|
98
|
+
menu = menus.find_by(location: location, locale: default_locale) || menus.find_by(location: location)
|
99
|
+
|
100
|
+
menu.root if menu.present?
|
101
|
+
end
|
102
|
+
|
53
103
|
def supported_currencies_list
|
54
104
|
@supported_currencies_list ||= (read_attribute(:supported_currencies).to_s.split(',') << default_currency).sort.map(&:to_s).map do |code|
|
55
105
|
::Money::Currency.find(code.strip)
|
56
106
|
end.uniq.compact
|
57
107
|
end
|
58
108
|
|
109
|
+
def homepage(requested_locale)
|
110
|
+
cms_pages.by_locale(requested_locale).find_by(type: 'Spree::Cms::Pages::Homepage') ||
|
111
|
+
cms_pages.by_locale(default_locale).find_by(type: 'Spree::Cms::Pages::Homepage') ||
|
112
|
+
cms_pages.find_by(type: 'Spree::Cms::Pages::Homepage')
|
113
|
+
end
|
114
|
+
|
115
|
+
def seo_meta_description
|
116
|
+
if meta_description.present?
|
117
|
+
meta_description
|
118
|
+
elsif seo_title.present?
|
119
|
+
seo_title
|
120
|
+
else
|
121
|
+
name
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
59
125
|
def supported_locales_list
|
60
126
|
# TODO: add support of multiple supported languages to a single Store
|
61
127
|
@supported_locales_list ||= (read_attribute(:supported_locales).to_s.split(',') << default_locale).compact.uniq.sort
|
@@ -71,7 +137,7 @@ module Spree
|
|
71
137
|
@formatted_url ||= if url.match(/http:\/\/|https:\/\//)
|
72
138
|
url
|
73
139
|
else
|
74
|
-
Rails.env.development? ? "http://#{url}" : "https://#{url}"
|
140
|
+
Rails.env.development? || Rails.env.test? ? "http://#{url}" : "https://#{url}"
|
75
141
|
end
|
76
142
|
end
|
77
143
|
|
@@ -87,6 +153,12 @@ module Spree
|
|
87
153
|
@checkout_zone_or_default ||= checkout_zone || Spree::Zone.default_checkout_zone
|
88
154
|
end
|
89
155
|
|
156
|
+
def favicon
|
157
|
+
return unless favicon_image.attached?
|
158
|
+
|
159
|
+
favicon_image.variant(resize: '32x32')
|
160
|
+
end
|
161
|
+
|
90
162
|
private
|
91
163
|
|
92
164
|
def ensure_default_exists_and_is_unique
|
@@ -124,5 +196,16 @@ module Spree
|
|
124
196
|
Rails.cache.delete('default_store')
|
125
197
|
Rails.cache.delete('stores_available_locales')
|
126
198
|
end
|
199
|
+
|
200
|
+
def ensure_default_country
|
201
|
+
return unless has_attribute?(:default_country_id)
|
202
|
+
return if default_country.present? && (checkout_zone.blank? || checkout_zone.country_list.blank? || checkout_zone.country_list.include?(default_country))
|
203
|
+
|
204
|
+
self.default_country = if checkout_zone.present? && checkout_zone.country_list.any?
|
205
|
+
checkout_zone.country_list.first
|
206
|
+
else
|
207
|
+
Country.find_by(iso: 'US') || Country.first
|
208
|
+
end
|
209
|
+
end
|
127
210
|
end
|
128
211
|
end
|