spree_core 4.1.10 → 4.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6076d4a3647fbf0b2a1a72578b5cd9336181f4b50c40bda5f7dcffab9806e4a
-  data.tar.gz: 663b00f1b45448020c4274925264c31ef11363fc6bd4561db5eff1f8897c4b5f
+  metadata.gz: 0012b8b02d8d9264ec0b3c586fff55a488e67a71df90f895327fcd4bd01c3fef
+  data.tar.gz: e8b4b78b93b46293ce4ec9799134c8f81d40bb8bf3d75dd71e3fba1d44c959c5
 SHA512:
-  metadata.gz: 235b59d743b4d580fe4b9e2a16d082a39285bccbee99f9fea6615c65e0e760a9134a0267ed9def3d9bac5fa76974416127dbdaeeac52865b8578b6926a5d2c65
-  data.tar.gz: 2bdc502c7b9134df69893818a1e230bd546ff895f8d0733e4ff380dbb2a8c4be9eccfe0acc356c8e618ad2d75d75f74228955af8961231617e00e0ec19e6ec27
+  metadata.gz: 8a4c7a0e1fd8a7e8a440ed1f22667db0b134e48edd8650de2ec23ab454a58d898e852293e97ef7d1581bd101226e175b427de54b37346eab9203b33415ef80ba
+  data.tar.gz: 8376e929ec04606867a8d7655797effe8704cb6deff3cf62410d82af87ab7b67f68e620395312379c754691f1aca9be41ad119cbe474c2a11433db8cdf70f1be

data/app/models/spree/line_item.rb

@@ -66,7 +66,8 @@ module Spree
 
     extend DisplayMoney
     money_methods :amount, :subtotal, :discounted_amount, :final_amount, :total, :price,
-                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total
+                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total,
+                  :pre_tax_amount
 
     alias single_money display_price
     alias single_display_amount display_price

data/app/models/spree/order.rb

@@ -22,7 +22,7 @@ module Spree
     money_methods :outstanding_balance, :item_total,           :adjustment_total,
                   :included_tax_total,  :additional_tax_total, :tax_total,
                   :shipment_total,      :promo_total,          :total,
-                  :cart_promo_total
+                  :cart_promo_total,    :pre_tax_item_amount,  :pre_tax_total
 
     alias display_ship_total display_shipment_total
     alias_attribute :ship_total, :shipment_total
@@ -174,7 +174,12 @@ module Spree
 
     # Sum of all line item amounts pre-tax
     def pre_tax_item_amount
-      line_items.to_a.sum(&:pre_tax_amount)
+      line_items.sum(:pre_tax_amount)
+    end
+
+    # Sum of all line item and shipment pre-tax
+    def pre_tax_total
+      pre_tax_item_amount + shipments.sum(:pre_tax_amount)
     end
 
     def shipping_discount

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.10'
+    '4.1.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.1.11
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1089,10 +1089,10 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.10
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.11
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.1.10
-post_install_message: 
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.11
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1108,7 +1108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []