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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Add functionalities for admin dashboard: nested attributes for store, name and provider columns.
wjwitekd82fcff96804
diff --git a/api/app/controllers/spree/api/v2/data_feeds/google_controller.rb b/api/app/controllers/spree/api/v2/data_feeds/google_controller.rbindex 0ddb072c02..c14713c046 100644--- a/api/app/controllers/spree/api/v2/data_feeds/google_controller.rb+++ b/api/app/controllers/spree/api/v2/data_feeds/google_controller.rb@@ -10,7 +10,7 @@ module Spreeprivatedef settings- @settings ||= Spree::DataFeedSetting.find_by!(spree_store_id: current_store, uuid: params[:unique_url], enabled: true)+ @settings ||= Spree::DataFeedSetting.find_by!(spree_store_id: current_store, uuid: params[:unique_url], provider: 'google', enabled: true)enddef data_feeds_google_rss_servicediff --git a/core/app/models/spree/data_feed_setting.rb b/core/app/models/spree/data_feed_setting.rbindex 89d5330d40..fabec42b04 100644--- a/core/app/models/spree/data_feed_setting.rb+++ b/core/app/models/spree/data_feed_setting.rb@@ -6,9 +6,17 @@ module Spreewith_options presence: true dovalidates :store+ validates :name, uniqueness: true+ validates :providervalidates :uuid, uniqueness: true, on: :updateend+ def formatted_url+ "#{store.formatted_url}/api/v2/data_feeds/#{provider}/#{uuid}.rss"+ end++ private+def generate_uuidwrite_attribute(:uuid, SecureRandom.uuid)enddiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex 76d13541c3..0e834e0879 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -55,6 +55,9 @@ module Spreehas_many :wishlists, class_name: 'Spree::Wishlist'+ has_many :data_feed_settings, class_name: 'Spree::DataFeedSetting', foreign_key: 'spree_store_id'+ accepts_nested_attributes_for :data_feed_settings, update_only: true+belongs_to :default_country, class_name: 'Spree::Country'belongs_to :checkout_zone, class_name: 'Spree::Zone'diff --git a/core/app/services/spree/data_feeds/google/products_list.rb b/core/app/services/spree/data_feeds/google/products_list.rbindex 56dd7d1c74..0279c240ce 100644--- a/core/app/services/spree/data_feeds/google/products_list.rb+++ b/core/app/services/spree/data_feeds/google/products_list.rb@@ -6,10 +6,9 @@ module Spreedef call(store)products = store.products.active- return success(products: products)+ success(products: products)endendendendend-diff --git a/core/db/migrate/20221229132350_create_spree_data_feed_settings.rb b/core/db/migrate/20221229132350_create_spree_data_feed_settings.rbindex d1a4825177..f5d791da0a 100644--- a/core/db/migrate/20221229132350_create_spree_data_feed_settings.rb+++ b/core/db/migrate/20221229132350_create_spree_data_feed_settings.rb@@ -3,6 +3,8 @@ class CreateSpreeDataFeedSettings < ActiveRecord::Migration[6.0]create_table :spree_data_feed_settings do |t|t.references :spree_store+ t.string :name+ t.string :providert.string :uuid, unique: truet.boolean :enabled, default: truediff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rbindex 330fe762e0..0a3e5a90a0 100644--- a/core/lib/spree/permitted_attributes.rb+++ b/core/lib/spree/permitted_attributes.rb@@ -134,7 +134,8 @@ module Spree:new_order_notifications_email, :checkout_zone_id, :seo_robots,:digital_asset_authorized_clicks, :digital_asset_authorized_days,:limit_digital_download_count, :limit_digital_download_days, :digital_asset_link_expire_time,- { mailer_logo_attributes: {}, favicon_image_attributes: {}, logo_attributes: {} }]+ { mailer_logo_attributes: {}, favicon_image_attributes: {}, logo_attributes: {} },+ { data_feed_settings_attributes: [:enabled, :id] }]@@store_credit_attributes = %i[amount currency category_id memo]diff --git a/core/lib/spree/testing_support/factories/data_feed_setting_factory.rb b/core/lib/spree/testing_support/factories/data_feed_setting_factory.rbindex a0675d74d3..ab965c207c 100644--- a/core/lib/spree/testing_support/factories/data_feed_setting_factory.rb+++ b/core/lib/spree/testing_support/factories/data_feed_setting_factory.rb@@ -3,5 +3,7 @@ FactoryBot.define doid { 1 }enabled { true }store { create(:store) }+ provider { 'google' }+ name { 'test' }endenddiff --git a/sample/db/samples/data_feed_settings.rb b/sample/db/samples/data_feed_settings.rbindex 6e223ca0c0..1e0c1ab1b6 100644--- a/sample/db/samples/data_feed_settings.rb+++ b/sample/db/samples/data_feed_settings.rb@@ -1,5 +1,7 @@# settings for default storeSpree::DataFeedSetting.create!(- store: Spree::Store.default+ store: Spree::Store.default,+ name: 'Default Google Data Feed',+ provider: 'google')