spree_core 5.0.4 → 5.1.0.beta2

data/lib/spree/permitted_attributes.rb

@@ -2,38 +2,66 @@ module Spree
   module PermittedAttributes
     ATTRIBUTES = [
       :address_attributes,
+      :asset_attributes,
       :checkout_attributes,
       :classification_attributes,
       :cms_page_attributes,
       :cms_section_attributes,
+      :custom_domain_attributes,
       :customer_return_attributes,
       :digital_attributes,
       :digital_link_attributes,
+      :export_attributes,
       :image_attributes,
+      :integration_attributes,
       :inventory_unit_attributes,
+      :invitation_attributes,
       :line_item_attributes,
       :menu_attributes,
       :menu_item_attributes,
       :option_type_attributes,
       :option_value_attributes,
+      :page_attributes,
+      :page_block_attributes,
+      :page_link_attributes,
+      :page_section_attributes,
       :payment_attributes,
+      :payment_method_attributes,
       :product_attributes,
+      :promotion_attributes,
+      :promotion_rule_attributes,
+      :promotion_action_attributes,
       :product_properties_attributes,
       :property_attributes,
+      :refund_attributes,
+      :refund_reason_attributes,
+      :reimbursement_attributes,
+      :reimbursement_type_attributes,
+      :report_attributes,
       :return_authorization_attributes,
+      :return_authorization_reason_attributes,
+      :role_attributes,
       :shipment_attributes,
+      :shipping_method_attributes,
+      :shipping_category_attributes,
       :source_attributes,
       :stock_item_attributes,
       :stock_location_attributes,
       :stock_movement_attributes,
+      :stock_transfer_attributes,
       :store_attributes,
       :store_credit_attributes,
+      :store_credit_category_attributes,
+      :tax_rate_attributes,
+      :tax_category_attributes,
       :taxon_attributes,
       :taxonomy_attributes,
+      :theme_attributes,
       :user_attributes,
       :variant_attributes,
       :wishlist_attributes,
-      :wished_item_attributes
+      :wished_item_attributes,
+      :zone_attributes
     ]
 
     mattr_reader(*ATTRIBUTES)
@@ -47,6 +75,8 @@ module Spree
         state: [:name, :abbr] }
     ]
 
+    @@asset_attributes = [:type, :viewable_id, :viewable_type, :attachment, :alt, :position]
+
     @@checkout_attributes = [
       :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,
       :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account
@@ -60,6 +90,8 @@ module Spree
 
     @@cms_section_attributes = [:name, :cms_page_id, :fit, :destination, { content: {}, settings: {} }]
 
+    @@custom_domain_attributes = [:url, :default]
+
     @@customer_return_attributes = [:stock_location_id, {
       return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
                                 :acceptance_status, :exchange_variant_id, :resellable]
@@ -69,24 +101,41 @@ module Spree
 
     @@digital_link_attributes = [:access_counter]
 
+    @@export_attributes = [:type, :format, :record_selection, search_params: {}]
+
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
+    @@integration_attributes = [:type, :active]
+
     @@inventory_unit_attributes = [:shipment, :shipment_id, :variant_id]
 
+    @@invitation_attributes = [:email, :expires_at, :role_id]
+
     @@line_item_attributes = [:id, :variant_id, :quantity]
 
     @@menu_attributes = [:name, :locale, :location]
 
-    @@menu_item_attributes = [:name, :subtite, :destination, :new_window, :item_type,
+    @@menu_item_attributes = [:name, :subtitle, :destination, :new_window, :item_type,
                               :linked_resource_type, :linked_resource_id, :code, :menu_id]
 
-    @@option_type_attributes = [:name, :presentation, :option_values_attributes]
+    @@option_type_attributes = [:name, :presentation, :position, :filterable,
+                                option_values_attributes: [:id, :name, :presentation, :position, :_destroy]]
+
+    @@option_value_attributes = [:name, :presentation, :position]
+
+    @@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
+
+    @@page_block_attributes = [:type, :name, :position]
 
-    @@option_value_attributes = [:name, :presentation]
+    @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url]
+
+    @@page_section_attributes = [:type, :name, :position, :asset]
 
     @@payment_attributes = [:amount, :payment_method_id, :payment_method]
 
-    @@product_properties_attributes = [:property_name, :value, :position]
+    @@payment_method_attributes = [:name, :type, :description, :active, :display_on, :auto_capture, :position]
+
+    @@product_properties_attributes = [:property_name, :property_id, :value, :position, :_destroy]
 
     @@product_attributes = [
       :name, :description, :available_on, :make_active_at, :discontinue_on, :permalink, :meta_description,
@@ -94,24 +143,60 @@ module Spree
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
       :cost_currency, :cost_price, :compare_at_price,
-      :slug,
+      :slug, :track_inventory, :backorderable, :barcode, :status,
+      :weight_unit, :dimensions_unit,
       {
         tag_list: [],
+        label_list: [],
         option_type_ids: [],
-        taxon_ids: []
+        taxon_ids: [],
+        store_ids: [],
+        product_option_types_attributes: [:id, :option_type_id, :position, :_destroy]
       }
     ]
 
-    @@property_attributes = [:name, :presentation, :position]
+    @@promotion_attributes = [:name, :description, :starts_at, :expires_at, :code, :usage_limit, :path, :match_policy,
+                              :advertise, :promotion_category_id, :code_prefix, :kind, :number_of_codes, :multi_codes, store_ids: []]
+
+    @@promotion_rule_attributes = [:type, :preferred_match_policy, user_ids_to_add: [], product_ids_to_add: [], taxon_ids_to_add: []]
+
+    @@promotion_action_attributes = [:type, :calculator_type, calculator_attributes: {}, promotion_action_line_items_attributes: [:id, :promotion_action_id, :variant_id, :quantity, :_destroy]]
+
+    @@property_attributes = [:name, :presentation, :position, :kind, :display_on]
+
+    @@refund_attributes = [:amount, :refund_reason_id]
+
+    @@refund_reason_attributes = [:name, :active, :mutable]
+
+    @@reimbursement_attributes = [return_items_attributes: [:id, :override_reimbursement_type_id, :pre_tax_amount, :exchange_variant_id]]
+
+    @@reimbursement_type_attributes = [:name, :type, :active, :mutable]
+
+    @@report_attributes = [:type, :date_from, :date_to, :currency]
 
     @@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes,
-                                         :return_authorization_reason_id]
+                                         :return_authorization_reason_id, {
+                                          return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
+                                            :acceptance_status, :exchange_variant_id, :resellable]
+                                        }]
+
+    @@return_authorization_reason_attributes = [:name, :active]
+
+    @@return_item_attributes = [:inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]
+
+    @@role_attributes = [:name]
 
     @@shipment_attributes = [
       :order, :special_instructions, :stock_location_id, :id,
       :tracking, :address, :inventory_units, :selected_shipping_rate_id
     ]
 
+    @@shipping_category_attributes = [:name]
+
+    @@shipping_method_attributes = [:name, :code,:tracking_url, :tax_category_id, :display_on,
+                                    :estimated_transit_business_days_min, :estimated_transit_business_days_max,
+                                    :calculator_type, :preferences, zone_ids: [], shipping_category_ids: [], calculator_attributes: {}]
+
     # month / year may be provided by some sources, or others may elect to use one field
     @@source_attributes = [
       :id, :number, :month, :year, :expiry, :verification_value,
@@ -119,7 +204,7 @@ module Spree
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data
     ]
 
-    @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
+    @@stock_item_attributes = [:variant_id, :stock_location_id, :backorderable, :count_on_hand]
 
     @@stock_location_attributes = [
       :name, :active, :address1, :address2, :city, :zipcode,
@@ -131,6 +216,9 @@ module Spree
       :quantity, :stock_item, :stock_item_id, :originator, :action
     ]
 
+    @@stock_transfer_attributes = [:source_location_id, :destination_location_id, :reference,
+                                   stock_movements_attributes: [:variant_id, :quantity, :originator_id, :stock_item_id]]
+
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
                           :meta_description, :default_currency, :mail_from_address,
                           :customer_support_email, :description, :address, :contact_phone,
@@ -148,28 +236,48 @@ module Spree
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 
+    @@store_credit_category_attributes = [:name]
+
     @@taxonomy_attributes = [:name]
 
