solidus_frontend 3.3.0.alpha → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d692c8cf2e9d644d15bf0ff289e7c3a66fa43f852a6326d75018a2a4002e637
-  data.tar.gz: 9961933922ae35466d194483514adafb8c89b4181d22c5175616b3a50e13afb0
+  metadata.gz: 47e06ab674abc80fad6b3e70bae98c3e6bc40484a11875492bfb8aea897770e0
+  data.tar.gz: b51d9084b6812a51af3fe08bb4c408d135a5d52af52517528cdbf749c548cca2
 SHA512:
-  metadata.gz: 7c4bf55673759c0c081d546d9f1ef416f05035548e49e6f1f36e3f54956cc18914af1fd71ef0d323844dad2f3ccd2fe0095e5d7016431d9fabffbb743395d617
-  data.tar.gz: 9b16f639cc7c8b6e3e2f70f73ee444c6cb20916b542761f3068faf0ac965c6084f57c3f706522abfa13b87e55b5d339594d95297d03956058808afffaac13e1e
+  metadata.gz: d3c8ca41ce443bd5d77bab54f229badded11da401ad1261e280e07abb800abee5d8e73a9d287ce171b0428fdbabf0b08b54f996ddf365e3708f28d84975b77a3
+  data.tar.gz: 38852e9366c86475fbe0ef683e79187c8e4faf06453db6bce427739d0dfc1d9988c037eed0b49dc85c3025f3032b97d192eb1dff2b362d1c16096084ff63286f

data/.circleci/config.yml

@@ -2,6 +2,7 @@ version: 2.1
 
 orbs:
   browser-tools: circleci/browser-tools@1.3
+  slack: circleci/slack@4.9.3
 
   # Always take the latest version of the orb, this allows us to
   # run specs against Solidus supported versions only without the need
@@ -14,7 +15,16 @@ commands:
     steps:
       - run:
           name: Install libvips
-          command: sudo apt-get install -y libvips
+          command: |
+            sudo apt-get update
+            sudo apt-get install -yq libvips-dev
+
+  notify:
+    steps:
+      - slack/notify:
+          event: fail
+          template: basic_fail_1
+          branch_pattern: master, v[0-9]+\.[0-9]+
 
 jobs:
   run-specs-with-postgres:
@@ -26,6 +36,7 @@ jobs:
       - libvips
       - solidusio_extensions/run-tests-solidus-master
       - solidusio_extensions/store-test-results
+      - notify
   run-specs-with-mysql:
     executor: solidusio_extensions/mysql
     steps:
@@ -35,16 +46,20 @@ jobs:
       - libvips
       - solidusio_extensions/run-tests-solidus-master
       - solidusio_extensions/store-test-results
+      - notify
   lint-code:
     executor: solidusio_extensions/sqlite-memory
     steps:
       - solidusio_extensions/lint-code
+      - notify
 
 workflows:
   "Run specs on supported Solidus versions":
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
+      - run-specs-with-postgres:
+          context: slack-secrets
+      - run-specs-with-mysql:
+          context: slack-secrets
 
   "Weekly run specs against master":
     triggers:
@@ -55,5 +70,7 @@ workflows:
               only:
                 - master
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
+      - run-specs-with-postgres:
+          context: slack-secrets
+      - run-specs-with-mysql:
+          context: slack-secrets

data/.github/stale.yml

@@ -1,17 +1 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: false
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It might be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+_extends: .github

data/CHANGELOG.md

@@ -1,6 +1,33 @@
 # Changelog
 
-## Solidus 3.2.0 (v3.2, 2022-08-18)
+## Solidus v3.3.0 (v3.3, 2023-01-24)
+
+- Fix CircleCI errors due to libvips not being found [#27](https://github.com/solidusio/solidus_frontend/pull/27) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Update Changelog with latest released versions [#26](https://github.com/solidusio/solidus_frontend/pull/26) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- [v3.2] Notify CI failures on Slack [#25](https://github.com/solidusio/solidus_frontend/pull/25) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Notify CI failures on Slack [#24](https://github.com/solidusio/solidus_frontend/pull/24) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Touch the robots file before appending to it [#18](https://github.com/solidusio/solidus_frontend/pull/18) ([elia](https://github.com/elia))
+- Handle robots in here [#17](https://github.com/solidusio/solidus_frontend/pull/17) ([elia](https://github.com/elia))
+- [v3.2] Skip trying to install solidus_bolt when there's no Gemfile [#16](https://github.com/solidusio/solidus_frontend/pull/16) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Skip trying to install solidus_bolt when there's no Gemfile [#15](https://github.com/solidusio/solidus_frontend/pull/15) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Ask whether to add solidus_bolt during installation [#14](https://github.com/solidusio/solidus_frontend/pull/14) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- Fix display of tax adjustments in checkout [#11](https://github.com/solidusio/solidus_frontend/pull/11) ([adammathys](https://github.com/adammathys))
+- Utilize Rails redirect methods [#9](https://github.com/solidusio/solidus_frontend/pull/9) ([cpfergus1](https://github.com/cpfergus1))
+- Bump version to 3.3.0.alpha [#6](https://github.com/solidusio/solidus_frontend/pull/6) ([waiting-for-dev](https://github.com/waiting-for-dev))
+
+## Solidus v3.2.5 (v3.2, 2022-12-23)
+
+## Solidus v3.2.4 (v3.2, 2022-11-09)
+
+## Solidus v3.2.3 (v3.2, 2022-11-03)
+
+## Solidus v3.2.2 (v3.2, 2022-09-09)
+
+-  Ask whether to add solidus_bolt during installation [#14](https://github.com/solidusio/solidus_frontend/pull/14) ([waiting-for-dev](https://github.com/waiting-for-dev))
+
+## Solidus v3.2.1 (v3.2, 2022-09-09)
+
+## Solidus v3.2.0 (v3.2, 2022-08-18)
 
 - Initial release from the standalone repository. See [Solidus'
   CHANGELOG](https://github.com/solidusio/solidus/blob/master/CHANGELOG.md) for

data/app/controllers/spree/orders_controller.rb

@@ -69,7 +69,7 @@ module Spree
         format.html do
           if @order.errors.any?
             flash[:error] = @order.errors.full_messages.join(", ")
-            redirect_back_or_default(spree.root_path)
+            redirect_back(fallback_location: spree.root_path)
             return
           else
             redirect_to cart_path

data/app/views/spree/checkout/_summary.html.erb

@@ -45,10 +45,9 @@
       <% end %>
     <% end %>
 
-    <% if order.adjustments.nonzero.eligible.exists? %>
+    <% if order.adjustments.nonzero.non_tax.eligible.exists? %>
       <tbody id="summary-order-charges" data-hook>
-        <% order.adjustments.nonzero.eligible.each do |adjustment| %>
-        <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+        <% order.adjustments.nonzero.non_tax.eligible.each do |adjustment| %>
           <tr class="total">
             <td><%= adjustment.label %>:</td>
             <td><%= adjustment.display_amount.to_html %></td>

data/bin/sandbox

@@ -80,7 +80,7 @@ unbundled bundle exec rails generate solidus:install \
   $@
 
 unbundled bundle exec rails generate solidus:auth:install
-unbundled bundle exec rails generate ${extension_name}:install
+unbundled bundle exec rails generate ${extension_name}:install --auto-accept
 
 echo
 echo "🚀 Sandbox app successfully created for $extension_name!"

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

@@ -5,10 +5,32 @@ module SolidusFrontend
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('templates', __dir__)
 
+      class_option :auto_accept,
+                   type: :boolean,
+                   default: false
+
+      def self.exit_on_failure?
+        true
+      end
+
       def copy_initializer
         template 'initializer.rb', 'config/initializers/solidus_frontend.rb'
       end
 
+      def robots_directives
+        FileUtils.touch "public/robots.txt"
+        append_file "public/robots.txt", <<-ROBOTS.strip_heredoc
+          User-agent: *
+          Disallow: /checkout
+          Disallow: /cart
+          Disallow: /orders
+          Disallow: /user
+          Disallow: /account
+          Disallow: /api
+          Disallow: /password
+        ROBOTS
+      end
+
       def setup_assets
         empty_directory 'app/assets/images'
 
@@ -19,6 +41,25 @@ module SolidusFrontend
         template "vendor/assets/javascripts/spree/frontend/all.js"
         template "vendor/assets/stylesheets/spree/frontend/all.css"
       end
+
+      def install_solidus_bolt
+        return if ENV['SKIP_SOLIDUS_BOLT'] || !File.exist?('Gemfile') || !(options[:auto_accept] || yes?(<<~MSG))
+          Would you like to add bolt (https://www.bolt.com) as a default payment method?
+
+          If you answer yes, solidus_bolt (https://github.com/solidusio/solidus_bolt)
+          will be added to the installation (y/n):
+        MSG
+
+        gem 'solidus_bolt'
+        bundle_cleanly { `bundle` }
+        generate 'solidus_bolt:install --auto-run-migrations'
+      end
+
+      private
+
+      def bundle_cleanly(&block)
+        Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&block) : Bundler.with_clean_env(&block)
+      end
     end
   end
 end

data/lib/spree/frontend/version.rb

@@ -2,7 +2,7 @@
 
 module Spree
   module Frontend
-    VERSION = "3.3.0.alpha"
+    VERSION = "3.3.0"
 
     def self.version
       VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 3.3.0.alpha
+  version: 3.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -389,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Legacy cart and storefront for the Solidus e-commerce project. For new Solidus