spree_core 4.3.0.rc2 → 4.3.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d280751e897448ce4593ebe1d5f2fc9cd823e998699864ac8b52d2dfa28b49d6
-  data.tar.gz: 21ed38407942b369d6a7a2360730190a124264bd9b8137e79c49d4058fac16f6
+  metadata.gz: 9fd663cedb276d7b23b137c9ff65cb153f986deee175e19672198a5ba9078707
+  data.tar.gz: d9105ced36ac4078df6963e6ca7cd9c2e45bfec3dbed2b2872ff76c99d05dfb3
 SHA512:
-  metadata.gz: 803917626fa68a87c54fd9d88dbb2388e84fefce8873ef3a7a96e7a49e1a1a7a9b327864a7c222fc31006795eaefbf10c12db584e5cd308b19464617b3235b80
-  data.tar.gz: f1ecb88f76d6061727b9bd569f24ae672491507248584106d1be936a2dfb3c78a1a1693b0affb84d0f8e34fe2991346b2884386ac7ac67df838408a81d10bc85
+  metadata.gz: db4eb2dfeeca9a7acb56d3146b1e73a97485eec348e9b9537b3145f3ce1c8fc66a7b48d3a68c177fac4cf5d9c93ed7a47738487e034a9698e0eb2f5dba2025de
+  data.tar.gz: fecab76acd9f180cc9cbe79d23a11f26a2cd86c86ca83e9157b9d8dbe1e475de8d59fea914b75bcab2dc29a4edc1b40074ed056f528abbd96a2750e3088f80df

data/app/finders/spree/taxons/find.rb

@@ -3,16 +3,18 @@ module Spree
     class Find
       def initialize(scope:, params:)
         @scope = scope
-        @ids      = String(params.dig(:filter, :ids)).split(',')
-        @parent   = params.dig(:filter, :parent_id)
-        @taxonomy = params.dig(:filter, :taxonomy_id)
-        @name     = params.dig(:filter, :name)
-        @roots    = params.dig(:filter, :roots)
+        @ids              = String(params.dig(:filter, :ids)).split(',')
+        @parent           = params.dig(:filter, :parent_id)
+        @parent_permalink = params.dig(:filter, :parent_permalink)
+        @taxonomy         = params.dig(:filter, :taxonomy_id)
+        @name             = params.dig(:filter, :name)
+        @roots            = params.dig(:filter, :roots)
       end
 
       def execute
         taxons = by_ids(scope)
         taxons = by_parent(taxons)
+        taxons = by_parent_permalink(taxons)
         taxons = by_taxonomy(taxons)
         taxons = by_roots(taxons)
         taxons = by_name(taxons)
@@ -22,7 +24,7 @@ module Spree
 
       private
 
-      attr_reader :ids, :parent, :taxonomy, :roots, :name, :scope
+      attr_reader :ids, :parent, :parent_permalink, :taxonomy, :roots, :name, :scope
 
       def ids?
         ids.present?
@@ -32,6 +34,10 @@ module Spree
         parent.present?
       end
 
+      def parent_permalink?
+        parent_permalink.present?
+      end
+
       def taxonomy?
         taxonomy.present?
       end
@@ -60,6 +66,16 @@ module Spree
         taxons.where(parent_id: parent)
       end
 
+      def by_parent_permalink(taxons)
+        return taxons unless parent_permalink?
+
+        if Rails::VERSION::STRING >= '6.1'
+          taxons.joins(:parent).where(parent: { permalink: parent_permalink })
+        else
+          taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").where(["parent_taxon.permalink = ?", parent_permalink])
+        end
+      end
+
       def by_taxonomy(taxons)
         return taxons unless taxonomy?
 

data/app/helpers/spree/base_helper.rb

@@ -246,11 +246,13 @@ module Spree
         options = options.first || {}
         options[:alt] ||= product.name
         image_path = default_image_for_product_or_variant(product)
