spree_core 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d6583fe2ea61bf166c3e25d8739ea9b953b396c35acfbb4e47edde6d612d59d
-  data.tar.gz: 3bc0a7d98a739e16e3857eabdf23cbb25a989f17cf7186ae0632ced2bff36ac4
+  metadata.gz: 955b622bdd29054fb4bdb3e336a4a72e36c03f20e54cec6704aed0ed00407f17
+  data.tar.gz: 2b0d4168fa45ce1814d16b42c54241b1b63034a586281bccd5fb6297f1634aac
 SHA512:
-  metadata.gz: 66a7c9d1bbe53c07cf36032a2b61ebf850489a3e5b3e515c2916ad9bfa685b10e7a2bc7d8d0a5de1cb8241e7b96e0c31eb60de3351e306e6347a25f52032faf3
-  data.tar.gz: 9dca332fe825e8342f9b2492bbd555e3d6b2868ae1a5a9f5f99a163d86efd28fba5c0bb63df74f9b304f1b2fb65f8aa9481bbca22c6757b13c7a05851c1d456e
+  metadata.gz: 68f6b6296a2d489c54009a8d52586e268d01c7894785c6cf1d5d0d428a6e8fa2365b8b29296bbc4a4452004efedea81c397d73ceb3047f6e9d9e9370af41fc7e
+  data.tar.gz: 6ec77c2ecee5028ee57e03664dfb2fec39794867e04659fb0fcb1d7042287a8b912705f1c20674a9be68c00c0050a54d6cc3e05bc73b36f9112b1c2bfb931619

data/app/services/spree/data_feeds/google/required_attributes.rb

@@ -10,6 +10,7 @@ module Spree
           return failure(nil, error: 'No image link') if get_image_link(input[:variant], input[:product]).nil?
 
           information['id'] = input[:variant].id
+          information['item_group_id'] = input[:product].id
           information['title'] = format_title(input[:product], input[:variant])
           information['description'] = get_description(input[:product], input[:variant])
           information['link'] = "#{input[:store].url}/products/#{input[:product].slug}"

data/app/services/spree/gift_cards/apply.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Applies a gift card to an order
 # under the hood it creates a store credit payment record and updates the gift card amount used
 # @param gift_card [Spree::GiftCard] the gift card to apply
@@ -16,6 +17,14 @@ module Spree
         # we shouldn't allow a gift card to be applied to an order with a different currency
         return failure(:gift_card_mismatched_currency) if gift_card.currency != order.currency
 
+        # gift card requires logged user
+        if gift_card.user.present?
+          # user must be logged in
+          return failure(:gift_card_customer_not_logged_in) if order.user.blank?
+          # user must be the same as the gift card user
+          return failure(:gift_card_mismatched_customer) if gift_card.user != order.user
+        end
+
         amount = [gift_card.amount_remaining, order.total].min
         store = order.store
 

data/config/locales/en.yml

@@ -1190,7 +1190,10 @@ en:
     gift_card_already_redeemed: The Gift Card has already been redeemed.
     gift_card_applied: The Gift Card was successfully applied to your order!
     gift_card_batch: Gift Card Batch
+    gift_card_customer_not_logged_in: Gift Card cannot be applied with guest user.
     gift_card_expired: The Gift Card has expired.
+    gift_card_mismatched_currency: Gift Card cannot be applied with current currency.
+    gift_card_mismatched_customer: This gift card is associated with another user.
     gift_card_removed: The Gift Card was successfully removed from your order
     gift_card_using_store_credit_error: You can't apply the Gift Card after you applied the store credit.
     gift_cards: Gift Cards

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.3.0'.freeze
+  VERSION = '5.3.1'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/common_rake.rb

@@ -20,8 +20,7 @@ namespace :common do
     javascript_enabled = args[:javascript].to_b
     css_enabled = args[:css].to_b
 
-    # Admin and Storefront require JavaScript and CSS (Tailwind) to function properly
-    javascript_enabled ||= install_admin || install_storefront
+    # Admin and Storefront require CSS (Tailwind) to function properly
     css_enabled ||= install_admin || install_storefront
 
     puts args
@@ -32,9 +31,6 @@ namespace :common do
     dummy_app_args = [
       "--lib_name=#{ENV['LIB_NAME']}"
     ]
-    # Use API mode only if no frontend components are needed
-    use_api_mode = !install_storefront && !install_admin && !javascript_enabled && !css_enabled
-    dummy_app_args << '--api' if use_api_mode
     dummy_app_args << '--javascript' if javascript_enabled
     dummy_app_args << '--css=tailwind' if css_enabled
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -107,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.1
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -1703,9 +1717,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.3.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.3.1
 rdoc_options: []
 require_paths:
 - lib
@@ -1720,7 +1734,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: The bare bones necessary for Spree
 test_files: []