solidus_core 4.3.4 → 4.4.0

data/config/locales/en.yml

@@ -410,6 +410,7 @@ en:
         analytics_id: Analytics ID
       spree/user:
         email: Email
+        last_active: Last active
         lifetime_value: Total spent
         password: Password
         password_confirmation: Password Confirmation
@@ -877,27 +878,6 @@ en:
           new_price: New Price
         table:
           variant_pricing: Variant Prices
-      promotion_status:
-        active: Active
-        expired: Expired
-        inactive: Inactive
-        not_started: Not started
-      promotions:
-        actions:
-          calculator_label: Calculated by
-        activations_edit:
-          auto: All orders will attempt to use this promotion
-          multiple_codes_html: This promotion uses %{count} promotion codes
-          single_code_html: 'This promotion uses the promotion code: <code>%{code}</code>'
-        activations_new:
-          auto: Apply to all orders
-          multiple_codes: Multiple promotion codes
-          single_code: Single promotion code
-        form:
-          activation: Activation
-          expires_at_placeholder: Never
-          general: General
-          starts_at_placeholder: Immediately
       shipping_methods:
         form:
           stock_locations_placeholder: Choose stock locations
@@ -963,8 +943,6 @@ en:
         overview: Overview
         payments: Payments
         products: Products
-        promotion_categories: Promotion Categories
-        promotions: Promotions
         properties: Property Types
         rma: RMA
         settings: Settings
@@ -1066,8 +1044,6 @@ en:
     back_to_payment_methods_list: Back To Payment Methods List
     back_to_payments_list: Back To Payments List
     back_to_products_list: Back To Products List
-    back_to_promotion_categories_list: Back To Promotions Categories List
-    back_to_promotions_list: Back To Promotions List
     back_to_properties_list: Back To Property Types List
     back_to_refund_reason_list: Back To Refund Reason List
     back_to_reimbursement_type_list: Back To Reimbursement Type List
@@ -1093,7 +1069,6 @@ en:
     backordered: Backordered
     backorders_allowed: backorders allowed
     balance_due: Balance Due
-    base_amount: Base Amount
     base_percent: Base Percent
     bill_address: Bill Address
     bill_address_required: Valid billing address required
@@ -1143,8 +1118,6 @@ en:
     choose_dashboard_locale: Choose Dashboard Locale
     choose_dashboard_theme: Choose Dashboard Theme
     choose_location: Choose Location
-    choose_promotion_action: Choose Action
-    choose_promotion_rule: Choose Rule
     choose_reason: Choose Reason
     city: City
     clear_cache: Clear Cache
@@ -1442,7 +1415,6 @@ en:
     create: Create
     create_a_new_account: Create a new account
     create_one: Create One.
-    create_promotion_code: Create promotion code
     create_reimbursement: Create reimbursement
     created_at: Created At
     created_by: Created by
@@ -1456,7 +1428,6 @@ en:
     currency: Currency
     currency_settings: Currency Settings
     current: Current
-    current_promotion_usage: 'Current Usage: %{count}'
     customer: Customer
     customer_details: Customer Details
     customer_details_updated: Customer Details Updated
@@ -1495,10 +1466,8 @@ en:
     destroy: Destroy
     details: Details
     discount_amount: Discount Amount
-    discount_rules: Discount Rules
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
-    download_promotion_codes_list: Download codes list
     edit: Edit
     edit_refund_reason: Edit Refund Reason
     editing_adjustment_reason: Editing Adjustment Reason
@@ -1506,8 +1475,6 @@ en:
     editing_option_type: Editing Option Type
     editing_payment_method: Editing Payment Method
     editing_product: Editing Product
-    editing_promotion: Editing Promotion
-    editing_promotion_category: Editing Promotion Category
     editing_property: Editing Property Type
     editing_refund: Editing Refund
     editing_refund_reason: Editing Refund Reason
@@ -1610,7 +1577,6 @@ en:
     general: General
     google_analytics: Google Analytics
     google_analytics_id: Analytics ID
-    group_size: Group size
     guest_checkout: Guest Checkout
     guest_user_account: Checkout as a Guest
     has_no_shipped_units: has no shipped units
@@ -1623,7 +1589,6 @@ en:
     hide_out_of_stock: Hide out of stock
     hints:
       spree/calculator:
-        promotions: This is used to determine the promotional discount to be applied to an order, an item, or shipping charges.
         shipping_methods: This is used to calculate the shipping rates on a per order or per package rate.
         tax_rates: The "Default Tax" calculator is used for both sales tax (United States-style taxes) and value-added tax (VAT). Typically this calculator should be the only tax calculator required by your store. "Flat Fee" can be used for any taxes that require a flat fee be charged to the customer.
       spree/price:
@@ -1636,10 +1601,6 @@ en:
         promotionable: 'This determines whether or not promotions can apply to this product.<br>Default: Checked'
         shipping_category: 'This determines what kind of shipping this product requires.<br> Default: Default'
         tax_category: 'This determines what kind of taxation is applied to this product.<br> Default: %{default_tax_category}'
-      spree/promotion:
-        expires_at: This determines when the promotion expires. <br> If no value is specified, the promotion will never expire.
-        promo_code_will_be_disabled: Selecting this option, promo codes will be disabled for this promotion because all its rules / actions will be applied automatically to all orders.
-        starts_at: This determines when the promotion can be applied to orders. <br> If no value is specified, the promotion will be immediately available.
       spree/shipping_method:
         available_to_all: Uncheck to select specific stock locations this shipping method will be available in.
       spree/stock_location:
@@ -1702,8 +1663,6 @@ en:
     intercept_email_instructions: Override email recipient and replace with this address.
     invalid_exchange_variant: Invalid exchange variant.
     invalid_payment_method_type: Invalid payment method type.
-    invalid_promotion_action: Invalid promotion action.
-    invalid_promotion_rule: Invalid promotion rule.
     invalidate: Invalidate
     inventory: Inventory
     inventory_adjustment: Inventory Adjustment
@@ -1770,7 +1729,6 @@ en:
     look_for_similar_items: Look for similar items
     make_refund: Make refund
     make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correct
-    manage_promotion_categories: Manage Promotion Categories
     manage_stock: Store Stock
     manage_variants: Manage Variants
     manual_intervention_required: Manual intervention required
@@ -1816,9 +1774,6 @@ en:
     new_payment: New Payment
     new_payment_method: New Payment Method
     new_product: New Product
-    new_promotion: New Promotion
-    new_promotion_category: New Promotion Category
-    new_promotion_code_batch: New Promotion Code Batch
     new_property: New Property Type
     new_refund: New Refund
     new_refund_reason: New Refund Reason
@@ -1842,7 +1797,6 @@ en:
     new_variant: New Variant
     new_zone: New Zone
     next: Next
-    no_actions_added: No actions added
     no_images_found: No images found
     no_inventory_selected: No inventory selected
     no_option_values_on_product_html: This product has no associated option values. Add some to it through Option Types in the %{link}.
@@ -1851,13 +1805,11 @@ en:
     no_payment_methods_found: No payment methods found
     no_pending_payments: No pending payments
     no_products_found: No products found
-    no_promotions_found: No promotions found
     no_resource: No %{resource} found.
     no_resource_found: No %{resource} found
     no_resource_found_html: No %{resource} found, %{add_one_link}!
     no_resource_found_link: Add One
     no_results: No results
-    no_rules_added: No rules added
     no_shipping_method_selected: No shipping method selected.
     no_shipping_methods_found: No shipping methods found
     no_stock_locations_found: No stock locations found
@@ -1881,6 +1833,8 @@ en:
       product_not_deleted: Product could not be deleted
       variant_deleted: Variant has been deleted
       variant_not_deleted: Variant could not be deleted
+    null_promotion_handler:
+      coupon_code_applied: Coupon code has been applied.
     num_orders: "# Orders"
     number: Number
     number_of_codes: "%{count} codes"
@@ -1901,6 +1855,7 @@ en:
     order_approved: Order approved
     order_canceled: Order canceled
     order_completed: Order completed
+    order_count: Order Count
     order_details: Order Details
     order_email_resent: Order Email Resent
     order_information: Order Information
@@ -2019,21 +1974,10 @@ en:
     product_has_no_description: This product has no description
     product_not_available_in_this_currency: This product is not available in the selected currency.
     product_properties: Product Properties
-    product_rule:
-      choose_products: Choose products
-      label: Order must contain %{select} of these products
-      match_all: all
-      match_any: at least one
-      match_none: none
-      product_source:
-        group: From product group
-        manual: Manually choose
     product_without_default_price_cta: Please, create a Master Price!
     product_without_default_price_info: This Product has no price in the default currency (%{default_currency}).
     products: Products
     promotion: Promotion
