solidus_core 4.3.2 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7208af9a654942a18300e8715c423f9db815aff705b89eb0417da2c0bd6631
-  data.tar.gz: 024e53ee6af50168922601bb6f55be13e2601ad5bfa93a20d039aa64d44139b2
+  metadata.gz: ea120769fbc14df12db50f04ac8d60a7c6bc3de7980da4311b3a67e2483a5033
+  data.tar.gz: 2f5e3466c7e09fde1e015400c044e785bb9dd177a6a2b69fd67ae0d32cd561a4
 SHA512:
-  metadata.gz: 1737b8f1da9c82d7d36cc2335c88312a54b4d0b2d9f854b4e6e47c59b9977086473ee5c4366760342c59792d45351ef1cdd6837de1f83dfe75b29a5ddb3bb7e8
-  data.tar.gz: dfbed219adaf6a29a7bf5a811f1e4685cd4c2b136ac9897a72c7754b9abe69f87f2a86559f6d70d0e0fc4a4b725f55960157e773e53be6fa918917869152cf65
+  metadata.gz: 304df05695271fc1d8011e563688fb1078f9dc5e81f136576f84c1fbd2291f7514cfbff613df8d45520ed24a9ee82283635d2dd13c2cfb68adee3caa4367e817
+  data.tar.gz: 2a9a5f58a7de0bbac0d4ecc2691898ad0a826137d7d25396479cec9880b449afa822509d79146bc88f4dc9e901d762e2d195e53e8b65c9e8c9f1f1945d1771a2

data/db/migrate/20231031175215_add_promotion_order_promotion_foreign_key.rb

@@ -5,6 +5,6 @@ class AddPromotionOrderPromotionForeignKey < ActiveRecord::Migration[7.0]
   end
 
   def down
-    remove_foreign_key :spree_orders_promotions, :spree_orders
+    remove_foreign_key :spree_orders_promotions, :spree_promotions
   end
 end

data/lib/generators/solidus/install/install_generator.rb

@@ -35,6 +35,7 @@ module Solidus
     class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations and seeds must be run)'
     class_option :active_storage, type: :boolean, default: true, banner: 'Install ActiveStorage as image attachments handler for products and taxons'
     class_option :admin_preview, type: :boolean, default: true, desc: 'Install the admin preview'
+    class_option :build_admin_tailwind, type: :boolean, default: true, desc: 'Build and install Solidus Admin Tailwind CSS file and rake tasks'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -175,20 +176,22 @@ module Solidus
       end
     end
 
-    def install_solidus_admin
-      return unless options[:admin_preview]
-
-      say_status :installing, "SolidusAdmin", :blue
-      bundle_command 'add solidus_admin -v ">= 0.2"'
-      generate 'solidus_admin:install'
-    end
-
     def install_subcomponents
       apply_template_for :authentication, @selected_authentication
       apply_template_for :frontend, @selected_frontend
       apply_template_for :payment_method, @selected_payment_method
     end
 
+    def install_solidus_admin
+      return unless options[:admin_preview]
+
+      say_status :installing, "SolidusAdmin", :blue
+      unless File.read(app_path.join('Gemfile')).include?('solidus_admin')
+        bundle_command 'add solidus_admin -v ">= 0.2"'
+      end
+      generate "solidus_admin:install #{'--tailwind' if options[:build_admin_tailwind]}"
+    end
+
     def populate_seed_data
       if @load_seed_data
         say_status :loading, "seed data"

data/lib/spree/app_configuration.rb

@@ -22,6 +22,8 @@ require "spree/core/search/variant"
 require 'spree/preferences/configuration'
 require 'spree/core/environment'
 
+require 'uri'
+
 module Spree
   class AppConfiguration < Preferences::Configuration
     # Preferences (alphabetized to more easily lookup particular preferences)

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.3.2"
+  VERSION = "4.3.4"
 
   def self.solidus_version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1052,7 +1052,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.