solidus_core 2.2.2 → 2.3.0.beta1

data/app/models/spree/tax/shipping_rate_taxer.rb

@@ -2,30 +2,21 @@ module Spree
   module Tax
     # Used to build shipping rate taxes
     class ShippingRateTaxer
-      include TaxHelpers
-
       # Build shipping rate taxes for a shipping rate
       # Modifies the passed-in shipping rate with associated shipping rate taxes.
       # @param [Spree::ShippingRate] shipping_rate The shipping rate to add taxes to.
       #   This parameter will be modified.
       # @return [Spree::ShippingRate] The shipping rate with associated tax objects
       def tax(shipping_rate)
-        tax_rates_for_shipping_rate(shipping_rate).each do |tax_rate|
+        taxes = Spree::Config.shipping_rate_tax_calculator_class.new(shipping_rate).calculate
+        taxes.each do |tax|
           shipping_rate.taxes.build(
-            amount: tax_rate.compute_amount(shipping_rate),
-            tax_rate: tax_rate
+            amount: tax.amount,
+            tax_rate: tax.tax_rate
           )
         end
         shipping_rate
       end
-
-      private
-
-      def tax_rates_for_shipping_rate(shipping_rate)
-        applicable_rates(shipping_rate.order).select do |tax_rate|
-          tax_rate.tax_category == shipping_rate.tax_category
-        end
-      end
     end
   end
 end

data/app/models/spree/tax/tax_helpers.rb

@@ -17,9 +17,9 @@ module Spree
       #
       # For further discussion, see https://github.com/spree/spree/issues/4397 and https://github.com/spree/spree/issues/4327.
       def applicable_rates(order)
-        order_zone_tax_category_ids = rates_for_order(order).map(&:tax_category_id)
+        order_zone_tax_category_ids = rates_for_order(order).flat_map(&:tax_categories).map(&:id)
         default_rates_with_unmatched_tax_category = rates_for_default_zone.to_a.delete_if do |default_rate|
-          order_zone_tax_category_ids.include?(default_rate.tax_category_id)
+          (order_zone_tax_category_ids & default_rate.tax_categories.map(&:id)).any?
         end
 
         (rates_for_order(order) + default_rates_with_unmatched_tax_category).uniq
@@ -38,7 +38,9 @@ module Spree
       end
 
       def rates_for_item(item)
-        applicable_rates(item.order).select { |rate| rate.tax_category_id == item.tax_category_id }
+        applicable_rates(item.order).select do |rate|
+          rate.tax_categories.map(&:id).include?(item.tax_category_id)
+        end
       end
     end
   end

data/app/models/spree/tax_calculator/default.rb

@@ -0,0 +1,83 @@
+module Spree
+  module TaxCalculator
+    # Default implementation for tax calculations. Will go through all line
+    # items and shipments and calculate their tax based on tax rates in the DB.
+    #
+    # The class used for tax calculation is configurable, so that the
+    # calculation can easily be pushed to third-party services. Users looking
+    # to provide their own calculator should adhere to the API of this class.
+    #
+    # @api experimental
+    # @note This API is currently in development and likely to change.
+    #   Specifically, the input format is not yet finalized.
+    class Default
+      include Spree::Tax::TaxHelpers
+
+      # Create a new tax calculator.
+      #
+      # @param [Spree::Order] order the order to calculator taxes on
+      # @return [Spree::TaxCalculator::Default] a Spree::TaxCalculator::Default object
+      def initialize(order)
+        @order = order
+      end
+
+      # Calculate taxes for an order.
+      #
+      # @return [Spree::Tax::OrderTax] the calculated taxes for the order
+      def calculate
+        Spree::Tax::OrderTax.new(
+          order_id: order.id,
+          line_item_taxes: line_item_rates,
+          shipment_taxes: shipment_rates
+        )
+      end
+
+      private
+
+      attr_reader :order
+
+      # Calculate the taxes for line items.
+      #
+      # @private
+      # @return [Array<Spree::Tax::ItemTax>] calculated taxes for the line items
+      def line_item_rates
+        order.line_items.flat_map do |line_item|
+          calculate_rates(line_item)
+        end
+      end
+
+      # Calculate the taxes for shipments.
+      #
+      # @private
+      # @return [Array<Spree::Tax::ItemTax>] calculated taxes for the shipments
+      def shipment_rates
+        order.shipments.flat_map do |shipment|
+          calculate_rates(shipment)
+        end
+      end
+
+      # Calculate the taxes for a single item.
+      #
+      # The item could be either a {Spree::LineItem} or a {Spree::Shipment}.
+      #
+      # Will go through all applicable rates for an item and create a new
+      # {Spree::Tax::ItemTax} containing the calculated taxes for the item.
+      #
+      # @private
+      # @return [Array<Spree::Tax::ItemTax>] calculated taxes for the item
+      def calculate_rates(item)
+        rates_for_item(item).map do |rate|
+          amount = rate.compute_amount(item)
+
+          Spree::Tax::ItemTax.new(
+            item_id: item.id,
+            label: rate.adjustment_label(amount),
+            tax_rate: rate,
+            amount: amount,
+            included_in_price: rate.included_in_price
+          )
+        end
+      end
+    end
+  end
+end