-        if image_path.present?
-          create_product_image_tag image_path, product, options, style
-        else
-          image_tag "noimage/#{style}.png", options
-        end
+        img = if image_path.present?
+                create_product_image_tag image_path, product, options, style
+              else
+               inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%"
+              end
+
+        content_tag(:div, img, class: "admin-product-image-container #{style}-img")
       end
     end
 

data/app/models/concerns/spree/image_methods.rb

@@ -0,0 +1,24 @@
+module Spree
+  module ImageMethods
+    extend ActiveSupport::Concern
+
+    def generate_url(size:, gravity: 'center', quality: 80, background: 'show')
+      return if size.blank?
+      size = size.gsub(/\s+/, '')
+
+      return unless size.match(/(\d+)x(\d+)/)
+
+      polymorphic_path(attachment.variant(
+        gravity: gravity,
+        resize: size,
+        extent: size,
+        background: background,
+        quality: quality.to_i
+      ), only_path: true)
+    end
+
+    def original_url
+      polymorphic_path(attachment, only_path: true)
+    end
+  end
+end

data/app/models/spree/gateway/bogus.rb

@@ -9,14 +9,12 @@ module Spree
 
     attr_accessor :test
 
+    preference :dummy_key, :string, default: 'PUBLICKEY123'
+
     def provider_class
       self.class
     end
 
-    def preferences
-      {}
-    end
-
     def create_profile(payment)
       return if payment.source.has_payment_profile?
 
@@ -88,5 +86,9 @@ module Spree
       end
       random
     end
+
+    def public_preference_keys
+      [:dummy_key]
+    end
   end
 end

data/app/models/spree/image.rb

@@ -2,6 +2,7 @@ module Spree
   class Image < Asset
     include Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
+    include ::Spree::ImageMethods
 
     # In Rails 5.x class constants are being undefined/redefined during the code reloading process
     # in a rails development environment, after which the actual ruby objects stored in those class constants
@@ -15,13 +16,8 @@ module Spree
         width, height = size.chop.split('x')
 
         {
-          url: polymorphic_path(attachment.variant(
-                                  gravity: 'center',
-                                  resize: size,
-                                  extent: size,
-                                  background: 'snow2',
-                                  quality: 80
-                                ), only_path: true),
+          url: generate_url(size: size),
+          size: size,
           width: width,
           height: height
         }
@@ -35,13 +31,7 @@ module Spree
       width, height = size.chop.split('x')
 
       {
-        url: polymorphic_path(attachment.variant(
-                                gravity: 'center',
-                                resize: size,
-                                extent: size,
-                                background: 'snow2',
-                                quality: 80
-                              ), only_path: true),
+        url: generate_url(size: size),
         size: size,
         width: width,
         height: height
@@ -59,16 +49,7 @@ module Spree
     end
 
     def plp_url
-      size = self.class.styles[:plp_and_carousel]
-      variant = attachment.variant(
-        gravity: 'center',
-        resize: size,
-        extent: size,
-        background: 'snow2',
-        quality: 80
-      )
-
-      polymorphic_path(variant, only_path: true)
+      generate_url(size: self.class.styles[:plp_and_carousel])
     end
   end
 end

data/app/models/spree/payment_method.rb

@@ -87,5 +87,17 @@ module Spree
 
       store_ids.include?(store.id)
     end
+
+    def public_preferences
+      public_preference_keys.each_with_object({}) do |key, hash|
+        hash[key] = preferences[key]
+      end
+    end
+
+    protected
+
+    def public_preference_keys
+      []
+    end
   end
 end

data/app/models/spree/taxon_image.rb

@@ -2,6 +2,7 @@ module Spree
   class TaxonImage < Asset
     include Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
+    include ::Spree::ImageMethods
 
     def styles
       self.class.styles.map do |_, size|

data/app/sorters/spree/base_sorter.rb

@@ -2,34 +2,46 @@ module Spree
   class BaseSorter
     def initialize(scope, params = {}, allowed_sort_attributes = [])
       @scope = scope
-      @sort = params[:sort]
       @allowed_sort_attributes = allowed_sort_attributes
+      @sort = sort_fields(params[:sort])
     end
 
     def call
-      by_param_attribute(scope)
+      by_param_attributes(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)
+    def by_param_attributes(scope)
+      return scope if sort.empty?
 
-      scope.order("#{sort_field}": order_direction)
+      sort.each do |value, order|
+        next if value.blank? || allowed_sort_attributes.exclude?(value.to_sym)
+
+        scope = scope.order("#{value}": order)
+      end
+
+      scope
+    end
+
+    def sort_fields(sort)
+      return [] if sort.nil?
+
+      sort.split(',').map { |field| [sort_field(field), order_direction(field)] }
     end
 
-    def desc_order
-      @desc_order ||= String(sort)[0] == '-'
+    def desc_order(field)
+      String(field)[0] == '-'
     end
 
-    def sort_field
-      @sort_field ||= desc_order ? sort[1..-1] : sort
+    def sort_field(field)
+      desc_order(field) ? field[1..-1] : field
     end
 
-    def order_direction
-      desc_order ? :desc : :asc
+    def order_direction(field)
+      desc_order(field) ? :desc : :asc
     end
   end
 end

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

@@ -7,8 +7,9 @@ module Spree
       end
 
       def call
-        products = by_param_attribute(scope)
+        products = by_param_attributes(scope)
         products = by_price(products)
+        products = by_sku(products)
 
         products.distinct
       end
@@ -17,18 +18,27 @@ module Spree
 
       attr_reader :sort, :scope, :currency, :allowed_sort_attributes
 
-      def price?
-        sort_field == 'price'
-      end
-
       def by_price(scope)
-        return scope unless price?
+        return scope unless (value = sort_by?('price'))
 
         scope.joins(master: :prices).
           select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").
           distinct.
           where(spree_prices: { currency: currency }).
-          order("#{Spree::Price.table_name}.amount #{order_direction}")
+          order("#{Spree::Price.table_name}.amount #{value[1]}")
+      end
+
+      def by_sku(scope)
+        return scope unless (value = sort_by?('sku'))
+
+        scope.joins(:master).
+          select("#{Spree::Product.table_name}.*, #{Spree::Variant.table_name}.sku").
+          where(Spree::Variant.table_name.to_s => { is_master: true }).
+          order("#{Spree::Variant.table_name}.sku #{value[1]}")
+      end
+
+      def sort_by?(field)
+        sort.detect { |s| s[0] == field }
       end
     end
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.3.0.rc2'.freeze
+  VERSION = '4.3.0.rc3'.freeze
 
   def self.version
     VERSION

data/lib/spree/permitted_attributes.rb

@@ -8,6 +8,8 @@ module Spree
       :image_attributes,
       :inventory_unit_attributes,
       :line_item_attributes,
+      :menu_attributes,
+      :menu_item_attributes,
       :option_type_attributes,
       :option_value_attributes,
       :payment_attributes,
@@ -62,6 +64,11 @@ module Spree
 
     @@line_item_attributes = [:id, :variant_id, :quantity]
 
+    @@menu_attributes = [:name, :locale, :location]
+
+    @@menu_item_attributes = [:name, :subtite, :destination, :new_window, :item_type,
+                              :linked_resource_type, :linked_resource_id, :code, :menu_id]
+
     @@option_type_attributes = [:name, :presentation, :option_values_attributes]
 
     @@option_value_attributes = [:name, :presentation]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc2
+  version: 4.3.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -472,6 +472,7 @@ files:
 - app/models/concerns/spree/display_link.rb
 - app/models/concerns/spree/display_money.rb
 - app/models/concerns/spree/filter_param.rb
+- app/models/concerns/spree/image_methods.rb
 - app/models/concerns/spree/memoized_data.rb
 - app/models/concerns/spree/multi_store_resource.rb
 - app/models/concerns/spree/named_type.rb
@@ -1193,9 +1194,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0.rc2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0.rc3
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc2
+  source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc3
 post_install_message:
 rdoc_options: []
 require_paths: