spree_core 3.1.0.rc4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cb7bbd6bde30953cc5391ee02b054f23ca0b9b9
-  data.tar.gz: b9824021ae30dabf0f658a412bdcb8b37a76ebbd
+  metadata.gz: f35feac4376cd13546d618115a69843e88fc1cd5
+  data.tar.gz: 4c8e8813de79c6000a63d75fba52a2e3c446474b
 SHA512:
-  metadata.gz: e993ddd8cd1329cf5a7925c4cea0ac14a33c7a8cabc75b2ee6c0793502e4d8d759e2f94a92d4c100c34ef6408ff073f9df5205df23356afdbb2249a9e548edf6
-  data.tar.gz: c7f741a6505e5d5c15ff12f08afdc137aa8b3f8cfde04541b834e6bcb782a750257ac2463c2da5d74994fc8abf194d9683867fbb7bd8dba9875a9555ee1ec614
+  metadata.gz: 2681d8f8676b8d42aabdca0ee04058a36375a3407d2321173b5aa72faee19ae644b0e32b2a4df917adb26c40986c1125fa50801222d7ca14a1ff09c0143d1fc5
+  data.tar.gz: 1223897e7344f28e241967b864994bc4958056d0faa40b1ac430cfc8b18a31be28ef3ee1cad0314a4446e5ca0ccdc80b687c05066a92edbfc4922d9ddb36970f

data/app/models/spree/product.rb

@@ -25,6 +25,10 @@ module Spree
 
     acts_as_paranoid
 
+    # we need to have this callback before any dependent: :destroy associations
+    # https://github.com/rails/rails/issues/3458
+    before_destroy :ensure_no_line_items
+
     has_many :product_option_types, dependent: :destroy, inverse_of: :product
     has_many :option_types, through: :product_option_types
     has_many :product_properties, dependent: :destroy, inverse_of: :product
@@ -355,6 +359,13 @@ module Spree
       Spree::Taxonomy.where(id: taxonomy_ids).update_all(updated_at: Time.current)
     end
 
+    def ensure_no_line_items
+      if line_items.any?
+        errors.add(:base, Spree.t(:cannot_destroy_if_attached_to_line_items))
+        return false
+      end
+    end
+
     def remove_taxon(taxon)
       removed_classifications = classifications.where(taxon: taxon)
       removed_classifications.each &:remove_from_list

data/app/models/spree/variant.rb

@@ -12,13 +12,16 @@ module Spree
                         :shipping_category_id, :meta_description, :meta_keywords,
                         :shipping_category
 
+    # we need to have this callback before any dependent: :destroy associations
+    # https://github.com/rails/rails/issues/3458
+    before_destroy :ensure_no_line_items
+
     with_options inverse_of: :variant do
       has_many :inventory_units
+      has_many :line_items
       has_many :stock_items, dependent: :destroy
     end
 
-    has_many :line_items, dependent: :restrict_with_error
-
     has_many :orders, through: :line_items
     with_options through: :stock_items do
       has_many :stock_locations
@@ -258,6 +261,13 @@ module Spree
 
     private
 
+    def ensure_no_line_items
+      if line_items.any?
+        errors.add(:base, Spree.t(:cannot_destroy_if_attached_to_line_items))
+        return false
+      end
+    end
+
     def quantifier
       Spree::Stock::Quantifier.new(self)
     end

data/config/locales/en.yml

@@ -309,6 +309,14 @@ en:
           attributes:
             currency:
               must_match_order_currency: "Must match order currency"
+        spree/promotion:
+          attributes:
+            expires_at:
+              invalid_date_range: must be later than start date
+        spree/product:
+          attributes:
+            base:
+              cannot_destroy_if_attached_to_line_items: Cannot delete products once they are attached to line items.
         spree/refund:
           attributes:
             amount:
@@ -342,6 +350,10 @@ en:
           attributes:
             base:
               cannot_destroy_if_attached_to_line_items: Cannot delete variants once they are attached to line items.
+        spree/shipping_method:
+          attributes:
+            base:
+              cannot_destroy_if_attached_to_line_items: Cannot delete variants once they are attached to line items.
 
   devise:
     confirmations:

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.0.rc4"
+    "3.1.0"
   end
 end

data/spec/models/spree/order_merger_spec.rb

@@ -124,7 +124,9 @@ module Spree
       end
 
       it "should create errors with invalid line items" do
-        variant_2.destroy
+        # we cannot use .destroy here as it will be halted by
+        # :ensure_no_line_items callback
+        variant_2.really_destroy!
         subject.merge!(order_2)
         expect(order_1.errors.full_messages).not_to be_empty
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc4
+  version: 3.1.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant