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
@@ -0,0 +1,66 @@
|
|
1
|
+
module Spree
|
2
|
+
class CmsPage < Base
|
3
|
+
include SingleStoreResource
|
4
|
+
include DisplayLink
|
5
|
+
|
6
|
+
acts_as_paranoid
|
7
|
+
|
8
|
+
TYPES = ['Spree::Cms::Pages::StandardPage',
|
9
|
+
'Spree::Cms::Pages::FeaturePage',
|
10
|
+
'Spree::Cms::Pages::Homepage']
|
11
|
+
|
12
|
+
belongs_to :store, touch: true
|
13
|
+
|
14
|
+
has_many :cms_sections, class_name: 'Spree::CmsSection'
|
15
|
+
has_many :menu_items, as: :linked_resource
|
16
|
+
|
17
|
+
before_validation :handle_slug
|
18
|
+
|
19
|
+
validates :title, :store, :locale, presence: true
|
20
|
+
validates :slug, uniqueness: { scope: :store_id, allow_nil: true, case_sensitive: true }
|
21
|
+
validates :locale, uniqueness: { scope: [:store, :type] }, if: :homepage?
|
22
|
+
|
23
|
+
scope :visible, -> { where(visible: true) }
|
24
|
+
scope :by_locale, ->(locale) { where(locale: locale) }
|
25
|
+
scope :by_slug, ->(slug) { where(slug: slug) }
|
26
|
+
|
27
|
+
scope :home, -> { where(type: 'Spree::Cms::Pages::Homepage') }
|
28
|
+
scope :standard, -> { where(type: 'Spree::Cms::Pages::StandardPage') }
|
29
|
+
scope :feature, -> { where(type: 'Spree::Cms::Pages::FeaturePage') }
|
30
|
+
|
31
|
+
self.whitelisted_ransackable_attributes = %w[title type locale store_id]
|
32
|
+
|
33
|
+
def seo_title
|
34
|
+
if meta_title.present?
|
35
|
+
meta_title
|
36
|
+
else
|
37
|
+
title
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
# Overide this if your page type uses cms_sections
|
42
|
+
def sections?
|
43
|
+
false
|
44
|
+
end
|
45
|
+
|
46
|
+
def homepage?
|
47
|
+
type == 'Spree::Cms::Pages::Homepage'
|
48
|
+
end
|
49
|
+
|
50
|
+
def draft_mode?
|
51
|
+
!visible
|
52
|
+
end
|
53
|
+
|
54
|
+
private
|
55
|
+
|
56
|
+
def handle_slug
|
57
|
+
self.slug = if homepage?
|
58
|
+
nil
|
59
|
+
elsif slug.blank?
|
60
|
+
title&.downcase&.to_url
|
61
|
+
else
|
62
|
+
slug&.downcase&.to_url
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
@@ -0,0 +1,57 @@
|
|
1
|
+
module Spree
|
2
|
+
class CmsSection < Base
|
3
|
+
include DisplayLink
|
4
|
+
|
5
|
+
acts_as_list scope: :cms_page
|
6
|
+
belongs_to :cms_page, touch: true
|
7
|
+
|
8
|
+
IMAGE_COUNT = ['one', 'two', 'three']
|
9
|
+
IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
|
10
|
+
IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
|
11
|
+
|
12
|
+
IMAGE_COUNT.each do |count|
|
13
|
+
send(:has_one_attached, "image_#{count}".to_sym)
|
14
|
+
|
15
|
+
IMAGE_SIZE.each do |size|
|
16
|
+
define_method("img_#{count}_#{size}") do |dimensions = nil|
|
17
|
+
return if !send("image_#{count}").attached? || dimensions.nil?
|
18
|
+
|
19
|
+
send("image_#{count}").variant(resize: dimensions)
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
belongs_to :linked_resource, polymorphic: true
|
25
|
+
|
26
|
+
default_scope { order(position: :asc) }
|
27
|
+
|
28
|
+
validates :name, :cms_page, presence: true
|
29
|
+
|
30
|
+
validates :image_one, :image_two, :image_three, content_type: IMAGE_TYPES
|
31
|
+
|
32
|
+
LINKED_RESOURCE_TYPE = []
|
33
|
+
|
34
|
+
TYPES = ['Spree::Cms::Sections::HeroImage',
|
35
|
+
'Spree::Cms::Sections::FeaturedArticle',
|
36
|
+
'Spree::Cms::Sections::ProductCarousel',
|
37
|
+
'Spree::Cms::Sections::ImageGallery',
|
38
|
+
'Spree::Cms::Sections::SideBySideImages',
|
39
|
+
'Spree::Cms::Sections::RichTextContent']
|
40
|
+
|
41
|
+
def boundaries
|
42
|
+
['Container', 'Screen']
|
43
|
+
end
|
44
|
+
|
45
|
+
def css_classes
|
46
|
+
['row', 'section-row'].compact
|
47
|
+
end
|
48
|
+
|
49
|
+
def gutters_sizes
|
50
|
+
['Gutters', 'No Gutters']
|
51
|
+
end
|
52
|
+
|
53
|
+
def fullscreen?
|
54
|
+
fit == 'Screen'
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
data/app/models/spree/country.rb
CHANGED
@@ -5,19 +5,26 @@ module Spree
|
|
5
5
|
before_destroy :ensure_not_default
|
6
6
|
|
7
7
|
has_many :addresses, dependent: :restrict_with_error
|
8
|
-
has_many :states,
|
8
|
+
has_many :states,
|
9
|
+
-> { order name: :asc },
|
10
|
+
inverse_of: :country,
|
11
|
+
dependent: :destroy
|
9
12
|
has_many :zone_members,
|
10
13
|
-> { where(zoneable_type: 'Spree::Country') },
|
11
14
|
class_name: 'Spree::ZoneMember',
|
12
15
|
dependent: :destroy,
|
13
16
|
foreign_key: :zoneable_id
|
14
|
-
|
15
17
|
has_many :zones, through: :zone_members, class_name: 'Spree::Zone'
|
16
18
|
|
17
19
|
validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false }
|
18
20
|
|
19
|
-
def self.default
|
20
|
-
|
21
|
+
def self.default(store = nil)
|
22
|
+
ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
|
23
|
+
`Country#default` is deprecated and will be removed in Spree 5.0.
|
24
|
+
Please use `current_store.default_country` instead
|
25
|
+
DEPRECATION
|
26
|
+
store ||= Spree::Store.default
|
27
|
+
country_id = store.default_country_id
|
21
28
|
default = find_by(id: country_id) if country_id.present?
|
22
29
|
default || find_by(iso: 'US') || first
|
23
30
|
end
|
@@ -26,8 +33,9 @@ module Spree
|
|
26
33
|
where(['LOWER(iso) = ?', iso.downcase]).or(where(['LOWER(iso3) = ?', iso.downcase])).take
|
27
34
|
end
|
28
35
|
|
29
|
-
def default?
|
30
|
-
|
36
|
+
def default?(store = nil)
|
37
|
+
store ||= Spree::Store.default
|
38
|
+
self == store.default_country
|
31
39
|
end
|
32
40
|
|
33
41
|
def <=>(other)
|
@@ -2,14 +2,7 @@ module Spree
|
|
2
2
|
class CreditCard < Spree::Base
|
3
3
|
include ActiveMerchant::Billing::CreditCardMethods
|
4
4
|
|
5
|
-
|
6
|
-
# we need to ensure that we have a connection to the DB and that the `deleted_at` column exists
|
7
|
-
if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
|
8
|
-
connected? &&
|
9
|
-
table_exists? &&
|
10
|
-
connection.column_exists?(:spree_credit_cards, :deleted_at)
|
11
|
-
acts_as_paranoid
|
12
|
-
end
|
5
|
+
acts_as_paranoid
|
13
6
|
|
14
7
|
belongs_to :payment_method
|
15
8
|
belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id',
|
@@ -42,6 +35,7 @@ module Spree
|
|
42
35
|
or(where('CAST(spree_credit_cards.year AS DECIMAL) = ?', Time.current.year).
|
43
36
|
where('CAST(spree_credit_cards.month AS DECIMAL) >= ?', Time.current.month))
|
44
37
|
}
|
38
|
+
scope :not_removed, -> { where(deleted_at: nil) }
|
45
39
|
|
46
40
|
# needed for some of the ActiveMerchant gateways (eg. SagePay)
|
47
41
|
alias_attribute :brand, :cc_type
|
@@ -2,6 +2,7 @@ module Spree
|
|
2
2
|
class CustomerReturn < Spree::Base
|
3
3
|
include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
|
4
4
|
belongs_to :stock_location
|
5
|
+
belongs_to :store, class_name: 'Spree::Store', inverse_of: :customer_returns
|
5
6
|
|
6
7
|
has_many :reimbursements, inverse_of: :customer_return
|
7
8
|
has_many :return_items, inverse_of: :customer_return
|
@@ -9,6 +10,7 @@ module Spree
|
|
9
10
|
|
10
11
|
after_create :process_return!
|
11
12
|
|
13
|
+
validates :store, presence: true
|
12
14
|
validates :number, uniqueness: { case_sensitive: true }
|
13
15
|
validates :return_items, :stock_location, presence: true
|
14
16
|
validate :must_have_return_authorization, on: :create
|
@@ -17,7 +19,7 @@ module Spree
|
|
17
19
|
accepts_nested_attributes_for :return_items
|
18
20
|
|
19
21
|
extend DisplayMoney
|
20
|
-
money_methods pre_tax_total
|
22
|
+
money_methods :pre_tax_total
|
21
23
|
|
22
24
|
self.whitelisted_ransackable_attributes = ['number']
|
23
25
|
|
@@ -31,6 +33,10 @@ module Spree
|
|
31
33
|
completely_decided? && return_items.accepted.includes(:reimbursement).all? { |return_item| return_item.reimbursement.try(:reimbursed?) }
|
32
34
|
end
|
33
35
|
|
36
|
+
def currency
|
37
|
+
order&.currency
|
38
|
+
end
|
39
|
+
|
34
40
|
# Temporarily tie a customer_return to one order
|
35
41
|
def order
|
36
42
|
return nil if return_items.blank?
|
@@ -49,7 +55,7 @@ module Spree
|
|
49
55
|
end
|
50
56
|
|
51
57
|
def must_have_return_authorization
|
52
|
-
if item = return_items.find { |ri| ri.return_authorization.blank? }
|
58
|
+
if (item = return_items.find { |ri| ri.return_authorization.blank? })
|
53
59
|
errors.add(:base, Spree.t(:missing_return_authorization, item_name: item.inventory_unit.variant.name))
|
54
60
|
end
|
55
61
|
end
|
@@ -4,7 +4,7 @@ module Spree
|
|
4
4
|
belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
|
5
5
|
belongs_to :order, class_name: 'Spree::Order'
|
6
6
|
belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true
|
7
|
-
has_many :return_items, inverse_of: :inventory_unit
|
7
|
+
has_many :return_items, class_name: 'Spree::ReturnItem', inverse_of: :inventory_unit
|
8
8
|
has_many :return_authorizations, class_name: 'Spree::ReturnAuthorization', through: :return_items
|
9
9
|
belongs_to :line_item, class_name: 'Spree::LineItem'
|
10
10
|
end
|
@@ -39,7 +39,7 @@ module Spree
|
|
39
39
|
|
40
40
|
after_create :update_tax_charge
|
41
41
|
|
42
|
-
delegate :name, :description, :sku, :should_track_inventory?, :product, :options_text, :slug, to: :variant
|
42
|
+
delegate :name, :description, :sku, :should_track_inventory?, :product, :options_text, :slug, :product_id, to: :variant
|
43
43
|
delegate :brand, :category, to: :product
|
44
44
|
delegate :tax_zone, to: :order
|
45
45
|
|
@@ -0,0 +1,63 @@
|
|
1
|
+
module Spree
|
2
|
+
class Menu < Spree::Base
|
3
|
+
include SingleStoreResource
|
4
|
+
|
5
|
+
MENU_LOCATIONS = ['Header', 'Footer']
|
6
|
+
MENU_LOCATIONS_PARAMETERIZED = []
|
7
|
+
|
8
|
+
MENU_LOCATIONS.each do |location|
|
9
|
+
parameterize_location = location.parameterize(separator: '_')
|
10
|
+
MENU_LOCATIONS_PARAMETERIZED << parameterize_location
|
11
|
+
end
|
12
|
+
|
13
|
+
has_many :menu_items, dependent: :destroy, class_name: 'Spree::MenuItem'
|
14
|
+
belongs_to :store, touch: true, class_name: 'Spree::Store'
|
15
|
+
|
16
|
+
before_validation :parameterize_location
|
17
|
+
after_create :set_root
|
18
|
+
after_save :update_root_name
|
19
|
+
after_touch :touch_store
|
20
|
+
|
21
|
+
validates :name, :store, :locale, presence: true
|
22
|
+
validates :location, uniqueness: { scope: [:store, :locale] }
|
23
|
+
validates :location, inclusion: { in: MENU_LOCATIONS_PARAMETERIZED }
|
24
|
+
|
25
|
+
has_one :root, -> { where(parent_id: nil) }, class_name: 'Spree::MenuItem', dependent: :destroy
|
26
|
+
|
27
|
+
default_scope { order(created_at: :asc) }
|
28
|
+
|
29
|
+
scope :by_locale, ->(locale) { where(locale: locale) }
|
30
|
+
|
31
|
+
self.whitelisted_ransackable_attributes = %w[name location locale store_id]
|
32
|
+
|
33
|
+
MENU_LOCATIONS_PARAMETERIZED.each do |location_name|
|
34
|
+
define_singleton_method("for_#{location_name}") do |locale|
|
35
|
+
menu = find_by(location: location_name, locale: locale.to_s)
|
36
|
+
|
37
|
+
menu.root if menu.present?
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
private
|
42
|
+
|
43
|
+
def parameterize_location
|
44
|
+
return unless location.present?
|
45
|
+
|
46
|
+
self.location = location.parameterize(separator: '_')
|
47
|
+
end
|
48
|
+
|
49
|
+
def set_root
|
50
|
+
self.root ||= menu_items.create!(name: name, item_type: 'Container')
|
51
|
+
end
|
52
|
+
|
53
|
+
def update_root_name
|
54
|
+
return unless saved_change_to_name?
|
55
|
+
|
56
|
+
root.update(name: name)
|
57
|
+
end
|
58
|
+
|
59
|
+
def touch_store
|
60
|
+
store.touch
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
@@ -0,0 +1,76 @@
|
|
1
|
+
module Spree
|
2
|
+
class MenuItem < Spree::Base
|
3
|
+
include Spree::DisplayLink
|
4
|
+
|
5
|
+
acts_as_nested_set dependent: :destroy
|
6
|
+
|
7
|
+
belongs_to :menu, touch: true
|
8
|
+
belongs_to :linked_resource, polymorphic: true
|
9
|
+
|
10
|
+
before_create :ensure_item_belongs_to_root
|
11
|
+
before_update :reset_link_attributes
|
12
|
+
before_save :paremeterize_code
|
13
|
+
|
14
|
+
after_save :touch_ancestors_and_menu
|
15
|
+
after_touch :touch_ancestors_and_menu
|
16
|
+
|
17
|
+
ITEM_TYPE = %w[Link Container]
|
18
|
+
|
19
|
+
LINKED_RESOURCE_TYPE = ['URL']
|
20
|
+
STATIC_RESOURCE_TYPE = ['Home Page']
|
21
|
+
DYNAMIC_RESOURCE_TYPE = ['Spree::Product', 'Spree::Taxon', 'Spree::CmsPage']
|
22
|
+
|
23
|
+
LINKED_RESOURCE_TYPE.unshift(*STATIC_RESOURCE_TYPE)
|
24
|
+
LINKED_RESOURCE_TYPE.push(*DYNAMIC_RESOURCE_TYPE)
|
25
|
+
|
26
|
+
validates :name, :menu, presence: true
|
27
|
+
validates :item_type, inclusion: { in: ITEM_TYPE }
|
28
|
+
validates :linked_resource_type, inclusion: { in: LINKED_RESOURCE_TYPE }
|
29
|
+
|
30
|
+
has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::Icon'
|
31
|
+
accepts_nested_attributes_for :icon, reject_if: :all_blank
|
32
|
+
|
33
|
+
def container?
|
34
|
+
item_type == 'Container'
|
35
|
+
end
|
36
|
+
|
37
|
+
def code?(item_code = nil)
|
38
|
+
if item_code
|
39
|
+
code == item_code
|
40
|
+
else
|
41
|
+
code.present?
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
private
|
46
|
+
|
47
|
+
def reset_link_attributes
|
48
|
+
if linked_resource_type_changed? || item_type == 'Container'
|
49
|
+
self.linked_resource_id = nil
|
50
|
+
self.destination = nil
|
51
|
+
self.new_window = false
|
52
|
+
|
53
|
+
self.linked_resource_type = 'URL' if item_type == 'Container'
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
def ensure_item_belongs_to_root
|
58
|
+
if menu.try(:root).present? && parent_id.nil?
|
59
|
+
self.parent = menu.root
|
60
|
+
|
61
|
+
store_new_parent
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
def touch_ancestors_and_menu
|
66
|
+
ancestors.update_all(updated_at: Time.current)
|
67
|
+
menu.try!(:touch)
|
68
|
+
end
|
69
|
+
|
70
|
+
def paremeterize_code
|
71
|
+
return if code.blank?
|
72
|
+
|
73
|
+
self.code = code.parameterize
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end
|
@@ -11,6 +11,17 @@ module Spree
|
|
11
11
|
validates :presentation
|
12
12
|
end
|
13
13
|
|
14
|
+
scope :filterable, lambda {
|
15
|
+
joins(:option_type).
|
16
|
+
where(OptionType.table_name => { filterable: true }).
|
17
|
+
distinct
|
18
|
+
}
|
19
|
+
|
20
|
+
scope :for_products, lambda { |products|
|
21
|
+
joins(:variants).
|
22
|
+
where(Variant.table_name => { product_id: products.map(&:id) })
|
23
|
+
}
|
24
|
+
|
14
25
|
after_touch :touch_all_variants
|
15
26
|
|
16
27
|
delegate :name, :presentation, to: :option_type, prefix: true, allow_nil: true
|