-    promotion_action: Promotion Action
-    promotion_actions: Actions
     promotion_code_batch_mailer:
       promotion_code_batch_errored:
         message: 'Promotion code batch errored (%{error}) for promotion: '
@@ -2041,20 +1985,7 @@ en:
       promotion_code_batch_finished:
         message: 'All %{number_of_codes} codes have been created for promotion: '
         subject: Promotion code batch finished
-    promotion_code_batches:
-      errored: 'Errored: %{error}'
-      finished: All %{number_of_codes} codes have been created.
-      processing: 'Processing: %{number_of_codes_processed} / %{number_of_codes}'
-    promotion_form:
-      match_policies:
-        all: Match all of these rules
-        any: Match any of these rules
-    promotion_rule: Promotion Rule
-    promotion_successfully_created: Promotion has been successfully created!
     promotion_total_changed_before_complete: One or more of the promotions on your order have become ineligible and were removed. Please check the new order amounts and try again.
-    promotion_uses: Promotion uses
-    promotionable: Promotable
-    promotions: Promotions
     propagate_all_variants: Propagate all variants
     properties: Property Types
     property: Property Type
@@ -2155,7 +2086,6 @@ en:
     rma_number: RMA Number
     rma_value: RMA Value
     roles: Roles
-    rules: Rules
     sales_total: Sales Total
     sales_total_description: Sales Total For All Orders
     sales_totals: Sales Totals
@@ -2304,8 +2234,6 @@ en:
       user_has_no_store_credits: User does not have any available store credit
     store_credit_category:
       default: Default
