spree_frontend 4.1.7 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abeb5be8e52c16a43557e80432a4b557fd3b124aa11a1785092e7ea427230ba4
-  data.tar.gz: 1ce85a68e7844356ab07f5ed83266510ce743281f73c50a76718a7128eb60686
+  metadata.gz: c2d3e1b2a20d956cabfccd9cec656802fb73f4476132fb671872547153f48119
+  data.tar.gz: 320b77ae82bac0ddefe481fcc204c57a66b2ef8d3150ab5aa8177d93aeb0397b
 SHA512:
-  metadata.gz: a941265f5cef8292aa3c7e239e0ce8ac79d0b4c0d93fe2d1ed6062bbd6639d3a20602fedb7f2dbdcf547ccb7edfabf516fb0917b8a7a261ea06c3be1c27400dc
-  data.tar.gz: 954fd27ccf2e62760b932385f619c3844b557147bf7f8a9d52bbe5a8e0ab52f252fb01c7ac8535887c86fcc1104c9b1141a28138f1a57869cbc3334467b2c0b4
+  metadata.gz: 74053b67c46b9e580641840f65244cde9e3e38b9a0947a704022734706d9bee8d94d63ff72806c9d37fd58ff0c52612967cc65e5e190c1d5ea3ff39c0901e65b
+  data.tar.gz: 2120bc4a5b8ebeb1c09713e6b5834f2d9c966cfe80d481d0a2025a433a82693353a64edcd714f53f2615437bc4c0d4d13bd25df23ad2cfeb912e4c3a5d1beb2f

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/products/gallery_modal.scss

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

data/app/helpers/spree/frontend_helper.rb

@@ -235,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.7
+  version: 4.1.8
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-08-05 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.7
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.1.8
 - !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.8
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.8
+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: []