solidus_prototypes 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d83dc71469d1dad717c3058dc548f9065d3c9c57238e5ecea5bda3cf3a0c1de
-  data.tar.gz: 36d898e6da0f7c5a5fb19b7bb0a6d0a738bd96cde95216caae9aa8aa2f83db6c
+  metadata.gz: 90f94cb13627efd23d918c9faadc003c54cb283d004583ac0e43a6781d315313
+  data.tar.gz: a9a74751289418a0927c211e322ee7bb62fb4fe23148002c0cc9db9c18e39627
 SHA512:
-  metadata.gz: '082f9e4f51cab60a37d0c56307f0c947e8a0a13720889cf91cef0c48bc3cf1a438acc21acf07260c33085a4b27177da47be7134225f6755772a9b5483e2ff5d3'
-  data.tar.gz: 1dad4d8afe0306dc7ba8076c7792a3fd5c5e06cc876042fa6200d284369adee3b098db26805bcdb88194366f5c0c37216cc3614f7a422268d7b3a9f5ff0ecd28
+  metadata.gz: 9a7767d35181a881c1b8ee5dc141f6d3150d27788a206286adb1373bc68c4736266e78e965adb65b92563dc041f50f13be22f18edd7dd19a026a0a5a9850c4ec
+  data.tar.gz: 791398d09ee5122b45c07ed201d184ea5fcd419f3e70c953a3f2013bd7ce1fb9ebf77cbc9ff93f6601a501c9addb4ccfb3b8580159cdfc66fa3a3ba7860a2267

data/.gitignore

@@ -15,3 +15,4 @@ pkg
 spec/dummy
 spec/examples.txt
 .ruby-version
+sandbox

data/CHANGELOG.md

@@ -1,12 +1,19 @@
 # Changelog
 
-## [v1.4.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.4.0) (2023-11-07)
+## [v1.5.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.5.0) (2024-04-17)
 
-[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.3.0...v1.4.0)
+[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.4.0...v1.5.0)
 
 **Merged pull requests:**
 
+- Fix option\_values\_hash form field name name [\#65](https://github.com/solidusio-contrib/solidus_prototypes/pull/65) ([tvdeyen](https://github.com/tvdeyen))
+- Replace Deface Override with Deface DSL [\#64](https://github.com/solidusio-contrib/solidus_prototypes/pull/64) ([sascha-karnatz](https://github.com/sascha-karnatz))
 - Add Solidus 4.0, 4.1, 4.2 and 4.3 support [\#63](https://github.com/solidusio-contrib/solidus_prototypes/pull/63) ([tvdeyen](https://github.com/tvdeyen))
+- Admin UI fixes [\#62](https://github.com/solidusio-contrib/solidus_prototypes/pull/62) ([tvdeyen](https://github.com/tvdeyen))
+
+## [v1.4.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.4.0) (2023-11-07)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.3.0...v1.4.0)
 
 ## [v1.3.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.3.0) (2023-03-27)
 

data/Gemfile

@@ -29,3 +29,5 @@ gemspec
 # Use a local Gemfile to include development dependencies that might not be
 # relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`.
 send :eval_gemfile, 'Gemfile-local' if File.exist? 'Gemfile-local'
+
+gem 'debug'

data/README.md

@@ -1,7 +1,7 @@
 SolidusPrototypes
 ================
 
-[![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_prototypes.svg?style=svg)](https://circleci.com/gh/solidusio-contrib/solidus_prototypes)
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/solidusio-contrib/solidus_prototypes/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/solidusio-contrib/solidus_prototypes/tree/main)
 
 Prototype extension for Solidus.
 

data/app/overrides/spree/admin/product_properties/index/prototype_product_properties_form.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_after '[data-hook="add_product_properties"]' enabled -->
+<div id='prototypes' data-hook></div>

data/app/{views/spree/shared/_prototypes_product_properties_toolbar.html.erb → overrides/spree/admin/product_properties/index/prototypes_product_properties_toolbar.html.erb.deface}

@@ -1,3 +1,4 @@
+<!-- insert_bottom 'ul.tollbar' enabled -->
 <li>
   <span id="new_ptype_link">
     <%= link_to I18n.t('spree.select_from_prototype'), available_admin_prototypes_url, :remote => true, :class => 'button fa fa-copy' %>

data/app/{views/spree/admin/prototypes/_products_form.html.erb → overrides/spree/admin/products/_form/prototypes_admin_products_form.html.erb.deface}

@@ -1,3 +1,4 @@
+<!-- insert_before '[data-hook="admin_product_form_taxons"]' enabled -->
 <% if f.object.new_record? %>
   <%= f.field_container :prototype do %>
     <%= f.label :prototype_id, Spree::Prototype.model_name.human %><br />

data/app/{views/spree/admin/prototypes/_products_new.html.erb → overrides/spree/admin/products/new/prototypes_admin_products_new.html.erb.deface}

@@ -1,3 +1,4 @@
+<!-- insert_before '[data-hook="new_product_price"]' enabled -->
 <div data-hook="new_product_prototype" class="col-3">
   <%= f.field_container :prototype do %>
     <%= f.label :prototype_id, Spree::Prototype.model_name.human %><br />

data/app/{views/spree/admin/prototypes/_products_new_clearfix.html.erb → overrides/spree/admin/products/new/prototypes_admin_products_new_clearfix.html.erb.deface}

@@ -1,3 +1,4 @@
+<!-- insert_after '[data-hook="new_product_tax_category"]' enabled -->
 <div class="clearfix" data-hook="product-from-prototype" id="product-from-prototype">
   <%= render :file => 'spree/admin/prototypes/show' if @prototype %>
 </div>

data/app/overrides/spree/admin/shared/_product_sub_menu/prototypes_admin_tab.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_bottom '[data-hook="admin_product_sub_tabs"]' -->
+<%= tab :prototypes if can?(:admin, Spree::Prototype) %>

data/app/views/spree/admin/prototypes/index.html.erb

@@ -5,14 +5,11 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Prototype) %>
     <li id="new_prototype_link">
-      <%= link_to I18n.t('spree.new_prototype'), new_admin_prototype_url, {:remote => true, :id => 'new_prototype_link'} %>
+      <%= link_to I18n.t('spree.new_prototype'), spree.new_admin_prototype_url, { class: "btn btn-primary" } %>
     </li>
   <% end %>
 <% end %>
 
-<%# Placeholder for new prototype form %>
-<div id="new_prototype_container"></div>
-
 <% if @prototypes.any? %>
 <table class="index" id='listing_prototypes' data-hook>
   <colgroup>

data/app/views/spree/admin/prototypes/show.html.erb

@@ -11,7 +11,7 @@
         <ul class="option-type-values">
         <% ot.option_values.each do |ov| %>
           <li>
-            <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), :id => "option_value_#{ov.id}", :class => "option-value" %>
+            <%= check_box_tag "product[option_values_hash][#{ot.id}][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), :id => "option_value_#{ov.id}", :class => "option-value" %>
             <%= label_tag "option_value_#{ov.id}", ov.presentation %>
           </li>
         <% end %>

data/bin/rails

@@ -1,15 +1,7 @@
 #!/usr/bin/env ruby
 
-# frozen_string_literal: true
-
-app_root = 'spec/dummy'
-
-unless File.exist? "#{app_root}/bin/rails"
-  system "bin/rake", app_root or begin # rubocop:disable Style/AndOr
-    warn "Automatic creation of the dummy app failed"
-    exit 1
-  end
+if %w[g generate].include? ARGV.first
+  exec "#{__dir__}/rails-engine", *ARGV
+else
+  exec "#{__dir__}/rails-sandbox", *ARGV
 end
-
-Dir.chdir app_root
-exec 'bin/rails', *ARGV

data/bin/rails-engine

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/solidus_prototypes/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/bin/rails-sandbox

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin
+      warn 'Automatic creation of the sandbox app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/rake

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/setup

@@ -5,4 +5,4 @@ set -vx
 
 gem install bundler --conservative
 bundle update
-bundle exec rake clobber
+bin/rake clobber

data/lib/solidus_prototypes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusPrototypes
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end