alchemy-solidus 7.3.0 → 7.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823fe7fab5027f254ca1440418ca0f5957e3e4825dba007096b8fd5268694141
-  data.tar.gz: cb223e06aa86c2a2cffed82b594e03d6febe9004b0fe55787b47b2ce76a5c3a0
+  metadata.gz: e1182b12b2857cdeccf70d46d97155050830a92816754f5992d99441ff0b92f0
+  data.tar.gz: 6f1a5626551ac48979ab6f50458ed302dc2195d1e7e29db37daab95b90edebc0
 SHA512:
-  metadata.gz: ff3cadb5fc31dc7603910e487cbaf59e13edf00f764ddb38af6dcd25f745b53e83a286ece56829acb34bcda3711210cb6144ae1cf3488a95cf00a0c48c06ecf2
-  data.tar.gz: 061dbe3d8ccf9c1884dac806d44737f9e6e5f0d605da197f517200f2fd2a40dd0a1820c5b08e28d62d02eb3deb07346dbb3de68e55fc91c4b2344844e7efa755
+  metadata.gz: 7c6c6cfe0857555870618beb4deb66491c7c168cb3c66f870b1120c1110631cd7583fb8d661a7420daa074ff42f17e3c4b0fc613dabca5a40afe284622e24fe7
+  data.tar.gz: c5ecac53e8b876e2ad839fda98e478d55693f403576ca5f42f93e7eca0fb51c2da58f03b339bc355884f29f6bdc35036786ebb59c89f26ef8d120117fe3c9ec1

data/README.md

@@ -30,8 +30,9 @@ This version runs with Solidus v4.0 and up.
 
 ### Alchemy
 
-This version runs with Alchemy v7.0 and v7.1
+This version runs with Alchemy v7.2
 
+- For a Alchemy 7.0/7.1 compatible version please use the `7.2-stable` branch or `7.2` gem version.
 - For a Alchemy 6.x compatible version please use the `5.0-stable` branch or `5.0` gem version.
 - For a Alchemy 5.x compatible version please use the `4.1-stable` branch or `4.1` gem version.
 - For a Alchemy 4.x compatible version please use the `3.1-stable` branch or `3.3` gem version.

data/app/assets/javascripts/alchemy/solidus/admin/variant_select.js

@@ -1,32 +1,55 @@
 //= require alchemy/solidus/admin/select2_config
 
-$.fn.alchemyVariantSelect = function(options) {
-  var config = Alchemy.Solidus.getSelect2Config(options)
+$.fn.alchemyVariantSelect = function (options) {
+  const config = Alchemy.Solidus.getSelect2Config(options)
 
-  this.select2($.extend(true, config, {
-    ajax: {
-      data: function(term, page) {
-        return {
-          q: $.extend({
-            product_name_or_sku_cont: term
-          }, options.query_params),
-          page: page
-        }
+  function formatSelection(variant) {
+    return variant.options_text
+      ? `${variant.name} - ${variant.options_text}`
+      : variant.name
+  }
+
+  function formatResult(variant, _el, query) {
+    const matchTerm = new RegExp(query.term, "gi")
+    const formatMatch = (match) => `<em>${match}</em>`
+    const name = variant.name.replace(matchTerm, formatMatch)
+    const sku = variant.sku.replace(matchTerm, formatMatch)
+    return `
+      <div class="variant-select-result">
+        <div>
+          <span>${name}</span>
+        </div>
+        <div>
+          <span>${variant.options_text}</span>
+          <span>${sku}</span>
+        </div>
+      </div>
+    `
+  }
+
+  this.select2(
+    $.extend(true, config, {
+      ajax: {
+        data: function (term, page) {
+          return {
+            q: $.extend(
+              {
+                product_name_or_sku_cont: term,
+              },
+              options.query_params
+            ),
+            page: page,
+          }
+        },
+        results: function (data, page) {
+          return {
+            results: data.variants,
+            more: page * data.per_page < data.total_count,
+          }
+        },
       },
-      results: function(data, page) {
-        return {
-          results: data.variants.map(function(variant) {
-            return {
-              id: variant.id,
-              text: variant.frontend_display
-            }
-          }),
-          more: page * data.per_page < data.total_count
-        }
-      }
-    },
-    formatSelection: function(variant) {
-      return variant.text || variant.frontend_display
-    }
-  }))
+      formatSelection,
+      formatResult,
+    })
+  )
 }

data/app/views/alchemy/ingredients/_spree_variant_editor.html.erb

@@ -10,6 +10,25 @@
   <% end %>
 <% end %>
 
+<style>
+  .variant-select-result > * {
+    display: flex;
+    justify-content: space-between;
+    min-height: 16px;
+
+    > span {
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    &:last-child {
+      color: hsl(224, 8%, 63%);
+    }
+  }
+</style>
+
 <script>
   $('#<%= spree_variant_editor.form_field_id(:variant_id) %>').alchemyVariantSelect({
     placeholder: "<%= Alchemy.t(:search_variant, scope: 'solidus') %>",
@@ -19,7 +38,8 @@
     <% if spree_variant_editor.variant %>
     initialSelection: {
       id: <%= spree_variant_editor.variant.id %>,
-      text: "<%= spree_variant_editor.variant.name %>"
+      name: "<%= spree_variant_editor.variant.name %>",
+      options_text: "<%= spree_variant_editor.variant.options_text %>"
     }
     <% end %>
   })

data/lib/alchemy/solidus/spree_user_extension.rb

@@ -5,6 +5,10 @@ module Alchemy
         klass.has_many :folded_pages, class_name: "Alchemy::FoldedPage"
       end
 
+      def alchemy_display_name
+        email
+      end
+
       def alchemy_roles
         if has_spree_role?(:admin)
           %w(admin)

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "7.3.0"
+    VERSION = "7.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.3.2
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0.rc1
+        version: 7.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0.rc1
+        version: 7.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible