solidus_core 4.1.6 → 4.5.1

data/app/models/spree/variant.rb

@@ -28,6 +28,10 @@ module Spree
     attr_writer :rebuild_vat_prices
     include Spree::DefaultPrice
 
+    # Consider that not all platforms digest structured data in the same way,
+    # you might have to modify the output on the frontend or in feeds accordingly.
+    enum :condition, { damaged: "damaged", new: "new", refurbished: "refurbished", used: "used" }, prefix: true
+
     belongs_to :product, -> { with_discarded }, touch: true, class_name: 'Spree::Product', inverse_of: :variants_including_master, optional: false
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
     belongs_to :shipping_category, class_name: "Spree::ShippingCategory", optional: true
@@ -35,7 +39,7 @@ module Spree
     delegate :name, :description, :slug, :available_on, :discontinue_on, :discontinued?,
              :meta_description, :meta_keywords,
              to: :product
-    delegate :tax_category, to: :product, prefix: true
+    delegate :tax_category, :tax_category_id, to: :product, prefix: true
     delegate :shipping_category, :shipping_category_id,
       to: :product, prefix: true
     delegate :tax_rates, to: :tax_category
@@ -73,7 +77,6 @@ module Spree
     validates_uniqueness_of :sku, allow_blank: true, case_sensitive: true, conditions: -> { where(deleted_at: nil) }, if: :enforce_unique_sku?
 
     after_create :create_stock_items
-    after_create :set_position
     after_create :set_master_out_of_stock, unless: :is_master?
 
     after_save :clear_in_stock_cache
@@ -81,6 +84,11 @@ module Spree
 
     after_destroy :destroy_option_values_variants
 
+    scope :template_variants, -> do
+      left_joins(product: { option_types: :option_values }).where(is_master: true).where.not(spree_option_values: { id: nil }).reorder(nil).distinct
+    end
+    scope :non_template_variants, -> { where.not(id: template_variants) }
+
     # Returns variants that are in stock. When stock locations are provided as
     # a parameter, the scope is limited to variants that are in stock in the
     # provided stock locations.
@@ -95,7 +103,7 @@ module Spree
       if stock_locations.present?
         in_stock_variants = in_stock_variants.where(spree_stock_items: { stock_location_id: stock_locations.map(&:id) })
       end
-      in_stock_variants
+      in_stock_variants.distinct
     end
 
     # Returns a scope of Variants which are suppliable. This includes:
@@ -146,6 +154,15 @@ module Spree
       super || product_tax_category
     end
 
+    # @return [Integer] the variant's tax category ID
+    #
+    # This returns the product's tax category ID if the tax category ID on the variant is nil. It looks
+    # like an association, but really is an override.
+    #
+    def tax_category_id
+      super || product_tax_category_id
+    end
+
     # @return [Spree::ShippingCategory] the variant's shipping category
     #
     # This returns the product's shipping category if the shipping category ID on the variant is nil. It looks
@@ -195,7 +212,7 @@ module Spree
     #
     # @return [String] a sentence-ified string of option values.
     def options_text
-      values = option_values.includes(:option_type).sort_by do |option_value|
+      values = option_values.sort_by do |option_value|
         option_value.option_type.position
       end
 
@@ -406,10 +423,6 @@ module Spree
       Spree::Config.variant_vat_prices_generator_class.new(self).run
     end
 
-    def set_position
-      update_column(:position, product.variants.maximum(:position).to_i + 1)
-    end
-
     def in_stock_cache_key
       "variant-#{id}-in_stock"
     end

data/app/models/spree/wallet.rb

@@ -28,7 +28,7 @@ class Spree::Wallet
   # @param payment_source [PaymentSource] The payment source to add to the wallet
   # @return [WalletPaymentSource] the generated WalletPaymentSource
   def add(payment_source)
-    user.wallet_payment_sources.find_or_create_by!(payment_source: payment_source)
+    user.wallet_payment_sources.find_or_create_by!(payment_source:)
   end
 
   # Remove a PaymentSource from the wallet.
@@ -37,7 +37,7 @@ class Spree::Wallet
   # @raise [ActiveRecord::RecordNotFound] if the source is not in the wallet.
   # @return [WalletPaymentSource] the destroyed WalletPaymentSource
   def remove(payment_source)
-    user.wallet_payment_sources.find_by!(payment_source: payment_source).destroy!
+    user.wallet_payment_sources.find_by!(payment_source:).destroy!
   end
 
   # Find a WalletPaymentSource in the wallet by id.

data/app/views/spree/order_mailer/cancel_email.html.erb

@@ -26,7 +26,7 @@
           <td><%= t('.subtotal') %></td>
           <td><%= @order.display_item_total %></td>
         </tr>
