spree_frontend 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5317d2a7a6ca3ca3bfb57ecec0acf3855ac522773bff72c884ee245475c5fda7
-  data.tar.gz: 5b18212fba5963c66c4ef309335f5627506c384fde5ac8f50f84130f1bfdecc1
+  metadata.gz: 66009bd783576beb6c4a4536bb0b4398b1a41842c193382858000b665073d193
+  data.tar.gz: 93fd6bf61fc0e457e41f3904c2e284be0c85b403887b58f93d9b5ac0f1ec61b3
 SHA512:
-  metadata.gz: 581b2b7605797cbd41255ae3a7c6039599bfb927ca626081fc90db6ed763a70bc2be1f6e2f8b8f32199f37cdbf165dcea7cb4950ab17efe52c68d2a46782e409
-  data.tar.gz: 4cdc7a0dd326ff60029ea95993a213efd34ff292f01e1a2e5ff497f7d968ee61fde81e784d2993a8a86a97c77015e2e2088d7a2ef9275a0b1d9671019f5bc416
+  metadata.gz: 8d2ddf2d9958332be7bb3fd40dbc8a2c649176090a636bfba1f9109e3b00788c47b2c0e32f41f404c3c418a75cd14781f69290f10b3333126a9be9d324d9d3a1
+  data.tar.gz: ef2b78d65c6756d35f5d88783d130d8b950853fc07d24bfdd6a4de2a7d14907269026aafb59fadeb5947ea345f625a16641f05cfd35a2e1bbb445ab6a114e6a1

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

@@ -220,7 +220,7 @@ function CartForm($, $cartForm) {
 
     if (!variant) return
 
-    this.$price.text(variant.display_price)
+    this.$price.html(variant.display_price)
   }
 
   this.updateVariantId = function() {

data/app/assets/javascripts/spree/frontend/views/spree/shared/mobile_navigation.js

@@ -6,6 +6,7 @@ Spree.ready(function($) {
     if (this.mobileNavigation !== null) {
       this.burgerButton = document.querySelector('.navbar-toggler');
       this.closeButton = document.querySelector('#mobile-navigation-close-button');
+      this.mobileNavigationList = document.querySelector('.mobile-navigation-list');
       this.categoryLinks = document.querySelectorAll('.mobile-navigation-category-link');
       this.backButton = document.querySelector('#mobile-navigation-back-button');
       this.overlay = document.querySelector('#overlay');
@@ -14,7 +15,6 @@ Spree.ready(function($) {
 
       this.onResize = this.onResize.bind(this);
       this.onCategoryClick = this.onCategoryClick.bind(this);
-      this.onTouchMove = this.onTouchMove.bind(this);
       this.onBurgerClick = this.onBurgerClick.bind(this);
       this.onCloseClick = this.onCloseClick.bind(this);
       this.onBackClick = this.onBackClick.bind(this);
@@ -23,7 +23,6 @@ Spree.ready(function($) {
       window.addEventListener('resize', this.onResize);
       window.addEventListener('turbolinks:request-start', this.onCloseClick);
 
-      this.mobileNavigation.addEventListener('touchmove', this.onTouchMove, false);
       this.burgerButton.addEventListener('click', this.onBurgerClick, false);
       this.closeButton.addEventListener('click', this.onCloseClick, false);
       this.backButton.addEventListener('click', this.onBackClick, false);
@@ -45,10 +44,6 @@ Spree.ready(function($) {
     this.openCategory(category);
   }
 
-  MobileNavigationManager.prototype.onTouchMove = function(e) {
-    e.preventDefault();
-  };
-
   MobileNavigationManager.prototype.onBurgerClick = function() {
     if (this.navigationOpen) {
       this.close();
@@ -84,6 +79,8 @@ Spree.ready(function($) {
     this.openedCategories.push(category);
     var subList = document.querySelector('ul[data-category=' + category + ']');
     if (subList) {
+      this.mobileNavigationList.classList.add('mobile-navigation-list-subcategory-shown');
+      this.mobileNavigationList.scrollTop = 0
       subList.classList.add('shown');
       this.backButton.classList.add('shown');
     }
@@ -99,6 +96,7 @@ Spree.ready(function($) {
     if (this.openedCategories[this.openedCategories.length - 1] === 'main') {
       this.backButton.classList.remove('shown');
     }
+    this.mobileNavigationList.classList.remove('mobile-navigation-list-subcategory-shown')
     return false;
   }
 
@@ -116,6 +114,7 @@ Spree.ready(function($) {
       var category = openedCategories.pop();
       this.closeCategory(category);
     }
+    this.mobileNavigationList.classList.remove('mobile-navigation-list-subcategory-shown')
     this.backButton.classList.remove('shown');
   }
 

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

@@ -227,6 +227,7 @@
         border-width: 1px !important;
         border-style: solid;
         color: color-yiq($input-background);
+        touch-action: manipulation;
         @include media-breakpoint-up(sm) {
           height: 51.4px;
           font-size: font-px-to-rem(24px);

data/app/assets/stylesheets/spree/frontend/views/spree/shared/mobile_navigation.scss

@@ -17,6 +17,8 @@
   }
   &-list, &-sublist {
     margin: 0;
+    overflow-y: auto;
+    overflow-x: hidden;
     padding: 0 19px;
     &-item {
       padding: 16px 0;
@@ -39,6 +41,9 @@
     @include media-breakpoint-up(sm) {
       padding-top: $spree-header-tablet-height;
     }
+    &-subcategory-shown {
+      overflow-y: hidden;
+    }
   }
 
   &-sublist {

data/app/controllers/spree/addresses_controller.rb

@@ -57,16 +57,7 @@ module Spree
     private
 
     def address_params
-      params[:address].permit(:address,
-                              :firstname,
-                              :lastname,
-                              :address1,
-                              :address2,
-                              :city,
-                              :state_id,
-                              :zipcode,
-                              :country_id,
-                              :phone)
+      params.require(:address).permit(permitted_address_attributes)
     end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -43,7 +43,7 @@ module Spree
       [
         current_store,
         current_currency,
-        config_locale
+        I18n.locale
       ]
     end
 

data/app/helpers/spree/addresses_helper.rb

@@ -33,5 +33,11 @@ module Spree
       content_tag(:noscript, form.text_field(:state_name, class: 'required')) +
         javascript_tag("document.write(\"<span class='d-block position-relative'>#{state_elements.html_safe}</span>\");")
     end
+
+    def user_available_addresses
+      return unless try_spree_current_user
+
+      try_spree_current_user.addresses.where(country: available_countries)
+    end
   end
 end

data/app/helpers/spree/frontend_helper.rb

@@ -255,7 +255,7 @@ module Spree
       return '' if current_store.send(service).blank?
 
       link_to "https://#{service}.com/#{current_store.send(service)}", target: :blank, rel: 'nofollow noopener' do
-        content_tag :gigure, id: service, class: 'px-2' do
+        content_tag :figure, id: service, class: 'px-2' do
           icon(name: service, width: 22, height: 22)
         end
       end

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

@@ -1,4 +1,4 @@
-<% @addresses = try_spree_current_user ? try_spree_current_user.addresses : [] %>
+<% @addresses = try_spree_current_user ? user_available_addresses : [] %>
 
 <% if !try_spree_current_user || try_spree_current_user.email.blank? %>
   <div class="row">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-16 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.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement