spree_core 4.2.0.rc1 → 4.2.0

data/app/services/spree/cart/estimate_shipping_rates.rb

@@ -24,7 +24,7 @@ module Spree
         if country_iso.present?
           ::Spree::Country.by_iso(country_iso)&.id
         else
-          ::Spree::Country.default.id
+          Spree::Config[:default_country_id]
         end
       end
 

data/app/services/spree/compare_line_items.rb

@@ -1,9 +1,11 @@
 # This class should be refactored
 module Spree
   class CompareLineItems
-    prepend Spree::ServiceModule:: Base
+    prepend Spree::ServiceModule::Base
+
+    def call(order:, line_item:, options: {}, comparison_hooks: nil)
+      comparison_hooks ||= Rails.application.config.spree.line_item_comparison_hooks
 
-    def call(order:, line_item:, options: {}, comparison_hooks: Rails.application.config.spree.line_item_comparison_hooks)
       legacy_part = comparison_hooks.all? do |hook|
         order.send(hook, line_item, options)
       end

data/app/sorters/spree/base_sorter.rb

@@ -0,0 +1,35 @@
+module Spree
+  class BaseSorter
+    def initialize(scope, params = {}, allowed_sort_attributes = [])
+      @scope = scope
+      @sort = params[:sort]
+      @allowed_sort_attributes = allowed_sort_attributes
+    end
+
+    def call
+      by_param_attribute(scope)
+    end
+
+    protected
+
+    attr_reader :scope, :collection, :sort, :allowed_sort_attributes
+
+    def by_param_attribute(scope)
+      return scope if sort_field.blank? || !allowed_sort_attributes.include?(sort_field.to_sym)
+
+      scope.order("#{sort_field}": order_direction)
+    end
+
+    def desc_order
+      @desc_order ||= String(sort)[0] == '-'
+    end
+
+    def sort_field
+      @sort_field ||= desc_order ? sort[1..-1] : sort
+    end
+
+    def order_direction
+      desc_order ? :desc : :asc
+    end
+  end
+end

data/app/sorters/spree/orders/sort.rb

@@ -1,42 +1,6 @@
 module Spree
   module Orders
-    class Sort
-      attr_reader :scope, :sort
-
-      def initialize(scope, params)
-        @scope = scope
-        @sort = params[:sort]
-      end
-
-      def call
-        orders = completed_at(scope)
-
-        orders
-      end
-
-      private
-
-      def desc_order
-        @desc_order ||= String(sort)[0] == '-'
-      end
-
-      def sort_field
-        @sort_field ||= desc_order ? sort[1..-1] : sort
-      end
-
-      def order_direction
-        desc_order ? :asc : :desc
-      end
-
-      def completed_at?
-        sort_field.eql?('completed_at')
-      end
-
-      def completed_at(orders)
-        return orders unless completed_at?
-
-        orders.order(completed_at: order_direction)
-      end
+    class Sort < ::Spree::BaseSorter
     end
   end
 end

data/app/sorters/spree/products/sort.rb

@@ -1,53 +1,30 @@
 module Spree
   module Products
-    class Sort
-      def initialize(scope, params, current_currency)
-        @scope    = scope
-        @sort     = params[:sort]
+    class Sort < ::Spree::BaseSorter
+      def initialize(scope, current_currency, params = {}, allowed_sort_attributes = [])
+        super(scope, params, allowed_sort_attributes)
         @currency = params[:currency] || current_currency
       end
 
       def call
-        products = updated_at(scope)
-        products = price(products)
+        products = by_param_attribute(scope)
+        products = by_price(products)
 
         products.distinct
       end
 
       private
 
-      attr_reader :sort, :scope, :currency
-
-      def desc_order
-        @desc_order ||= String(sort)[0] == '-'
-      end
-
-      def sort_field
-        @sort_field ||= desc_order ? sort[1..-1] : sort
-      end
-
-      def updated_at?
-        sort_field == 'updated_at'
-      end
+      attr_reader :sort, :scope, :currency, :allowed_sort_attributes
 
       def price?
         sort_field == 'price'
       end
 
-      def order_direction
-        desc_order ? :desc : :asc
-      end
-
-      def updated_at(products)
-        return products unless updated_at?
-
-        products.order(updated_at: order_direction)
-      end
-
-      def price(products)
-        return products unless price?
+      def by_price(scope)
+        return scope unless price?
 
-        products.joins(master: :prices).
+        scope.joins(master: :prices).
           select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").
           distinct.
           where(spree_prices: { currency: currency }).

data/app/validators/email_validator.rb

@@ -1,7 +1,7 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless value =~ /\A[^@\s]+@[^@\s]+\z/
-      record.errors.add(attribute, :invalid, { value: value }.merge!(options))
+      record.errors.add(attribute, :invalid, **{ value: value }.merge!(options))
     end
   end
 end

data/app/views/spree/shared/_base_mailer_stylesheets.html.erb

@@ -249,11 +249,9 @@
     color: #51545E;
     font-size: 15px;
     line-height: 18px;
-    width: 62%;
   }
 
   .purchase_image {
-    width: 18%;
     padding: 5px;
   }
 
@@ -289,10 +287,20 @@
     color: #333333;
   }
 
+  .purchase_total--name {
+    margin: 0;
+    text-align: right;
+    color: #333333;
+  }
+
   .purchase_total--label {
     padding: 0 15px 0 0;
   }
 
+  .purchase_total-col {
+    vertical-align: bottom;
+  }
+
   body {
     background-color: #F2F4F6;
     color: #51545E;
@@ -402,6 +410,9 @@
     .email-footer {
       width: 100% !important;
     }
+    .content-cell {
+      padding: 40px 15px !important;
+    }
   }
 
   @media (prefers-color-scheme: dark) {

data/app/views/spree/shared/_purchased_items_table.html.erb

@@ -8,10 +8,13 @@
           <td></td>
           <td>
             <p class="f-fallback purchase_total purchase_total--label">
-              <%= Spree.t(:promotion) %> <%= label %>:
+              <%= Spree.t(:promotion) %>:
+            </p>
+            <p class="f-fallback purchase_total--name purchase_total--label">
+              <%= label %>
             </p>
           </td>
-          <td>
+          <td class="purchase_total-col">
             <p class="f-fallback purchase_total">
               <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
             </p>
@@ -25,10 +28,13 @@
       <td></td>
       <td>
         <p class="f-fallback purchase_total purchase_total--label">
-          <%= Spree.t(:shipping) %> <%= name %>:
+          <%= Spree.t(:shipping) %>:
+        </p>
+        <p class="f-fallback purchase_total--name purchase_total--label">
+          <%= name %>
         </p>
       </td>
-      <td>
+      <td class="purchase_total-col">
         <p class="f-fallback purchase_total">
           <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
         </p>
@@ -41,10 +47,13 @@
         <td></td>
         <td>
           <p class="f-fallback purchase_total purchase_total--label">
-            <%= Spree.t(:tax) %> <%= label %>:
+            <%= Spree.t(:tax) %>:
+          </p>
+          <p class="f-fallback purchase_total--name purchase_total--label">
+            <%= label %>
           </p>
         </td>
-        <td>
+        <td class="purchase_total-col">
           <p class="f-fallback purchase_total">
             <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
           </p>

data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb

@@ -5,9 +5,9 @@
       <%= raw(adjustment.label) %>:
     </p>
   </td>
-  <td>
+  <td class="purchase_total-col">
     <p class="f-fallback purchase_total">
       <%= Spree::Money.new(adjustment.amount, currency: order.currency) %>
     </p>
   </td>
-</tr>
+</tr>

data/app/views/spree/shared/purchased_items_table/_line_item.html.erb

@@ -18,9 +18,9 @@
     </strong>
     <p class="purchase_item--additional"><%= raw(line_item.variant.options_text) -%></p>
   </td>
-  <td class="align-right">
+  <td class="align-right" width="30%">
     <span class="f-fallback purchase_item_price">
-      <%= line_item.quantity %> x <%= line_item.single_money %>
+      <%= line_item.quantity %> x <%= line_item.single_money %><br>
       <%= line_item.display_amount %>
     </span>
   </td>

data/config/initializers/inflections.rb

@@ -0,0 +1,3 @@
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym 'RMA'
+end

data/config/initializers/rails61_fixes.rb

@@ -0,0 +1,3 @@
+if Rails::VERSION::STRING >= '6.1'
+  ActiveRecord::Base.has_many_inversing = false
+end

data/config/locales/en.yml

@@ -6,7 +6,7 @@ en:
           attributes:
             desired_shipment:
               can_not_transfer_within_same_shipment: can not be same as current shipment
-              not_enough_stock_at_desired_location: not enough stock in desired stock location
+              has_not_enough_stock_at_desired_location: has not enough stock in desired stock location
             current_shipment:
               has_already_been_shipped: has already been shipped
               can_not_have_backordered_inventory_units: has backordered inventory units
@@ -52,6 +52,7 @@ en:
       spree/option_type:
         name: Name
         presentation: Presentation
+        filterable: Filterable
       spree/order:
         checkout_complete: Checkout Complete
         completed_at: Completed At
@@ -141,7 +142,8 @@ en:
         url: Site URL
         meta_description: Meta Description
         meta_keywords: Meta Keywords
-        seo_title: Seo Title
+        seo_robots: SEO Robots
+        seo_title: SEO Title
         name: Site Name
         mail_from_address: Mail From Address
       spree/store_credit:
@@ -574,9 +576,6 @@ en:
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
     all: All
-    allow_currency_change:
-      short: Allow Currency Change
-      long: Allow users to change their currency via the currency picker.
     all_adjustments_closed: All adjustments successfully closed!
     all_adjustments_opened: All adjustments successfully opened!
     all_departments: All departments
@@ -664,7 +663,6 @@ en:
       jackets_and_coats: JACKET & COASTS
       new_collection: NEW COLLECTION
       special_offers: SPECIAL OFFERS
-      summer_2019: SUMMER 2019
     channel: Channel
     charged: Charged
     checkout: Checkout
@@ -697,7 +695,6 @@ en:
     confirm: Confirm
     confirm_delete: Confirm Deletion
     confirm_password: Password Confirmation
-    contact_email: Contact email
     contact_phone: Contact phone
     contact_us: Contact us
     continue: Continue
@@ -758,42 +755,14 @@ en:
     new_order_notifications_email: New Order Notifications Email
     cut: Cut
     cvv: CVV
+    no_cc_type: N/A
     cvv_response: CVV Response
     date: Date
     date_completed: Date Completed
     date_picker:
-      am: 'AM'
-      first_day: 0
-      format: ! '%Y/%m/%d'
-      hourAriaLabel: 'Hour'
-      js_format: Y/m/d
-      js_date_time: Y/m/d - H:i
-      minuteAriaLabel: 'Minute'
-      pm: 'PM'
-      rangeSeparator: ' to '
-      scrollTitle: 'Scroll to increment'
-      toggleTitle: 'Click to toggle'
-      weekAbbreviation: 'Wk'
-      yearAriaLabel: 'Year'
-      sun: 'Sun'
-      mon: 'Mon'
-      tue: 'Tue'
-      wed: 'Wed'
-      thu: 'Thu'
-      fri: 'Fri'
-      sat: 'Sat'
-      lh_jan: 'January'
-      lh_feb: 'February'
-      lh_mar: 'March'
-      lh_apr: 'April'
-      lh_may: 'May'
-      lh_jun: 'June'
-      lh_jul: 'July'
-      lh_aug: 'August'
-      lh_sep: 'September'
-      lh_oct: 'October'
-      lh_nov: 'November'
-      lh_dec: 'December'
+      # FlatPickr human friendly formatting
+      fpr_human_friendly_date_format: M j, Y
+      fpr_human_friendly_date_time_format: M j, Y at H:i
     date_range: Date Range
     default: Default
     default_country_cannot_be_deleted: Default country cannot be deleted
@@ -852,6 +821,7 @@ en:
         blank: can't be blank
         could_not_create_taxon: Could not create taxon
         no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
+        cannot_remove_icon: Cannot remove image
       services:
         get_shipping_rates:
           no_shipping_address: To generate Shipping Rates Order needs to have a Shipping Address
@@ -889,6 +859,7 @@ en:
     filename: Filename
     fill_in_customer_info: Please fill in customer info
     filter: Filter
+    filterable: Filterable
     filter_results: Filter Results
     finalize: Finalize
     find_a_taxon: Find a Taxon
@@ -901,7 +872,7 @@ en:
     flat_rate_per_order: Flat Rate
     flexible_rate: Flexible Rate
     follow_us: Follow us
-    footer_info: Footer info
+    footer: Footer
     forgot_password: Forgot password?
     free: Free
     free_shipping: Free Shipping
@@ -926,24 +897,6 @@ en:
     hide_from_subcategories_nav: Hide from subcategories navigation
     home: Home
     home_page: homepage
-    homepage:
-      bestsellers: BESTSELLERS
-      fashion_trends: FASHION TRENDS
-      fashion_trends_note: Want to rock this season’s hottest trend in style? These are the top fashion from Summer 2020 Fashion Weeks that are coming our way this season.
-      men: MEN
-      new: NEW
-      new_collection: NEW COLLECTION
-      read_more: READ MORE
-      shoes: SHOES
-      shop_now: SHOP NOW
-      sportswear: SPORTSWEAR
-      streetstyle: STREETSTYLE
-      summer_2020: Summer 2020
-      summer_collection:  Summer Collection
-      summer_sale: SUMMER SALE
-      trending: TRENDING
-      up_to_60: UP TO 60%
-      women: WOMEN
     help_center: Help Center
     i18n:
       available_locales: Available Locales
@@ -1130,6 +1083,7 @@ en:
     no_available_date_set: No available date set
     no_country: No country set
     no_payment_found: No payment found
+    no_payment_provider_settings_message: This payment provider has no custom settings available
     no_pending_payments: No pending payments
     no_product_available:
       for_this_quantity: Sorry, it looks like some products are not available in selected quantity.
@@ -1152,6 +1106,7 @@ en:
     not_found: ! '%{resource} is not found'
     note: Note
     notice_messages:
+      icon_removed: Image has been successfully removed
       prices_saved: Prices successfully saved
       product_cloned: Product has been cloned
       product_deleted: Product has been deleted
@@ -1252,6 +1207,7 @@ en:
     payment_processing_failed: Payment could not be processed, please check the details you entered
     payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
     payment_processor_choose_link: our payments page
+    payment_provider_settings: Payment Provider Settings
     payment_state: Payment State
     payment_states:
       balance_due: balance due
@@ -1436,6 +1392,7 @@ en:
     rejected: Rejected
     remember_me: Remember me
     remove: Remove
+    remove_image: Remove Image
     rename: Rename
     report: Report
     reports: Reports
@@ -1511,12 +1468,14 @@ en:
     select_a_return_authorization_reason: Select a reason for the return authorization
     select_a_stock_location: Select a stock location
     select_a_store_credit_reason: Select a reason for the store credit
+    select_an_option: Select an option
     select_stock: Select stock
     selected_quantity_not_available: ! 'selected of %{item} is not available.'
-    seo: SEO
     send_copy_of_all_mails_to: Send Copy of All Mails To
     send_mails_as: Send Mails As
-    seo_title: SEO title
+    seo: SEO
+    seo_robots: SEO Robots
+    seo_title: SEO Title
     server: Server
     server_error: The server returned an error
     settings: Settings
@@ -1570,15 +1529,15 @@ en:
     shopping_cart: Shopping Cart
     show: Show
     show_active: Show Active
-    show_currency_selector:
-      short: Show Currency Selector
-      long_html: Display the currency picker in the main nav bar. This will only display if there are multiple supported currencies, and <strong>Allow currency change</strong> option is enabled.
     show_deleted: Show Deleted
     show_discontinued: Show Discontinued
     show_only_complete_orders: Only show complete orders
     show_only_considered_risky: Only show risky orders
     show_property: Show Property
     show_rate_in_label: Show rate in label
+    show_store_selector:
+      short: Show Store selector
+      long: Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currency
     sign_up: Sign Up
     sku: SKU
     skus: SKUs
@@ -1652,6 +1611,18 @@ en:
       unable_to_create: Unable to create store.
       unable_to_update: Unable to update store.
       unable_to_delete: Unable to delete store.
+    store_form:
+      code_help: "Store unique identifier, which is an abbreviated version of the store’s name (used as the layout directory name, and also helpful for separating templates by store)"
+      checkout_zone_help: "Selecting zone will limit to which Countries or States products are shipped.
+        For more information <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>please see documentation</a>"
+      locales_help: "Install <a href='https://github.com/spree-contrib/spree_i18n target='_blank' class='alert-link'>Spree I18n extension</a> to add more locales"
+      social_help: "If you want to link to your social accounts in the footer part of your website please fill below fields"
+      default_country_help: "This is the Country that will be pre-selected on the Checkout Address form"
+      footer_help: "This content is visible in the footer section of your Store"
+      mail_from_address_help: "This is the email which will be the sender of all your Store emails (Order Confirmation, Shipment notification etc)"
+      customer_support_email_help: "This email is visible to your Store visitors in the Footer section"
+      new_order_notifications_email_help: "If you want to receive an email notification every time someone places an Order please provide an email address for that notification to be sent to"
+      seo_robots: "Please check <a href='https://developers.google.com/search/reference/robots_meta_tag' target='_blank'>this page for more help</a>"
     store_set_default_button: Set as default
     stores: Stores
     store_credit_name: Store Credit
@@ -1701,6 +1672,7 @@ en:
     summary: Summary
     supported_currencies: Supported Currencies
     supported_currencies_long: A comma separated list of supported currencies
+    supported_locales: Supported Locales
     tax: Tax
     tax_included: "Tax (incl.)"
     tax_categories: Tax Categories
@@ -1811,3 +1783,4 @@ en:
     zipcode_required: Zip Code Required
     zone: Zone
     zones: Zones
+    no_limits_zone: No Limits