-        <% @order.adjustments.eligible.each do |adjustment| %>
+        <% @order.adjustments.each do |adjustment| %>
           <tr>
             <td></td>
             <td><%= sanitize(adjustment.label) %></td>

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -10,7 +10,7 @@
 <% end %>
 ============================================================
 <%= t('.subtotal') %> <%= @order.display_item_total %>
-<% @order.adjustments.eligible.each do |adjustment| %>
+<% @order.adjustments.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
 <%= t('.total') %> <%= @order.display_total %>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -31,8 +31,8 @@
           </td>
         </tr>
         <% if @order.line_item_adjustments.exists? %>
-          <% if @order.all_adjustments.promotion.eligible.exists? %>
-            <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+          <% if @order.all_adjustments.promotion.exists? %>
+            <% @order.all_adjustments.promotion.group_by(&:label).each do |label, adjustments| %>
               <tr>
                 <td></td>
                 <td><%= t('spree.promotion') %> <%= label %>:</td>
@@ -48,8 +48,8 @@
             <td><%= Spree::Money.new(shipments.sum(&:total_before_tax), currency: @order.currency) %></td>
           </tr>
         <% end %>
-        <% if @order.all_adjustments.eligible.tax.exists? %>
-          <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+        <% if @order.all_adjustments.tax.exists? %>
+          <% @order.all_adjustments.tax.group_by(&:label).each do |label, adjustments| %>
             <tr>
               <td></td>
               <td><%= t('spree.tax') %> <%= label %>:</td>
@@ -57,7 +57,7 @@
             </tr>
           <% end %>
         <% end %>
-        <% @order.adjustments.eligible.each do |adjustment| %>
+        <% @order.adjustments.each do |adjustment| %>
           <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
           <tr>
             <td></td>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -11,8 +11,8 @@
 ============================================================
 <%= t('.subtotal') %> <%= @order.display_item_total %>
 <% if @order.line_item_adjustments.exists? %>
-  <% if @order.all_adjustments.promotion.eligible.exists? %>
-    <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+  <% if @order.all_adjustments.promotion.exists? %>
+    <% @order.all_adjustments.promotion.group_by(&:label).each do |label, adjustments| %>
 <%= t('spree.promotion') %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
     <% end %>
   <% end %>
@@ -22,13 +22,13 @@
 <%= t('spree.shipping') %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:total_before_tax), currency: @order.currency) %>
 <% end %>
 
-<% if @order.all_adjustments.eligible.tax.exists? %>
-  <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+<% if @order.all_adjustments.tax.exists? %>
+  <% @order.all_adjustments.tax.group_by(&:label).each do |label, adjustments| %>
 <%= t('spree.tax') %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
   <% end %>
 <% end %>
 
-<% @order.adjustments.eligible.each do |adjustment| %>
+<% @order.adjustments.each do |adjustment| %>
   <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
 <%= adjustment.label %> <%= adjustment.display_amount %>
 <% end %>

data/app/views/spree/order_mailer/inventory_cancellation_email.html.erb

@@ -19,7 +19,6 @@
           </tr>
         <% end %>
       </table>
-      <p>
     </td>
     <td class="expander"></td>
   </tr>

data/config/locales/en.yml

@@ -104,6 +104,7 @@ en:
         additional_tax_total: Tax
         approved_at: Approved at
         approver_id: Approver
+        bill_address: Billing Address
         canceled_at: Canceled at
         canceler_id: Canceler
         checkout_complete: Checkout Complete
@@ -117,6 +118,7 @@ en:
         item_total: Item Total
         number: Number
         payment_state: Payment State
+        ship_address: Shipping Address
         shipment_state: Shipment State
         shipment_total: Ship Total
         special_instructions: Special Instructions
@@ -164,11 +166,13 @@ en:
         variant: Variant
       spree/product:
         available_on: Available On
+        condition: Master Condition
         cost_currency: Cost Currency
         cost_price: Cost Price
         depth: Depth
         description: Description
         discontinue_on: Discontinue on
+        gtin: Master GTIN
         height: Height
         master_price: Master Price
         meta_description: Meta Description
@@ -177,8 +181,11 @@ en:
         name: Name
         on_hand: On Hand
         price: Master Price
+        primary_taxon: Primary Taxon
+        primary_taxon_id: Primary Taxon
         promotionable: Promotable
         shipping_category: Shipping Category
+        sku: Master SKU
         slug: Slug
         tax_category: Tax Category
         weight: Weight
@@ -216,6 +223,8 @@ en:
         description: Order total meets these criteria
       spree/promotion/rules/landing_page:
         description: Customer must have visited the specified page
+      spree/promotion/rules/minimum_quantity:
+        description: Order contains minimum quantity of applicable items
       spree/promotion/rules/nth_order:
         description: Apply a promotion to every nth order a user has completed.
         form_text: 'Apply this promotion on the users Nth order: '
@@ -405,14 +414,17 @@ en:
         analytics_id: Analytics ID
       spree/user:
         email: Email
+        last_active: Last active
         lifetime_value: Total spent
         password: Password
         password_confirmation: Password Confirmation
         spree_roles: Roles
       spree/variant:
+        condition: Condition
         cost_currency: Cost Currency
         cost_price: Cost Price
         depth: Depth
+        gtin: GTIN
         height: Height
         price: Price
         shipping_category: Variant Shipping Category
@@ -651,6 +663,7 @@ en:
       spree/promotion/rules/first_repeat_purchase_since: First Repeat Purchase Since
       spree/promotion/rules/item_total: Item Total
       spree/promotion/rules/landing_page: Landing Page
+      spree/promotion/rules/minimum_quantity: Minimum Quantity
       spree/promotion/rules/nth_order: Nth Order
       spree/promotion/rules/one_use_per_user: One Use Per User
       spree/promotion/rules/option_value: Option Value(s)
@@ -871,27 +884,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
@@ -957,8 +949,6 @@ en:
         overview: Overview
         payments: Payments
         products: Products
-        promotion_categories: Promotion Categories
-        promotions: Promotions
         properties: Property Types
         rma: RMA
         settings: Settings
@@ -1060,8 +1050,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
@@ -1087,13 +1075,14 @@ 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
     billing: Billing
     billing_address: Billing Address
     both: Both
+    brand: Brand
+    brands: Brands
     calculated_reimbursements: Calculated Reimbursements
     calculator: Calculator
     calculator_settings_warning: If you are changing the calculator type or preference source, you must save first before you can edit the calculator settings
@@ -1135,9 +1124,8 @@ en:
     choose_a_taxon_to_sort_products_for: Choose a taxon to sort products for
     choose_currency: Choose Currency
     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
@@ -1150,6 +1138,11 @@ en:
     company: Company
     complete: complete
     complete_order: Complete Order
+    condition:
+      damaged: Damaged
+      new: New
+      refurbished: Refurbished
+      used: Used
     configuration: Configuration
     configurations: Configurations
     confirm: Confirm
@@ -1435,7 +1428,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
@@ -1449,7 +1441,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
@@ -1488,10 +1479,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
@@ -1499,8 +1488,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
@@ -1532,6 +1519,9 @@ en:
         no_user_or_email_specified: You need to login or provide your email before applying this coupon code.
         no_user_specified: You need to login before applying this coupon code.
         not_first_order: This coupon code can only be applied to your first order.
+        quantity_less_than_minimum:
+          one: You need to add a least 1 applicable item to your order.
+          other: You need to add a least %{count} applicable items to your order.
     email: Email
     empty: Empty
     empty_cart: Empty Cart
@@ -1601,7 +1591,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
@@ -1614,7 +1603,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:
@@ -1627,10 +1615,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:
@@ -1693,8 +1677,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
@@ -1761,7 +1743,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
@@ -1790,6 +1771,9 @@ en:
     name_contains: Name Contains
     name_on_card: Name on card
     name_or_sku: Name or SKU (enter at least first 4 characters of product name)
+    navigation:
+      switch_to_legacy: Show Legacy UI
+      switch_to_solidus_admin: Show Legacy UI
     negative_movement_absent_item: Cannot create negative movement for absent stock item.
     new: New
     new_adjustment: New Adjustment
@@ -1804,9 +1788,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
@@ -1830,7 +1811,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}.
@@ -1839,13 +1819,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
@@ -1869,6 +1847,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"
@@ -1889,6 +1869,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
@@ -2007,21 +1988,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: '
@@ -2029,20 +1999,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
@@ -2143,7 +2100,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
@@ -2154,6 +2110,7 @@ en:
     scope: Scope
     search: Search
     search_results: Search results for '%{keywords}'
+    search_results_all: Show all results for '%{keywords}'
     searching: Searching
     secure_connection_type: Secure Connection Type
     security_settings: Security Settings
@@ -2292,8 +2249,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
@@ -2316,12 +2271,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
@@ -2336,6 +2285,7 @@ en:
         subject: Test Mail
     test_mode: Test Mode
     thank_you_for_your_order: Thank you for your business. Please print out a copy of this confirmation page for your records.
+    theme_changed: Theme Changed
     there_are_no_items_for_this_order: There are no items for this order. Please add an item to the order to continue.
     there_were_problems_with_the_following_fields: There were problems with the following fields
     this_order_has_already_received_a_refund: This order has already received a refund
@@ -2374,6 +2324,7 @@ en:
     unfinalize_all_adjustments: Unfinalize All Adjustments
     unlock: Unlock
     unrecognized_card_type: Unrecognized Card Type
+    unset: Unset
     unshippable_items: Unshippable Items
     update: Update
     updated_successfully: Updated Successfully
@@ -2385,13 +2336,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.
@@ -2413,7 +2357,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