spree_frontend 4.0.0.rc3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7266f41e2fa6d573a0f4794494010db8a3ca8c63a7aa1b1c2e630bf9cb69d4
-  data.tar.gz: 8a66adc0c24cf0e480b87263b5b2708d922fc2d6cc092792bde6757d6e585994
+  metadata.gz: d24ffaf2244c3ad2ab2000f12ac48d16ef6ee2185a08d78d72ea917e30b5462a
+  data.tar.gz: c1c80ceff9541c70f31b3a1fb570e9da89376c9b2c4e5fcb151a8af5dae5319f
 SHA512:
-  metadata.gz: 279b4c93d0070a054c15815c95b1734f18dbcf2ede6067dd1058a2e759f2c86b9e91b6b231f7eb443c1820f6ad60de6e6c6df91993158a546fe8cca519b07aa3
-  data.tar.gz: c087a9e63763783145f05f7adc5d9dc67cda2d50b43da34659e2bb94f273ccec3416bf0ae27eca2f36df1118948981b5e9bdad029dd66a062f9c72c814e5aeec
+  metadata.gz: 55afcbf886799fcc0dcb3b992d1c27a6fd215f6f2bef1a84aec2518d9aebbb1db83e680103c442dc908b57668b62abe4cd410798ae467f2b39945673b584dbeb
+  data.tar.gz: 28082669c3774436535644bb90f2588707ed0ebc8090d7f9befd3f66167bf15a9dcda3d92b17f9db39e90c3ee71d6b8e9b1bf4a632660fa98dc7659cedc6a847

data/app/controllers/concerns/spree/checkout/address_book.rb

@@ -42,11 +42,11 @@ module Spree
         if @order.bill_address_id != @order.ship_address_id && bill_address == ship_address
           @order.update_column(:bill_address_id, ship_address.id)
           bill_address.destroy
-        else
+        elsif params[:save_user_address]
           bill_address.update_attribute(:user_id, try_spree_current_user&.id)
         end
 
-        ship_address.update_attribute(:user_id, try_spree_current_user&.id)
+        ship_address.update_attribute(:user_id, try_spree_current_user&.id) if params[:save_user_address]
       end
     end
   end

data/app/helpers/spree/structured_data_helper.rb

@@ -13,32 +13,34 @@ module Spree
     private
 
     def structured_product_hash(product)
-      {
-        '@context': 'https://schema.org/',
-        '@type': 'Product',
-        '@id': "#{spree.root_url}product_#{product.id}",
-        url: spree.product_url(product),
-        name: product.name,
-        image: structured_images(product),
-        description: product.description,
-        sku: product.sku,
-        offers: {
-          '@type': 'Offer',
-          price: product.price,
-          priceCurrency: current_currency,
-          availability: product.in_stock? ? 'InStock' : 'OutOfStock',
+      Rails.cache.fetch("spree/structured-data/#{product.cache_key}") do
+        {
+          '@context': 'https://schema.org/',
+          '@type': 'Product',
+          '@id': "#{spree.root_url}product_#{product.id}",
           url: spree.product_url(product),
-          availabilityEnds: product.discontinue_on ? product.discontinue_on.strftime('%F') : ''
+          name: product.name,
+          image: structured_images(product),
+          description: product.description,
+          sku: product.sku,
+          offers: {
+            '@type': 'Offer',
+            price: product.price,
+            priceCurrency: current_currency,
+            availability: product.in_stock? ? 'InStock' : 'OutOfStock',
+            url: spree.product_url(product),
+            availabilityEnds: product.discontinue_on ? product.discontinue_on.strftime('%F') : ''
+          }
         }
-      }
+      end
     end
 
     def structured_images(product)
-      images = product.has_variants? ? product.variant_images : product.images
+      image = product.variant_images.first
 
-      return '' unless images.any?
+      return '' unless image
 
-      main_app.rails_blob_url(images.first.attachment)
+      main_app.rails_blob_url(image.attachment)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc3
+  version: 4.0.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-09 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.0.0.rc3
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc3
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc3
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc3
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -262,9 +262,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.0.2