+    @@tax_category_attributes = [:name, :tax_code,:description, :is_default]
+
+    @@tax_rate_attributes = [:name, :amount, :zone_id, :tax_category_id, :included_in_price, :show_rate_in_label, :calculator_type, calculator_attributes: {}]
+
     @@taxon_attributes = [
       :name, :parent_id, :position, :icon, :description, :permalink, :hide_from_nav,
-      :taxonomy_id, :meta_description, :meta_keywords, :meta_title, :child_index
+      :taxonomy_id, :meta_description, :meta_keywords, :meta_title, :child_index,
+      :automatic, :rules_match_policy, :sort_order,
+      :image, :square_image, :description,
+      taxon_rules_attributes: [:id, :type, :value, :match_policy, :_destroy],
     ]
 
+    @@theme_attributes = [:name, :type, :default]
+
     @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :first_name, :last_name,
                          :password_confirmation, :selected_locale, :avatar, :accepts_email_marketing, :phone,
                          { public_metadata: {}, private_metadata: {}, tag_list: [] }]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :discontinue_on, :lock_version,
-      :position, :track_inventory,
+      :position, :track_inventory, :tax_category_id,
       :product_id, :product, :option_values_attributes, :price, :compare_at_price,
       :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
       :weight_unit, :dimensions_unit,
-      { options: [:name, :value], option_value_ids: [] }
+      {
+        options: [:id, :name, :value, :position, :_destroy],
+        stock_items_attributes: [:id, :count_on_hand, :stock_location_id, :backorderable, :_destroy],
+        prices_attributes: [:id, :amount, :compare_at_amount, :currency, :_destroy],
+        price: {},
+        option_value_variants_attributes: [:id, :option_value_id, :_destroy],
+        option_value_ids: []
+      }
     ]
 
     @@wishlist_attributes = [:name, :is_default, :is_private]
 
     @@wished_item_attributes = [:variant_id, :quantity]
+
+    @@zone_attributes = [:name, :description, :default_tax, :kind, :states_country_id, country_ids: [], state_ids: []]
   end
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -6,98 +6,6 @@ module Spree
       included do
         routes { Spree::Core::Engine.routes }
       end
-
-      def spree_get(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_get is deprecated and will be removed in Spree 5.0.
-          Please use get, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'GET')
-      end
-
-      # Executes a request simulating POST HTTP method and set/volley the response
-      def spree_post(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_post is deprecated and will be removed in Spree 5.0.
-          Please use post, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'POST')
-      end
-
-      # Executes a request simulating PUT HTTP method and set/volley the response
-      def spree_put(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_put is deprecated and will be removed in Spree 5.0.
-          Please use put, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'PUT')
-      end
-
-      # # Executes a request simulating PATCH HTTP method and set/volley the response
-      def spree_patch(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_patch is deprecated and will be removed in Spree 5.0.
-          Please use patch, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'PATCH')
-      end
-
-      # Executes a request simulating DELETE HTTP method and set/volley the response
-      def spree_delete(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_delete is deprecated and will be removed in Spree 5.0.
-          Please use delete, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'DELETE')
-      end
-
-      def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 5.0.
-        DEPRECATION
-        process_spree_xhr_action(action, parameters, session, flash, :get)
-      end
-
-      def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 5.0.
-        DEPRECATION
-        process_spree_xhr_action(action, parameters, session, flash, :post)
-      end
-
-      def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 5.0.
-        DEPRECATION
-        process_spree_xhr_action(action, parameters, session, flash, :put)
-      end
-
-      def spree_xhr_patch(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 5.0.
-        DEPRECATION
-        process_spree_xhr_action(action, parameters, session, flash, :patch)
-      end
-
-      def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 5.0.
-        DEPRECATION
-        process_spree_xhr_action(action, parameters, session, flash, :delete)
-      end
-
-      private
-
-      def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = 'GET')
-        parameters ||= {}
-        process(action, method: method, params: parameters, session: session, flash: flash)
-      end
-
-      def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
-        parameters ||= {}
-        parameters.reverse_merge!(format: :json)
-        process(action, method: method, params: parameters, session: session, flash: flash, xhr: true)
-      end
     end
   end
 end

data/lib/spree/testing_support/factories/integration_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :integration, class: Spree::Integration do
+    type { 'Spree::Integration' }
+    store { Spree::Store.default }
+    active { true }
+  end
+end

data/lib/spree/testing_support/factories/invitation_factory.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :invitation, class: Spree::Invitation do
+    email { FFaker::Internet.email }
+    inviter { create(:admin_user) }
+  end
+end

data/lib/spree/testing_support/factories/page_block_factory.rb

@@ -16,6 +16,7 @@ FactoryBot.define do
       type { 'Spree::PageBlocks::Heading' }
     end
 
+    factory :buttons_block, traits: [:buttons], class: Spree::PageBlocks::Buttons
     factory :heading_block, traits: [:heading], class: Spree::PageBlocks::Heading
   end
 end

data/lib/spree/testing_support/factories/promotion_action_factory.rb

@@ -7,4 +7,8 @@ FactoryBot.define do
     association :promotion
     association :calculator, factory: :flat_rate_calculator
   end
+
+  factory :promotion_action_create_line_items, class: Spree::Promotion::Actions::CreateLineItems do
+    association :promotion
+  end
 end

data/lib/spree/testing_support/factories/user_factory.rb

@@ -30,6 +30,19 @@ FactoryBot.define do
     first_name { FFaker::Name.first_name }
     last_name  { FFaker::Name.last_name }
 
-    spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
+    transient do
+      without_admin_role { false }
+    end
+
+    trait :without_admin_role do
+      without_admin_role { true }
+    end
+
+    after(:create) do |user, evaluator|
+      unless evaluator.without_admin_role
+        admin_role = Spree::Role.default_admin_role
+        create(:role_user, user: user, role: admin_role) unless user.has_spree_role?(admin_role.name)
+      end
+    end
   end
 end

data/lib/spree/translation_migrations.rb

@@ -12,14 +12,24 @@ module Spree
       nullify_translatable_fields = @resource_class.translatable_fields.map { |f| "#{f}=null" }.join(', ')
 
       unless @resource_class::Translation.exists?
-        ActiveRecord::Base.connection.execute("
-          INSERT INTO #{@translations_table} (#{@translatable_fields}, #{@foreign_key}, locale, created_at, updated_at)
-          SELECT #{@translatable_fields}, id, '#{@default_locale}' as locale, created_at, updated_at FROM #{@resource_class.table_name};
-                                              ")
-        ActiveRecord::Base.connection.execute("
-          UPDATE #{@resource_class.table_name}
-          SET #{nullify_translatable_fields};
-                                              ")
+        # Copy data from main table to translations table
+        @resource_class.find_each do |resource|
+          translation_attrs = @resource_class.translatable_fields.each_with_object({}) do |field, attrs|
+            attrs[field] = resource[field]
+          end
+
+          @resource_class::Translation.create!(
+            translation_attrs.merge(
+              @foreign_key => resource.id,
+              locale: @default_locale,
+              created_at: resource.created_at,
+              updated_at: resource.updated_at
+            )
+          )
+        end
+
+        # Nullify translatable fields in main table
+        @resource_class.update_all(nullify_translatable_fields)
       end
     end
 
@@ -27,14 +37,16 @@ module Spree
       translation_table_fields = @resource_class.translatable_fields.map { |f| "#{@translations_table}.#{f}" }.join(', ')
       row_expression = @resource_class.translatable_fields.count == 1 ? 'ROW' : ''
 
-      ActiveRecord::Base.connection.execute("
-          UPDATE #{@resource_class.table_name}
-          SET (#{@translatable_fields}) = #{row_expression}(#{translation_table_fields})
-          FROM #{@translations_table}
-          WHERE #{@translations_table}.#{@foreign_key} = #{@resource_class.table_name}.id
-                                            ")
+      # Update main table with translations
+      @resource_class::Translation.find_each do |translation|
+        resource = @resource_class.find(translation[@foreign_key])
+        @resource_class.translatable_fields.each do |field|
+          resource.update_column(field, translation[field])
+        end
+      end
 
-      ActiveRecord::Base.connection.execute("TRUNCATE TABLE #{@translations_table}")
+      # Clear translations table
+      @resource_class::Translation.delete_all
     end
   end
 end

data/lib/tasks/core.rake

@@ -184,6 +184,14 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
       end
     end
   end
+
+  task migrate_admin_users_to_role_users: :environment do |_t, _args|
+    Spree.admin_user_class.all.each do |admin_user|
+      Spree::Store.all.each do |store|
+        store.add_user(admin_user)
+      end
+    end
+  end
 end
 
 namespace :core do