data/app/models/spree/tax_calculator/shipping_rate.rb

@@ -0,0 +1,46 @@
+module Spree
+  module TaxCalculator
+    # Default implementation for tax calculations on shipping rates.
+    #
+    # The class used for shipping rate tax calculation is configurable, so that
+    # the calculation can easily be pushed to third-party services. Users
+    # looking to provide their own calculator should adhere to the API of this
+    # class.
+    #
+    # @see Spree::Tax::ShippingRateTaxer
+    # @api experimental
+    # @note This API is currently in development and likely to change.
+    #   Specifically, the input format is not yet finalized.
+    class ShippingRate
+      include Spree::Tax::TaxHelpers
+
+      attr_reader :shipping_rate
+
+      # Create a new tax calculator.
+      #
+      # @param [Spree::ShippingRate] shipping_rate the shipping rate to
+      #   calculate taxes on
+      # @return [Spree::TaxCalculator::ShippingRate]
+      def initialize(shipping_rate)
+        @shipping_rate = shipping_rate
+      end
+
+      # Calculate taxes for a shipping rate.
+      #
+      # @return [Array<Spree::Tax::ItemTax>] the calculated taxes for the
+      #   shipping rate
+      def calculate
+        rates_for_item(shipping_rate).map do |rate|
+          amount = rate.compute_amount(shipping_rate)
+
+          Spree::Tax::ItemTax.new(
+            item_id: shipping_rate.id,
+            label: rate.adjustment_label(amount),
+            tax_rate: rate,
+            amount: amount
+          )
+        end
+      end
+    end
+  end
+end

data/app/models/spree/tax_category.rb

@@ -4,7 +4,15 @@ module Spree
     validates :name, presence: true
     validates_uniqueness_of :name, unless: :deleted_at
 
-    has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category
+    has_many :tax_rate_tax_categories,
+      class_name: 'Spree::TaxRateTaxCategory',
+      dependent: :destroy,
+      inverse_of: :tax_category
+    has_many :tax_rates,
+      through: :tax_rate_tax_categories,
+      class_name: 'Spree::TaxRate',
+      inverse_of: :tax_categories
+
     after_save :ensure_one_default
 
     def self.default

data/app/models/spree/tax_rate.rb

@@ -9,13 +9,20 @@ module Spree
     include Spree::AdjustmentSource
 
     belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates
-    belongs_to :tax_category, class_name: "Spree::TaxCategory", inverse_of: :tax_rates
+
+    has_many :tax_rate_tax_categories,
+      class_name: 'Spree::TaxRateTaxCategory',
+      dependent: :destroy,
+      inverse_of: :tax_rate
+    has_many :tax_categories,
+      through: :tax_rate_tax_categories,
+      class_name: 'Spree::TaxCategory',
+      inverse_of: :tax_rates
 
     has_many :adjustments, as: :source
     has_many :shipping_rate_taxes, class_name: "Spree::ShippingRateTax"
 
     validates :amount, presence: true, numericality: true
-    validates :tax_category_id, presence: true
 
     # Finds all tax rates whose zones match a given address
     scope :for_address, ->(address) { joins(:zone).merge(Spree::Zone.for_address(address)) }
@@ -91,15 +98,32 @@ module Spree
       calculator.compute(item)
     end
 
-    private
+    def active?
+      (starts_at.nil? || starts_at < Time.current) &&
+        (expires_at.nil? || expires_at > Time.current)
+    end
 
     def adjustment_label(amount)
-      Spree.t translation_key(amount),
-              scope: "adjustment_labels.tax_rates",
-              name: name.presence || tax_category.name,
-              amount: amount_for_adjustment_label
+      Spree.t(
+        translation_key(amount),
+        scope: "adjustment_labels.tax_rates",
+        name: name.presence || tax_categories.map(&:name).join(", "),
+        amount: amount_for_adjustment_label
+      )
+    end
+
+    def tax_category=(category)
+      self.tax_categories = [category]
     end
 
+    def tax_category
+      tax_categories[0]
+    end
+
+    deprecate :tax_category => :tax_categories, :tax_category= => :tax_categories=, deprecator: Spree::Deprecation
+
+    private
+
     def amount_for_adjustment_label
       ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
         amount * 100,

data/app/models/spree/tax_rate_tax_category.rb

@@ -0,0 +1,6 @@
+module Spree
+  class TaxRateTaxCategory < Spree::Base
+    belongs_to :tax_rate, class_name: 'Spree::TaxRate', inverse_of: :tax_rate_tax_categories
+    belongs_to :tax_category, class_name: 'Spree::TaxCategory', inverse_of: :tax_rate_tax_categories
+  end
+end

data/app/models/spree/taxon.rb

@@ -11,7 +11,7 @@ module Spree
 
     before_create :set_permalink
     before_update :set_permalink
-    after_update :update_child_permalinks, if: :permalink_changed?
+    after_update :update_child_permalinks, if: :saved_change_to_permalink?
 
     validates :name, presence: true
     validates :meta_keywords, length: { maximum: 255 }

data/app/models/spree/variant.rb

@@ -20,7 +20,7 @@ module Spree
     attr_writer :rebuild_vat_prices
     include Spree::DefaultPrice
 
-    belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants
+    belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants, optional: false
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
 
     delegate :name, :description, :slug, :available_on, :shipping_category_id,

data/app/views/spree/{shipment_mailer → carton_mailer}/shipped_email.html.erb

@@ -11,7 +11,7 @@
         <%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
       </p>
       <table>
-        <% @shipment.manifest.each do |item| %>
+        <% @manifest.each do |item| %>
           <tr>
             <td><%= item.variant.sku %></td>
             <td><%= item.variant.product.name %></td>
@@ -20,10 +20,10 @@
         <% end %>
       </table>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking)     if @shipment.tracking %>
+        <%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @carton.tracking) if @carton.tracking %>
       </p>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>
+        <%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @carton.tracking_url) if @carton.tracking_url %>
       </p>
       <p>
         <%= Spree.t('shipment_mailer.shipped_email.thanks') %>

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

@@ -15,8 +15,8 @@
           <tr>
             <td><%= item.variant.sku %></td>
             <td>
