alchemy-solidus 6.3.1 → 7.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 628affa5df0d55f3bf40f0609d3fcb7a13117211fe191ad18a65ff2b9fe8d089
4
- data.tar.gz: f887fabd4f2eeeb5f4e9225d0e3cbec5ef4af1ea120dd987c02789bc3c92dca3
3
+ metadata.gz: a00300118bc15c8ac5bdb72c531f87161dc9b96bf02a12e2e24b2ae96889d2bf
4
+ data.tar.gz: c88fd8a587782cab3f059fd634f8160bf09b5daacdc4ba2684a4b08ad1edf233
5
5
  SHA512:
6
- metadata.gz: 2d1a2eb2d4e0a8113bc0b46d32f397b1d8e943ce5716a93df7b8b99c92210a3bb52a2128e760d0db840295c4eabb5cfdf96a03d0e2e9ad26ffde56b9ec8f3f9a
7
- data.tar.gz: e6db47cc5296f2c5b64d1f03d2601193e072a9f2bac2582e9eea87785ba015edc283013edd31473b85ca9641673eee949f9431cd0d31b55c9e75deeb004ac50d
6
+ metadata.gz: e1cef57202eaf15a1b4174c1853d0ca23f981169d01a2e521aab07710ac88a0e6fb193f76d9cef0beb0db93aa3e2dbe7f084b99666031b5a5cc1288d3ecabcf3
7
+ data.tar.gz: dd070d028b041a37526c786fe0742b56f6dcbafe839aa0292c6e425cdc17ba735f8ece13eb1a32eba68814a781e9069b410ca41f806b0d53bb013e194592a61e
data/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2012-14, magic labs*
1
+ Copyright (c) Blish GmbH
2
2
  All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without modification,
