Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Expand `Store` model

Damian Legawiec796adc80a4b4
diff --git a/core/app/models/spree/stock_location.rb b/core/app/models/spree/stock_location.rb
index 61497f4f74..1ef2b8b844 100644
--- a/core/app/models/spree/stock_location.rb
+++ b/core/app/models/spree/stock_location.rb
@@ -28,7 +28,7 @@ module Spree
after_save :ensure_one_default
after_update :conditional_touch_records
- delegate :name, to: :country, prefix: true
+ delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true
def state_text
state.try(:abbr) || state.try(:name) || state_name
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 7dec5d925e..184eb2f1bd 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -78,8 +78,17 @@ module Spree
belongs_to :default_country, class_name: 'Spree::Country'
belongs_to :checkout_zone, class_name: 'Spree::Zone'
+ #
+ # ActionText
+ #
+ has_rich_text :checkout_message
+ has_rich_text :customer_terms_of_service
+ has_rich_text :customer_privacy_policy
+ has_rich_text :customer_returns_policy
+ has_rich_text :customer_shipping_policy
+
with_options presence: true do
- validates :name, :url, :mail_from_address, :default_currency, :code
+ validates :name, :url, :mail_from_address, :default_currency, :default_country, :code
end
validates :digital_asset_authorized_clicks, numericality: { only_integer: true, greater_than: 0 }
@@ -106,8 +115,10 @@ module Spree
has_one :favicon_image, class_name: 'Spree::StoreFaviconImage', dependent: :destroy, as: :viewable
accepts_nested_attributes_for :favicon_image, reject_if: :all_blank
+ before_validation :ensure_default_country
before_save :ensure_default_exists_and_is_unique
- before_save :ensure_supported_currencies, :ensure_supported_locales, :ensure_default_country
+ before_save :ensure_supported_currencies, :ensure_supported_locales
+ after_create :ensure_default_taxonomies_are_created
before_destroy :validate_not_last, unless: :skip_validate_not_last
before_destroy :pass_default_flag_to_other_store
@@ -270,5 +281,10 @@ module Spree
Country.find_by(iso: 'US') || Country.first
end
end
+
+ def ensure_default_taxonomies_are_created
+ taxonomies.find_or_create_by(name: Spree.t(:taxonomy_categories_name))
+ taxonomies.find_or_create_by(name: Spree.t(:taxonomy_brands_name))
+ end
end
end
diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rb
index c2c867704d..d7b2ee930a 100644
--- a/core/spec/models/spree/store_spec.rb
+++ b/core/spec/models/spree/store_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::Store, type: :model do
- describe 'associations' do
+ context 'Associations' do
subject { create(:store) }
describe '#products' do
@@ -103,36 +103,6 @@ describe Spree::Store, type: :model do
end
end
- describe '#menus' do
- let!(:menu) { create(:menu, store: subject) }
- let!(:menu_2) { create(:menu, store: create(:store)) }
-
- it { expect(subject.menus).to eq([menu]) }
-
- describe '#menu_items' do
- let!(:menu_item) { menu.menu_items.first }
- let!(:menu_item_2) { menu_2.menu_items.first }
-
- it { expect(subject.menu_items).to eq([menu_item]) }
- end
- end
-
- describe '#taxonomies' do
- let!(:taxonomy) { create(:taxonomy, store: subject) }
- let!(:taxonomy_2) { create(:taxonomy, store: create(:store)) }
-
- it { expect(subject.taxonomies).to eq([taxonomy]) }
-
- describe '#taxons' do
- let!(:taxon) { create(:taxon, taxonomy: taxonomy) }
- let!(:taxon_2) { create(:taxon, taxonomy: taxonomy_2) }
-
- it { expect(taxon).not_to be_nil }
- it { expect(taxon_2).not_to be_nil }
- it { expect(subject.taxons).to match_array([taxonomy.root, taxon]) }
- end
- end
-
describe '#promotions' do
let!(:promotion) { create(:promotion, stores: [subject, create(:store)]) }
let!(:promotion_2) { create(:promotion, stores: [create(:store)]) }
@@ -141,7 +111,19 @@ describe Spree::Store, type: :model do
end
end
- describe 'validations' do
+ context 'Callbacks' do
+ describe '#ensure_default_taxonomies_are_created' do
+ let(:store) { build(:store) }
+
+ it 'creates default taxonomies' do
+ expect { store.save! }.to change(Spree::Taxonomy, :count).by(2)
+ expect(store.taxonomies.count).to eq(2)
+ expect(store.taxonomies.pluck(:name)).to include(Spree.t(:taxonomy_categories_name), Spree.t(:taxonomy_brands_name))
+ end
+ end
+ end
+
+ context 'Validations' do
describe 'code uniqueness' do
context 'selected code was already used in a deleted store' do
let(:store_code) { 'store_code' }
@@ -160,7 +142,7 @@ describe Spree::Store, type: :model do
end
end
- describe 'translations' do
+ context 'Translations' do
let!(:store) { create(:store, name: 'Store EN') }
before do