-              <%= raw(item.variant.product.name) %>
-              <%= raw(item.variant.options_text) -%>
+              <%= item.variant.product.name %>
+              <%= item.variant.options_text -%>
             </td>
             <td>(<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %></td>
           </tr>
@@ -29,7 +29,7 @@
         <% @order.adjustments.eligible.each do |adjustment| %>
           <tr>
             <td></td>
-            <td><%= raw(adjustment.label) %></td>
+            <td><%= sanitize(adjustment.label) %></td>
             <td><%= adjustment.display_amount %></td>
           </tr>
         <% end %>

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

@@ -15,8 +15,8 @@
           <tr>
             <td><%= item.variant.sku %></td>
             <td>
-              <%= raw(item.variant.product.name) %>
-              <%= raw(item.variant.options_text) -%>
+              <%= item.variant.product.name %>
+              <%= item.variant.options_text -%>
             </td>
             <td>(<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %></td>
           </tr>

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

@@ -0,0 +1,26 @@
+<table>
+  <tr>
+    <td>
+      <p class="lede">
+        <%= Spree.t('order_mailer.inventory_cancellation.dear_customer') %>
+      </p>
+      <p>
+        <%= Spree.t('order_mailer.inventory_cancellation.instructions') %>
+      </p>
+      <p>
+        <%= Spree.t('order_mailer.inventory_cancellation.order_summary_canceled') %>
+      </p>
+      <table>
+        <% @inventory_units.each do |item| %>
+          <tr>
+            <td><%= item.variant.sku %></td>
+            <td><%= item.variant.product.name %></td>
+            <td><%= item.variant.options_text -%></td>
+          </tr>
+        <% end %>
+      </table>
+      <p>
+    </td>
+    <td class="expander"></td>
+  </tr>
+</table>

data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb

@@ -21,13 +21,13 @@
           <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
             <tr>
               <td>
-                <%= return_item.variant.sku %> <%= raw(return_item.variant.name) %> <%= "(#{raw(return_item.variant.options_text)})" if return_item.variant.options_text.present? %>
+                <%= return_item.variant.sku %> <%= return_item.variant.name %> <%= "(#{return_item.variant.options_text})" if return_item.variant.options_text.present? %>
               </td>
               <td>
                 ->
               </td>
               <td>
-                <%= return_item.exchange_variant.sku %> <%= raw(return_item.exchange_variant.name) %> <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? %>
+                <%= return_item.exchange_variant.sku %> <%= return_item.exchange_variant.name %> <%= "(#{return_item.exchange_variant.options_text})" if return_item.exchange_variant.options_text.present? %>
               </td>
             </tr>
           <% end %>

data/app/views/spree/test_mailer/test_email.html.erb

@@ -30,8 +30,8 @@
       <p>
         Also take note that Gmail does not support <code>&lt;style&gt;</code> tags.
         Therefore, you will need a gem that will be able to remove your <code>&lt;style&gt;</code>
-        tags and place them inline. Gmail only supports inline styles. We use
-        <a href="https://github.com/fphilipe/premailer-rails" target="_blank">Premailer for Rails</a> by default.
+        tags and place them inline. Gmail only supports inline styles. We suggest
+        <a href="https://github.com/fphilipe/premailer-rails" target="_blank">Premailer for Rails</a>.
       </p>
 
     </td>

data/config/locales/en.yml

@@ -33,9 +33,11 @@ en:
         preferred_amount: Amount
       spree/calculator/tiered_flat_rate:
         preferred_base_amount: Base Amount
+        preferred_currency: Currency
         preferred_tiers: Tiers
       spree/calculator/tiered_percent:
         preferred_base_percent: Base Percent
+        preferred_currency: Currency
         preferred_tiers: Tiers
       spree/carton:
         tracking: Tracking
@@ -135,7 +137,7 @@ en:
         display_on: Display
         name: Name
         preference_source: Preference Source
-        type: Provider
+        type: Type
       spree/price:
         currency: Currency
         amount: Price
@@ -175,6 +177,40 @@ en:
         promotion_uses: Promotion Uses
         starts_at: Start date
         usage_limit: Overall Usage Limit
+      spree/promotion/actions/create_adjustment:
+        description: Creates a promotion credit adjustment on the order
+      spree/promotion/actions/create_item_adjustments:
+        description: Creates a promotion credit adjustment on a line item
+      spree/promotion/actions/create_quantity_adjustments:
+        description: Creates an adjustment on a line item based on quantity
+      spree/promotion/actions/free_shipping:
+        description: Makes all shipments for the order free
+      spree/promotion/rules/item_total:
+        description: Order total meets these criteria
+      spree/promotion/rules/first_order:
+        description: Must be the customer's first order
+      spree/promotion/rules/landing_page:
+          description: Customer must have visited the specified page
+      spree/promotion/rules/one_use_per_user:
+        description: Only One Use Per User
+      spree/promotion/rules/option_value:
+        description: Order includes specified product(s) with matching option value(s)
+      spree/promotion/rules/product:
+        description: Order includes specified product(s)
+      spree/promotion/rules/user:
+        description: Available only to the specified users
+      spree/promotion/rules/user_logged_in:
+        description: Available only to logged in users
+      spree/promotion/rules/taxon:
+        description: Order includes products with specified taxon(s)
+      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: "
+      spree/promotion/rules/first_repeat_purchase_since:
+        description: Available only to user who have not purchased in a while
+        form_text: "Apply this promotion to users whose last order was more than X days ago: "
+      spree/promotion/rules/user_role:
+        description: Order includes User with specified Role(s)
       spree/promotion_category:
         name: Name
       spree/property:
@@ -313,6 +349,8 @@ en:
         included_in_price: Included In Price
         name: Name
         show_rate_in_label: Show Rate In Label
+        starts_at: Start date
+        expires_at: Expiration date
       spree/taxon:
         description: Description
         icon: Icon
@@ -365,6 +403,9 @@ en:
       spree/calculator/default_tax:
         one: Default Tax
         other: Default Tax
+      spree/calculator/distributed_amount:
+        one: Distributed Amount
+        other: Distributed Amount
       spree/calculator/flat_percent_item_total:
         one: Flat Percent
         other: Flat Percent
@@ -467,6 +508,22 @@ en:
       spree/promotion:
         one: Promotion
         other: Promotions
+      spree/promotion/actions/create_adjustment: Create whole-order adjustment
+      spree/promotion/actions/create_item_adjustments: Create per-line-item adjustment
+      spree/promotion/actions/create_quantity_adjustments: Create per-quantity adjustment
+      spree/promotion/actions/free_shipping: Free shipping
+      spree/promotion/rules/first_order: First order
+      spree/promotion/rules/item_total: Item total
+      spree/promotion/rules/landing_page: Landing Page
+      spree/promotion/rules/one_use_per_user: One Use Per User
+      spree/promotion/rules/option_value: Option Value(s)
+      spree/promotion/rules/product: Product(s)
+      spree/promotion/rules/user: User
+      spree/promotion/rules/user_logged_in: User Logged In
+      spree/promotion/rules/taxon: Taxon(s)
+      spree/promotion/rules/nth_order: Nth Order
+      spree/promotion/rules/first_repeat_purchase_since: First Repeat Purchase Since
+      spree/promotion/rules/user_role: User Role(s)
       spree/promotion_category:
         one: Promotion Category
         other: Promotion Categories
@@ -1211,7 +1268,7 @@ en:
         tax_category: "This determines what kind of taxation is applied to this product.<br/> Default: None"
       spree/promotion:
         starts_at: "This determines when the promotion can be applied to orders. <br/> If no value is specified, the promotion will be immediately available."
-        expires_at: "This determines when the promotion expires. <br/> If no value is specified, the promotion will never expires."
+        expires_at: "This determines when the promotion expires. <br/> If no value is specified, the promotion will never expire."
       spree/store:
         cart_tax_country_iso: "This determines which country is used for taxes on carts (orders which don't yet have an address).<br/> Default: None."
       spree/variant:
@@ -1219,6 +1276,8 @@ en:
         deleted: "Deleted Variant"
         deleted_explanation: "This variant was deleted on %{date}."
         deleted_explanation_with_replacement: "This variant was deleted on %{date}. It has since been replaced by another with the same SKU."
+      spree/tax_rate:
+        validity_period: "This determines the validity period within which the tax rate is valid and will be applied to eligible items. <br /> If no start date value is specified, the tax rate will be immediately available. <br /> If no expiration date value is specified, the tax rate will never expire"
     failed_payment_attempts: Failed Payment Attempts
     failure: Failure
     filename: Filename
@@ -1298,14 +1357,14 @@ en:
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
     invalid_exchange_variant: Invalid exchange variant.
-    invalid_payment_provider: Invalid payment provider.
+    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
     inventory_canceled: Inventory canceled
-    inventory_error_flash_for_insufficient_quantity: "#{names} became unavailable."
+    inventory_error_flash_for_insufficient_quantity: "%{names} became unavailable."
     inventory_not_available: Inventory not available for %{item}.
     inventory_state: Inventory State
     inventory_states:
@@ -1612,19 +1671,6 @@ en:
     promotion: Promotion
     promotionable: Promotable
     promotion_action: Promotion Action
-    promotion_action_types:
-      create_adjustment:
-        description: Creates a promotion credit adjustment on the order
-        name: Create whole-order adjustment
-      create_item_adjustments:
-        description: Creates a promotion credit adjustment on a line item
-        name: Create per-line-item adjustment
-      create_quantity_adjustments:
-        description: Creates an adjustment on a line item based on quantity
-        name: Create per-quantity adjustment
-      free_shipping:
-        description: Makes all shipments for the order free
-        name: Free shipping
     promotion_actions: Actions
     promotion_code_batch_mailer:
       promotion_code_batch_finished:
@@ -1642,45 +1688,6 @@ en:
         all: Match all of these rules
         any: Match any of these rules
     promotion_rule: Promotion Rule
-    promotion_rule_types:
-      first_order:
-        description: Must be the customer's first order
-        name: First order
-      item_total:
-        description: Order total meets these criteria
-        name: Item total
-      landing_page:
-        description: Customer must have visited the specified page
-        name: Landing Page
-      one_use_per_user:
-        description: Only One Use Per User
-        name: One Use Per User
-      option_value:
-        description: Order includes specified product(s) with matching option value(s)
-        name: Option Value(s)
-      product:
-        description: Order includes specified product(s)
-        name: Product(s)
-      user:
-        description: Available only to the specified users
-        name: User
-      user_logged_in:
-        description: Available only to logged in users
-        name: User Logged In
-      taxon:
-        description: Order includes products with specified taxon(s)
-        name: Taxon(s)
-      nth_order:
-        description: Apply a promotion to every nth order a user has completed.
-        name: Nth Order
-        form_text: "Apply this promotion on the users Nth order: "
-      first_repeat_purchase_since:
-        description: Available only to user who have not purchased in a while
-        name: First Repeat Purchase Since
-        form_text: "Apply this promotion to users whose last order was more than X days ago: "
-      user_role:
-        description: Order includes User with specified Role(s)
-        name: User Role(s)
     promotions: Promotions
     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."
@@ -1689,7 +1696,7 @@ en:
     properties: Property Types
     property: Property Type
     provider: Provider
-    provider_settings_warning: If you are changing the provider type, you must save first before you can edit the provider settings
+    payment_method_settings_warning: If you are changing the payment method type, you must save first before you can edit the payment method settings
     qty: Qty
     quantity: Quantity
     quantity_returned: Quantity Returned
@@ -1865,6 +1872,7 @@ en:
     source_location: Source location
     special_instructions: Special Instructions
     split: Split
+    split_failed: Unable to complete split
     spree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.
     ssl:
       change_protocol: "Please switch to using HTTP (rather than HTTPS) and retry this request."
@@ -2031,6 +2039,7 @@ en:
       is_too_large: is too large -- stock on hand cannot cover requested quantity!
       must_be_int: must be an integer
       must_be_non_negative: must be a non-negative value
+    validity_period: Validity Period
     value: Value
     variant: Variant
     variant_placeholder: Choose a variant

data/db/default/spree/refund_reasons.rb

@@ -0,0 +1 @@
+Spree::RefundReason.find_or_create_by(name: "Return processing")

data/db/default/spree/shipping_categories.rb

@@ -0,0 +1 @@
+Spree::ShippingCategory.find_or_create_by(name: "Default")

data/db/default/spree/stock_locations.rb

@@ -0,0 +1,2 @@
+Spree::StockLocation.create_with(backorderable_default: true)
+                    .find_or_create_by!(name: 'default')

data/db/default/spree/stores.rb

@@ -2,9 +2,8 @@
 unless Spree::Store.where(code: 'spree').exists?
   Spree::Store.new do |s|
     s.code              = 'spree'
-    s.name              = 'Spree Demo Site'
-    s.url               = 'demo.spreecommerce.com'
-    s.mail_from_address = 'spree@example.com'
-    s.cart_tax_country_iso = 'US'
+    s.name              = 'Sample Store'
+    s.url               = 'example.com'
+    s.mail_from_address = 'store@example.com'
   end.save!
 end