data/README.md CHANGED
@@ -19,8 +19,9 @@ This is a [AlchemyCMS](https://alchemy-cms.com) and [Solidus](https://solidus.io
19
19
 
20
20
  ### Solidus
21
21
 
22
- This version runs with Solidus v3.0 and up.
22
+ This version runs with Solidus v4.0 and up.
23
23
 
24
+ - For a Solidus 3.x compatible version please use the `6.3-stable` branch or `6.3.1` gem version.
24
25
  - For a Solidus < 2.11 compatible version please use the `3.1-stable` branch or `3.3.0` gem version.
25
26
  - For a Solidus < 2.6 compatible version please use the `2.3-stable` branch or `2.3.2` gem version.
26
27
  - For a Solidus 1.x compatible version please use the `1.0-stable` branch or `1.1.0` gem version.
@@ -29,7 +30,7 @@ This version runs with Solidus v3.0 and up.
29
30
 
30
31
  ### Alchemy
31
32
 
32
- This version runs with Alchemy v7.0
33
+ This version runs with Alchemy v7.0 and v7.1
33
34
 
34
35
  - For a Alchemy 6.x compatible version please use the `5.0-stable` branch or `5.0` gem version.
35
36
  - For a Alchemy 5.x compatible version please use the `4.1-stable` branch or `4.1` gem version.
@@ -269,14 +270,14 @@ Please make yourself familiar with AlchemyCMS by [reading the guidelines](https:
269
270
  ```yaml
270
271
  # config/alchemy/elements.yml
271
272
  - name: product
272
- contents:
273
- - name: spree_product
274
- type: EssenceSpreeProduct
273
+ ingredients:
274
+ - role: spree_product
275
+ type: SpreeProduct
275
276
 
276
277
  - name: product_category
277
- contents:
278
- - name: spree_taxon
279
- type: EssenceSpreeTaxon
278
+ ingredients:
279
+ - role: spree_taxon
280
+ type: SpreeTaxon
280
281
  ```
281
282
 
282
283
  ### Generate the views
@@ -303,7 +304,7 @@ You can mix Alchemy and Solidus content in the same view.
303
304
  <!-- app/views/alchemy/elements/_product_view.html.erb -->
304
305
  <% cache element do %>
305
306
  <%= element_view_for element do |el| %>
306
- <% product = el.ingredient(:spree_product) %>
307
+ <% product = el.value(:spree_product) %>
307
308
  <h1><%= product.name %></h1>
308
309
  <p><%= product.description %></p>
309
310
  <%= el.render :text %>
@@ -321,7 +322,7 @@ Or for a list of taxon products
321
322
  <h2><%= el.render :headline %></h2>
322
323
  <%= el.render :description %>
323
324
 
324
- <% taxon = el.ingredient(:spree_taxon) %>
325
+ <% taxon = el.value(:spree_taxon) %>
325
326
  <% taxon.products.each do |product| %>
326
327
  <%= link_to product.name, spree.product_path(product) %>
327
328
  <% end %>
data/Rakefile CHANGED
@@ -12,25 +12,15 @@ RSpec::Core::RakeTask.new(:spec)
12
12
 
13
13
  task default: %i[test_setup spec]
14
14
 
15
- require "active_support/core_ext/string"
16
-
17
15
  desc "Setup test app"
18
16
  task :test_setup do
19
- solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.2")
20
- solidus_32_install_options =
21
- "--payment-method none --frontend none --no-with-authentication"
22
- solidus_33_install_options =
23
- "--payment-method none --frontend none --authentication none"
24
- solidus_install_options =
25
- (
26
- if solidus_version == "3.2"
27
- solidus_32_install_options
28
- else
29
- solidus_33_install_options
30
- end
31
- )
17
+ solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.3")
18
+ solidus_install_options = "--payment-method=none --frontend=none --authentication=none"
19
+ if solidus_version >= "4.3"
20
+ solidus_install_options += " --admin-preview=false"
21
+ end
32
22
  Dir.chdir("spec/dummy") do
33
- system <<-SETUP.strip_heredoc
23
+ system <<~SETUP
34
24
  bin/rake db:environment:set db:drop && \
35
25
  bin/rake gutentag:install:migrations && \
36
26
  bin/rails g gutentag:migration_versions && \
@@ -1,4 +1,4 @@
1
- <!-- insert_bottom "#overlay_tabs" -->
1
+ <!-- insert_bottom "div#overlay_tabs" -->
2
2
 
3
3
  <div id="overlay_tab_product_link">
4
4
  <%= render "product_link" %>
@@ -0,0 +1,5 @@
1
+ <!-- insert_bottom "sl-tab-group#overlay_tabs" -->
2
+
3
+ <sl-tab-panel name="overlay_tab_product_link" id="overlay_tab_product_link">
4
+ <%= render "product_link" %>
5
+ </sl-tab-panel>
@@ -0,0 +1,5 @@
1
+ <!-- insert_bottom "sl-tab-group#overlay_tabs" -->
2
+
3
+ <sl-tab slot="nav" panel="overlay_tab_product_link">
4
+ <%= Alchemy.t("link_overlay_tab_label.product") %>
5
+ </sl-tab>
@@ -1,4 +1,4 @@
1
- <%= form_tag do %>
1
+ <form data-link-form-type="product">
2
2
  <%= render_message do %>
3
3
  <h3><%= Alchemy.t(:choose_product_to_link) %></h3>
4
4
  <% end %>
@@ -23,8 +23,8 @@
23
23
  class: 'alchemy_selectbox link_target' %>
24
24
  </div>
25
25
  <div class="submit">
26
- <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'product' } %>
26
+ <%= button_tag Alchemy.t(:apply), class: "create-link button", data: { link_type: "product" } %>
27
27
  </div>
28
- <% end %>
28
+ </form>
29
29
 
30
30
  <%= render "product_link_script" %>
@@ -1,5 +1,5 @@
1
1
  module Alchemy
2
2
  module Solidus
3
- VERSION = "6.3.1"
3
+ VERSION = "7.0.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy-solidus
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.3.1
4
+ version: 7.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-11-10 00:00:00.000000000 Z
11
+ date: 2023-12-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: alchemy_cms
@@ -36,7 +36,7 @@ dependencies:
36
36
  requirements:
37
37
  - - ">="
38
38
  - !ruby/object:Gem::Version
39
- version: 3.0.0
39
+ version: 4.0.0
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
42
  version: '5'
@@ -46,7 +46,7 @@ dependencies:
46
46
  requirements:
47
47
  - - ">="
48
48
  - !ruby/object:Gem::Version
49
- version: 3.0.0
49
+ version: 4.0.0
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
52
  version: '5'
@@ -56,7 +56,7 @@ dependencies:
56
56
  requirements:
57
57
  - - ">="
58
58
  - !ruby/object:Gem::Version
59
- version: 3.0.0
59
+ version: 4.0.0
60
60
  - - "<"
61
61
  - !ruby/object:Gem::Version
62
62
  version: '5'
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - ">="
68
68
  - !ruby/object:Gem::Version
69
- version: 3.0.0
69
+ version: 4.0.0
70
70
  - - "<"
71
71
  - !ruby/object:Gem::Version
72
72
  version: '5'
@@ -246,6 +246,8 @@ files:
246
246
  - app/models/alchemy/ingredients/spree_taxon.rb
247
247
  - app/models/alchemy/ingredients/spree_variant.rb
248
248
  - app/overrides/alchemy/admin/pages/link/product_link.html.erb.deface
249
+ - app/overrides/alchemy/admin/pages/link/product_link_panel.html.erb.deface
250
+ - app/overrides/alchemy/admin/pages/link/product_link_sl_tab.html.erb.deface
249
251
  - app/overrides/alchemy/admin/pages/link/product_link_tab.html.erb.deface
250
252
  - app/views/alchemy/admin/pages/_product_link.html.erb
251
253
  - app/views/alchemy/admin/pages/_product_link_script.html.erb
@@ -295,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
295
297
  - !ruby/object:Gem::Version
296
298
  version: '0'
297
299
  requirements: []
298
- rubygems_version: 3.4.17
300
+ rubygems_version: 3.5.3
299
301
  signing_key:
300
302
  specification_version: 4
301
303
  summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible