spree_frontend 3.5.0 → 3.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4cb8934e356210eaa11fd6614168d833a0a92ad
-  data.tar.gz: 59df0fb78d8ce256911352537364f30fa57abd52
+SHA256:
+  metadata.gz: d541f194c1bc8a4ed754c76dcbc032bb1b77351e9c1848884d39e83db5e5c8d3
+  data.tar.gz: 587c926ede2b7aced59e6bc41e43996854089a7026bc774dc54054fece9edb61
 SHA512:
-  metadata.gz: 2369395c3a5584b1d7f934c1a516014d10da7f6391e1e2320a1d7b17a725eafe04ffa3f51bdbd97f004d2dd27a286b74f43cdafc04d70c578bd71e845f5a6434
-  data.tar.gz: 8c142a3ff8b0641e42eaf2a6917537d50c91c6f33376612984839524b1722cc70dbeca88046f53e494134dca224d404f00d7064212e4b9fd9cde4571a24e7fed
+  metadata.gz: f4a004c6782340f2312dc97c3f57f43c02061ca90c05b98bc8c205020f03258d64be274f682311c037291177494528b3d2a40a40c5b52347da989cbf6d20c613
+  data.tar.gz: 9c492217908bb2348f5c6f5c1708466b397558327ecb57f64ad41f01bc724b1949872983ebc6fbfe9bfbd6a3866efcce766d9770fa1619d9c2c3a244b18d6a55

data/app/assets/javascripts/spree/frontend/cart.js.coffee

@@ -1,7 +1,7 @@
 #= require spree/frontend/coupon_manager
 
 Spree.ready ($) ->
-  if ($ 'form#update-cart').is('*')
+  if ($ 'form#update-cart').length
     ($ 'form#update-cart a.delete').show().one 'click', ->
       ($ this).parents('.line-item').first().find('input.line_item_quantity').val 0
       ($ this).parents('form').first().submit()

data/app/assets/javascripts/spree/frontend/checkout/address.js.coffee

@@ -1,6 +1,6 @@
 Spree.ready ($) ->
   Spree.onAddress = () ->
-    if ($ '#checkout_form_address').is('*')
+    if ($ '#checkout_form_address').length
       getCountryId = (region) ->
         $('#' + region + 'country select').val()
 

data/app/assets/javascripts/spree/frontend/checkout/payment.js.coffee

@@ -1,9 +1,9 @@
 #= require spree/frontend/coupon_manager
 Spree.ready ($) ->
   Spree.onPayment = () ->
-    if ($ '#checkout_form_payment').is('*')
+    if ($ '#checkout_form_payment').length
 
-      if ($ '#existing_cards').is('*')
+      if ($ '#existing_cards').length
         ($ '#payment-method-fields').hide()
         ($ '#payment-methods').hide()
 

data/app/controllers/spree/orders_controller.rb

@@ -75,7 +75,7 @@ module Spree
     end
 
     def empty
-      @order.empty! if @order = current_order
+      current_order.try(:empty!)
 
       redirect_to spree.cart_path
     end

data/app/views/spree/orders/_line_item.html.erb

@@ -6,7 +6,7 @@
       <% if variant.images.length == 0 %>
         <%= link_to small_image(variant.product), variant.product %>
       <% else %>
-        <%= link_to image_tag(variant.images.first.attachment.url(:small)), variant.product %>
+        <%= link_to image_tag(main_app.url_for(variant.images.first.url(:small))), variant.product %>
       <% end %>
     </td>
     <td class="cart-item-description" data-hook="cart_item_description">

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

@@ -3,7 +3,7 @@
   <ul id="product-thumbnails" class="thumbnails list-inline" data-hook>
     <% @product.images.each do |i| %>
       <li class='tmb-all tmb-<%= i.viewable.id %>'>
-        <%= link_to(image_tag(i.attachment.url(:mini), class: "thumbnail"), i.attachment.url(:product)) %>
+        <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "thumbnail"), main_app.url_for(i.url(:product))) %>
       </li>
     <% end %>
 
@@ -11,7 +11,7 @@
       <% @product.variant_images.each do |i| %>
         <% next if @product.images.include?(i) %>
         <li class='vtmb tmb-<%= i.viewable.id %>'>
-          <%= link_to(image_tag(i.attachment.url(:mini), class: "thumbnail"), i.attachment.url(:product)) %>
+          <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "thumbnail"), main_app.url_for(i.url(:product))) %>
         </li>
       <% end %>
     <% end %>

data/app/views/spree/shared/_order_details.html.erb

@@ -60,7 +60,7 @@
           <% if item.variant.images.length == 0 %>
             <%= link_to small_image(item.variant.product), item.variant.product %>
           <% else %>
-            <%= link_to image_tag(item.variant.images.first.attachment.url(:small)), item.variant.product %>
+            <%= link_to image_tag(main_app.url_for(item.variant.images.first.url(:small))), item.variant.product %>
           <% end %>
         </td>
         <td data-hook="order_item_description">

data/spree_frontend.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_core', s.version
 
   s.add_dependency 'bootstrap-sass',  '>= 3.3.5.1', '< 3.4'
-  s.add_dependency 'canonical-rails', '~> 0.2.0'
+  s.add_dependency 'canonical-rails', '~> 0.2.3'
   s.add_dependency 'jquery-rails',    '~> 4.3'
 
   s.add_development_dependency 'capybara-accessible'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -242,13 +242,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.