spree_frontend 4.1.6 → 4.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 970239d531b6d929609cf3c4d28f2c448840c5471293c6c26c1d50510a77f325
-  data.tar.gz: 323efddb286a2fcff39fe461a0b531afb9aed27b2e7b8f0ddc3a7424005f3c93
+  metadata.gz: 996c8507c85da2436c1ce465db2e6d58e23438ebd35a641917b7625709eda853
+  data.tar.gz: 4aab159f3787026ede7868304085146fa37396f44bb396ffa82e021c683532a6
 SHA512:
-  metadata.gz: 599d44e41a5158490b33e78023191a0b50ba8c32701c7a189b718b65755ed4acc5953599dd5e9d87c84c6f19a04119cf2e7cac5542291d227601470b07eeb189
-  data.tar.gz: 63186815000d404797933b19cba9f4b80ed37c1ca43f65446a05e99f74e6ecca4b6a53c454160dfaa268eae88c3d6ac805d17c8e4bc5b73ff03eb5d3f2285e9e
+  metadata.gz: baffee9364a81637cb79bb1ef3ea11101f3ab4e07cf691ec6816b4bfeee0bd57d7ad0cddd947bb9e2d0ff7d397acc6151dcc6dc598e869a65abe5b820b06fa11
+  data.tar.gz: 8d4a1e4e959f45472987a9770f6a4ac87f45f8d77d9588fbfd48e959eaaa4671c4ffa0afc5e20c0e6c0c14da502bcbd29eb89a159c53400f8db00d8e13931e46

data/app/assets/javascripts/spree/frontend/checkout/address_book.js

@@ -1,56 +1,54 @@
-(function ($) {
-  $(document).ready(function () {
-    if ($('.select_address').length > 0) {
-      $('input#order_use_billing').unbind('change')
+Spree.ready(function ($) {
+  if ($('.select_address').length > 0) {
+    $('input#order_use_billing').unbind('change');
 
-      hide_address_form('billing')
-      hide_address_form('shipping')
+    hide_address_form('billing');
+    hide_address_form('shipping');
 
-      if ($('input#order_use_billing').is(':checked')) {
-        $('#shipping .select_address').hide()
-      }
-
-      $('input#order_use_billing').click(function () {
-        if ($(this).is(':checked')) {
-          $('#shipping .select_address').hide()
-          hide_address_form('shipping')
-        } else {
-          $('#shipping .select_address').show()
-          if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
-            show_address_form('shipping')
-          } else {
-            hide_address_form('shipping')
-          }
-        }
-      })
-
-      $("input[name='order[bill_address_id]']:radio").change(function () {
-        if ($("input[name='order[bill_address_id]']:checked").val() == '0') {
-          show_address_form('billing')
-        } else {
-          hide_address_form('billing')
-        }
-      })
+    if ($('input#order_use_billing').is(':checked')) {
+      $('#shipping .select_address').hide()
+    }
 
-      $("input[name='order[ship_address_id]']:radio").change(function () {
+    $('input#order_use_billing').click(function () {
+      if ($(this).is(':checked')) {
+        $('#shipping .select_address').hide()
+        hide_address_form('shipping')
+      } else {
+        $('#shipping .select_address').show()
         if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
           show_address_form('shipping')
         } else {
           hide_address_form('shipping')
         }
-      })
-    }
-  })
+      }
+    });
+
+    $("input[name='order[bill_address_id]']:radio").change(function () {
+      if ($("input[name='order[bill_address_id]']:checked").val() == '0') {
+        show_address_form('billing')
+      } else {
+        hide_address_form('billing')
+      }
+    });
+
+    $("input[name='order[ship_address_id]']:radio").change(function () {
+      if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
+        show_address_form('shipping')
+      } else {
+        hide_address_form('shipping')
+      }
+    })
+  }
 
-  function hide_address_form (address_type) {
-    $('#' + address_type + ' .inner').hide()
+  function hide_address_form(address_type) {
+    $('#' + address_type + ' .inner').hide();
     $('#' + address_type + ' .inner input').prop('disabled', true)
     $('#' + address_type + ' .inner select').prop('disabled', true)
   }
 
-  function show_address_form (address_type) {
-    $('#' + address_type + ' .inner').show()
+  function show_address_form(address_type) {
+    $('#' + address_type + ' .inner').show();
     $('#' + address_type + ' .inner input').prop('disabled', false)
     $('#' + address_type + ' .inner select').prop('disabled', false)
   }
-})(jQuery)
+});

data/app/assets/javascripts/spree/frontend/views/spree/products/cart_form.js

@@ -266,6 +266,12 @@ Spree.ready(function($) {
           Spree.showProductAddedModal(JSON.parse(
             $cartForm.attr('data-product-summary')
           ), Spree.variantById($cartForm, variantId))
+          $cartForm.trigger({
+            type: 'product_add_to_cart',
+            variant: Spree.variantById($cartForm, variantId),
+            quantity_increment: quantity,
+            cart: response.attributes
+          })
         },
         function(error) {
           if (typeof error === 'string' && error !== '') {

data/app/assets/stylesheets/spree/frontend/application.scss

@@ -47,6 +47,7 @@
 @import "spree/frontend/views/spree/shared/product";
 @import "spree/frontend/views/spree/products/show";
 @import "spree/frontend/views/spree/products/cart_form";
+@import "spree/frontend/views/spree/products/gallery_modal";
 @import "spree/frontend/views/spree/shared/product_added_modal";
 @import "spree/frontend/views/spree/shared/mobile_navigation";
 @import "spree/frontend/views/spree/shared/no_product_available";

data/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss

@@ -149,7 +149,7 @@
         }
         hr {
           margin: 0;
-          width: 33%;
+          flex: 1;
           border: 1px solid theme-color('info');
         }
       }

data/app/assets/stylesheets/spree/frontend/views/spree/products/gallery_modal.scss

@@ -0,0 +1,6 @@
+#picturesModal {
+  .close {
+    right: 0;
+    z-index: 3;
+  }
+}

data/app/helpers/spree/frontend_helper.rb

@@ -101,7 +101,8 @@ module Spree
         end
       end
       content = content_tag('ul', raw(items.join("\n")), class: 'nav justify-content-between checkout-progress-steps', id: "checkout-step-#{@order.state}")
-      content << content_tag('div', raw('<hr /><hr /><hr />'), class: "checkout-progress-steps-line state-#{@order.state}")
+      hrs = '<hr />' * (states.length - 1)
+      content << content_tag('div', raw(hrs), class: "checkout-progress-steps-line state-#{@order.state}")
     end
 
     def flash_messages(opts = {})
@@ -234,6 +235,10 @@ module Spree
       @static_filters ||= Spree::Frontend::Config[:products_filters]
     end
 
+    def additional_filters_partials
+      @additional_filters_partials ||= Spree::Frontend::Config[:additional_filters_partials]
+    end
+
     def filtering_params
       @filtering_params ||= available_option_types.map(&:filter_param).concat(static_filters)
     end

data/app/models/spree/frontend_configuration.rb

@@ -3,6 +3,7 @@ module Spree
     preference :coupon_codes_enabled, :boolean, default: true # Determines if we show coupon code form at cart and checkout
     preference :locale, :string, default: Rails.application.config.i18n.default_locale
     preference :products_filters, :array, default: %w(keywords price sort_by)
+    preference :additional_filters_partials, :array, default: %w()
     preference :remember_me_enabled, :boolean, default: true
   end
 end

data/app/views/spree/products/_filters_desktop.html.erb

@@ -53,6 +53,10 @@
           <% end %>
         </div>
       </div>
+
+      <% additional_filters_partials.each do |partial| %>
+        <%= render "spree/products/filters/#{partial}", permitted_params: permitted_params %>
+      <% end %>
     </div>
   </div>
 <% end %>

data/app/views/spree/products/_filters_mobile.html.erb

@@ -51,6 +51,10 @@
             </div>
           </div>
         </div>
+
+        <% additional_filters_partials.each do |partial| %>
+          <%= render "spree/products/filters/mobile/#{partial}", permitted_params: permitted_params %>
+        <% end %>
       </div>
     </div>
   <% end %>

data/app/views/spree/products/_gallery_modal.html.erb

@@ -3,7 +3,7 @@
     <div class="modal-dialog--zoom modal-dialog mw-100 vh-100 mt-0 mb-0" role="document">
       <div class="modal-content h-100">
         <div class="modal-body h-100">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="close position-absolute" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">
               <%= icon(name: 'close',
                        classes: 'd-block d-lg-none',

data/app/views/spree/products/_product.html.erb

@@ -10,7 +10,7 @@
         <% end %>
       </div>
       <div class="card-footer text-center">
-        <span class="price selling lead" content="<%= price.nil? 0 : price.to_d %>">
+        <span class="price selling lead" content="<%= price.nil? ? 0 : price.to_d %>">
           <%= display_price(product) %>
         </span>
         <span content="<%= current_currency %>"></span>

data/app/views/spree/products/show.html.erb

@@ -38,7 +38,7 @@
 
     <%= render partial: 'gallery_modal' %>
   </div>
-  <div id="related-products" />
+  <div id="related-products"></div>
 
   <%= products_structured_data([@product]) %>
 

data/spree_frontend.gemspec

@@ -5,16 +5,22 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_frontend'
   s.version     = Spree.version
-  s.summary     = 'Frontend e-commerce functionality for the Spree project.'
-  s.description = s.summary
-
-  s.required_ruby_version = '>= 2.5.0'
-
   s.author      = 'Sean Schofield'
   s.email       = 'sean@spreecommerce.com'
+  s.summary     = 'Frontend e-commerce functionality for the Spree project.'
+  s.description = s.summary
   s.homepage    = 'http://spreecommerce.org'
   s.license     = 'BSD-3-Clause'
 
+  s.metadata = {
+    "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
+    "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
+    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
+  }
+
+  s.required_ruby_version = '>= 2.5.0'
+
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'
   s.requirements << 'none'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.1.11
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.11
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.11
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +333,7 @@ files:
 - app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss
 - app/assets/stylesheets/spree/frontend/views/spree/orders/show.scss
 - app/assets/stylesheets/spree/frontend/views/spree/products/cart_form.scss
+- app/assets/stylesheets/spree/frontend/views/spree/products/gallery_modal.scss
 - app/assets/stylesheets/spree/frontend/views/spree/products/index.scss
 - app/assets/stylesheets/spree/frontend/views/spree/products/show.scss
 - app/assets/stylesheets/spree/frontend/views/spree/shared/_color_select.scss
@@ -498,8 +499,12 @@ files:
 homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/spree/spree/issues
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.11
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.11
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -516,7 +521,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.
 test_files: []