-    store_rule:
-      choose_stores: Choose Stores
     street_address: Street Address
     street_address_2: Street Address (cont'd)
     subtotal: Subtotal
@@ -2328,12 +2256,6 @@ en:
     taxon_attachment_removal_error: There was an error removing the attachment
     taxon_edit: Edit Taxon
     taxon_placeholder: Add a Taxon
-    taxon_rule:
-      choose_taxons: Choose taxons
-      label: Order must contain %{select} of these taxons
-      match_all: all
-      match_any: at least one
-      match_none: none
     taxonomies: Taxonomies
     taxonomy: Taxonomy
     taxonomy_edit: Edit taxonomy
@@ -2398,13 +2320,6 @@ en:
     use_new_cc: Use a new card
     use_new_cc_or_payment_method: Use a new card / payment method
     user: User
-    user_role_rule:
-      choose_roles: Choose Roles
-      label: User must contain %{select} of these roles
-      match_all: all
-      match_any: at least one
-    user_rule:
-      choose_users: Choose Users
     users: Users
     validation:
       cannot_be_less_than_shipped_units: cannot be less than the number of shipped units.
@@ -2426,7 +2341,6 @@ en:
     variants: Variants
     version: Version
     view_product: View Product On Store
-    view_promotion_codes_list: View codes list
     void: Void
     weight: Weight
     what_is_a_cvv: What is a (CVV) Credit Card Code?

data/db/default/spree/permission_sets.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Spree::PermissionSets::Base.subclasses.each do |permission|
+  Spree::PermissionSet.create!(
+    name: permission.name.demodulize,
+    set: permission.name,
+    privilege: permission.privilege,
+    category: permission.category
+  )
+end

data/db/default/spree/return_reasons.rb

@@ -3,7 +3,9 @@
 Spree::ReturnReason.find_or_create_by(name: 'Better price available')
 Spree::ReturnReason.find_or_create_by(name: 'Missed estimated delivery date')
 Spree::ReturnReason.find_or_create_by(name: 'Missing parts or accessories')
-Spree::ReturnReason.find_or_create_by(name: 'Damaged/Defective')
+Spree::ReturnReason.find_or_create_by(name: 'Damaged during transport')
+Spree::ReturnReason.find_or_create_by(name: 'Defective within warranty period')
+Spree::ReturnReason.find_or_create_by(name: 'Other defects or damages')
 Spree::ReturnReason.find_or_create_by(name: 'Different from what was ordered')
 Spree::ReturnReason.find_or_create_by(name: 'Different from description')
 Spree::ReturnReason.find_or_create_by(name: 'No longer needed/wanted')

data/db/default/spree/states.rb

@@ -2,7 +2,7 @@
 
 def create_states(subregions, country)
   subregions.each do |subregion|
-    Spree::State.where(abbr: subregion.code, country: country).first_or_create!(
+    Spree::State.where(abbr: subregion.code, country:).first_or_create!(
       name: subregion.name
     )
   end

data/db/migrate/20160101010000_solidus_one_four.rb

@@ -85,19 +85,15 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.integer "adjustable_id", null: false
       t.decimal "amount", precision: 10, scale: 2
       t.string "label"
-      t.boolean "eligible", default: true
       t.datetime "created_at", precision: 6
       t.datetime "updated_at", precision: 6
       t.integer "order_id", null: false
       t.boolean "included", default: false
-      t.integer "promotion_code_id"
       t.integer "adjustment_reason_id"
       t.boolean "finalized", default: false, null: false
       t.index ["adjustable_id", "adjustable_type"], name: "index_spree_adjustments_on_adjustable_id_and_adjustable_type"
       t.index ["adjustable_id"], name: "index_adjustments_on_order_id"
-      t.index ["eligible"], name: "index_spree_adjustments_on_eligible"
       t.index ["order_id"], name: "index_spree_adjustments_on_order_id"
-      t.index ["promotion_code_id"], name: "index_spree_adjustments_on_promotion_code_id"
       t.index ["source_id", "source_type"], name: "index_spree_adjustments_on_source_id_and_source_type"
     end
 
@@ -326,16 +322,6 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.index ["user_id"], name: "index_spree_orders_on_user_id"
     end
 
-    create_table "spree_orders_promotions", force: :cascade do |t|
-      t.integer "order_id"
-      t.integer "promotion_id"
-      t.integer "promotion_code_id"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["order_id", "promotion_id"], name: "index_spree_orders_promotions_on_order_id_and_promotion_id"
-      t.index ["promotion_code_id"], name: "index_spree_orders_promotions_on_promotion_code_id"
-    end
-
     create_table "spree_payment_capture_events", force: :cascade do |t|
       t.decimal "amount", precision: 10, scale: 2, default: "0.0"
       t.integer "payment_id"
@@ -411,15 +397,6 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.index ["product_id"], name: "index_spree_product_option_types_on_product_id"
     end
 
-    create_table "spree_product_promotion_rules", force: :cascade do |t|
-      t.integer "product_id"
-      t.integer "promotion_rule_id"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["product_id"], name: "index_products_promotion_rules_on_product_id"
-      t.index ["promotion_rule_id"], name: "index_products_promotion_rules_on_promotion_rule_id"
-    end
-
     create_table "spree_product_properties", force: :cascade do |t|
       t.string "value"
       t.integer "product_id"
@@ -463,100 +440,6 @@ class SolidusOneFour < ActiveRecord::Migration[5.0]
       t.index ["taxon_id"], name: "index_spree_products_taxons_on_taxon_id"
     end
 
-    create_table "spree_promotion_action_line_items", force: :cascade do |t|
-      t.integer "promotion_action_id"
-      t.integer "variant_id"
-      t.integer "quantity", default: 1
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["promotion_action_id"], name: "index_spree_promotion_action_line_items_on_promotion_action_id"
-      t.index ["variant_id"], name: "index_spree_promotion_action_line_items_on_variant_id"
-    end
-
-    create_table "spree_promotion_actions", force: :cascade do |t|
-      t.integer "promotion_id"
-      t.integer "position"
-      t.string "type"
-      t.datetime "deleted_at"
-      t.text "preferences"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["deleted_at"], name: "index_spree_promotion_actions_on_deleted_at"
-      t.index ["id", "type"], name: "index_spree_promotion_actions_on_id_and_type"
-      t.index ["promotion_id"], name: "index_spree_promotion_actions_on_promotion_id"
-    end
-
-    create_table "spree_promotion_categories", force: :cascade do |t|
-      t.string "name"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.string "code"
-    end
-
-    create_table "spree_promotion_codes", force: :cascade do |t|
-      t.integer "promotion_id", null: false
-      t.string "value", null: false
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["promotion_id"], name: "index_spree_promotion_codes_on_promotion_id"
-      t.index ["value"], name: "index_spree_promotion_codes_on_value", unique: true
-    end
-
-    create_table "spree_promotion_rule_taxons", force: :cascade do |t|
-      t.integer "taxon_id"
-      t.integer "promotion_rule_id"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["promotion_rule_id"], name: "index_spree_promotion_rule_taxons_on_promotion_rule_id"
-      t.index ["taxon_id"], name: "index_spree_promotion_rule_taxons_on_taxon_id"
-    end
-
-    create_table "spree_promotion_rules", force: :cascade do |t|
-      t.integer "promotion_id"
-      t.integer "product_group_id"
-      t.string "type"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.string "code"
-      t.text "preferences"
-      t.index ["product_group_id"], name: "index_promotion_rules_on_product_group_id"
-      t.index ["promotion_id"], name: "index_spree_promotion_rules_on_promotion_id"
-    end
-
-    create_table "spree_promotion_rules_users", force: :cascade do |t|
-      t.integer "user_id"
-      t.integer "promotion_rule_id"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.index ["promotion_rule_id"], name: "index_promotion_rules_users_on_promotion_rule_id"
-      t.index ["user_id"], name: "index_promotion_rules_users_on_user_id"
-    end
-
-    create_table "spree_promotions", force: :cascade do |t|
-      t.string "description"
-      t.datetime "expires_at"
-      t.datetime "starts_at"
-      t.string "name"
-      t.string "type"
-      t.integer "usage_limit"
-      t.string "match_policy", default: "all"
-      t.string "code"
-      t.boolean "advertise", default: false
-      t.string "path"
-      t.datetime "created_at", precision: 6
-      t.datetime "updated_at", precision: 6
-      t.integer "promotion_category_id"
-      t.integer "per_code_usage_limit"
-      t.boolean "apply_automatically", default: false
-      t.index ["advertise"], name: "index_spree_promotions_on_advertise"
-      t.index ["apply_automatically"], name: "index_spree_promotions_on_apply_automatically"
-      t.index ["code"], name: "index_spree_promotions_on_code"
-      t.index ["expires_at"], name: "index_spree_promotions_on_expires_at"
-      t.index ["id", "type"], name: "index_spree_promotions_on_id_and_type"
-      t.index ["promotion_category_id"], name: "index_spree_promotions_on_promotion_category_id"
-      t.index ["starts_at"], name: "index_spree_promotions_on_starts_at"
-    end
-
     create_table "spree_properties", force: :cascade do |t|
       t.string "name"
       t.string "presentation", null: false

data/db/migrate/20240821173254_create_spree_permission_sets_in_core.rb

@@ -0,0 +1,9 @@
+class CreateSpreePermissionSetsInCore < ActiveRecord::Migration[7.0]
+  def change
+    create_table :spree_permission_sets, if_not_exists: true do |t|
+      t.string :name
+      t.string :set
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20240821173341_create_spree_roles_permissions_in_core.rb

@@ -0,0 +1,9 @@
+class CreateSpreeRolesPermissionsInCore < ActiveRecord::Migration[7.0]
+  def change
+    create_table :spree_role_permissions, if_not_exists: true do |t|
+      t.references :role
+      t.references :permission_set
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20240821173641_add_description_to_spree_roles.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToSpreeRoles < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_roles, :description, :text
+  end
+end

data/db/migrate/20240904152041_add_privilege_and_category_to_spree_permission_sets.rb

@@ -0,0 +1,6 @@
+class AddPrivilegeAndCategoryToSpreePermissionSets < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_permission_sets, :privilege, :string
+    add_column :spree_permission_sets, :category, :string
+  end
+end

data/db/seeds.rb

@@ -13,6 +13,7 @@ shell = Thor::Base.shell.new
   zones
   refund_reasons
   roles
+  permission_sets
   shipping_categories
 ).each do |seed|
   shell.say_status :seed, seed

data/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1 +1 @@
-apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.3/template.rb'
+apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.4/template.rb'

data/lib/generators/solidus/update/update_generator.rb

@@ -110,7 +110,7 @@ module Solidus
     end
 
     def changes_template_for(klass, from, to)
-      changes = Spree::Preferences::PreferenceDifferentiator.new(klass).call(from: from, to: to)
+      changes = Spree::Preferences::PreferenceDifferentiator.new(klass).call(from:, to:)
       return '# No changes' if changes.empty?
 
       [

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -18,7 +18,12 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false # Should be :none for Rails 7.1+
+  if Rails.gem_version >= Gem::Version.new('7.1')
+    config.action_controller.raise_on_missing_callback_actions = true
+    config.action_dispatch.show_exceptions = :none
+  else
+    config.action_dispatch.show_exceptions = false
+  end
 
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection = false