spree_core 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66565fccdd69ce5d3cff1387f60e07415b8f75bf
-  data.tar.gz: f297def4dd1988664293040ac34de13334f5e806
+  metadata.gz: 144d7de948f95e01bbb75ffde51126bc6984b06b
+  data.tar.gz: 9e6d276d6f1c6200e20fb4756e5988fc8ad3053a
 SHA512:
-  metadata.gz: cef8199f06109eecf6f2622ee1f0afa32f4012209fa57613b86c23fba23e29342b87014e54a2e33ceca67414cfa4c66aa7450826e83a2b2d1e58f1313f045b47
-  data.tar.gz: 880a86398c03677d2c90f2ac5100e8761c5a98fe0fb4597c6e38abbaa2c5e93f3daf0307a1c895b62d2334368e8f32e708751f5a3ae0c028a409cdae841f6ec8
+  metadata.gz: a9b32122a06dd3ffb391b85540d7709ec07584818a861f56c7b06cdcb4f59b15497cf5d11219c27160c69bbb436c7be6e47cc6adb412d479431a08c10121c1b1
+  data.tar.gz: 736fe659b598549cdc0ad8ab88e23dd17a9508a9c26e4199e18b2fc7385312b0eca4ebd0c882e1fbcc96241d351829808a3fc1da2e21c5526fa424baeb20464b

data/app/models/concerns/spree/adjustment_source.rb

@@ -9,7 +9,7 @@ module Spree
 
     protected
 
-    def create_adjustment(order, adjustable, included = nil)
+    def create_adjustment(order, adjustable, included = false)
       amount = compute_amount(adjustable)
       return if amount == 0
       adjustments.new(order: order,

data/app/models/spree/order.rb

@@ -323,13 +323,10 @@ module Spree
     def outstanding_balance
       if canceled?
         -1 * payment_total
-      elsif reimbursements.includes(:refunds).size > 0
-        reimbursed = reimbursements.includes(:refunds).inject(0) do |sum, reimbursement|
-          sum + reimbursement.refunds.sum(:amount)
-        end
-        # If reimbursement has happened add it back to total to prevent balance_due payment state
-        # See: https://github.com/spree/spree/issues/6229
-        total - (payment_total + reimbursed)
+      elsif refunds.exists?
+        # If refund has happened add it back to total to prevent balance_due payment state
+        # See: https://github.com/spree/spree/issues/6229 & https://github.com/spree/spree/issues/8136
+        total - (payment_total + refunds.sum(:amount))
       else
         total - payment_total
       end

data/app/models/spree/order/payments.rb

@@ -52,7 +52,7 @@ module Spree
 
             payment.public_send(method)
 
-            if payment.completed?
+            if payment.completed? && payment_total != total
               self.payment_total += payment.amount
             end
           end

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -9,8 +9,8 @@
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.cancel_email.subtotal') %> <%= @order.display_item_total %>
+<%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
-<%= Spree.t('order_mailer.cancel_email.total') %> <%= @order.display_total %>
+<%= Spree.t('order_mailer.total') %> <%= @order.display_total %>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -9,7 +9,7 @@
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %>  <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.confirm_email.subtotal') %> <%= @order.display_item_total %>
+<%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>
 <% if @order.line_item_adjustments.exists? %>
   <% if @order.all_adjustments.promotion.eligible.exists? %>
     <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
@@ -33,6 +33,6 @@
 <%= adjustment.label %> <%= adjustment.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.confirm_email.total') %> <%= @order.display_total %>
+<%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
 
 <%= Spree.t('order_mailer.confirm_email.thanks') %>

data/config/locales/en.yml

@@ -96,8 +96,10 @@ en:
         path: Path
         starts_at: Starts At
         usage_limit: Usage Limit
+        promotion_category: Promotion Category
       spree/promotion_category:
         name: Name
+        code: Code
       spree/property:
         name: Name
         presentation: Presentation
@@ -476,6 +478,8 @@ en:
         taxonomies: Taxonomies
         taxons: Taxons
         users: Users
+        return_authorizations: Return Authorizations
+        customer_returns: Customer Returns
       order:
         events:
           approve: approve
@@ -715,6 +719,7 @@ en:
     error: error
     errors:
       messages:
+        blank: can't be blank
         could_not_create_taxon: Could not create taxon
         no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
     errors_prohibited_this_record_from_being_saved:
@@ -1027,6 +1032,7 @@ en:
     payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
     payment_processor_choose_link: our payments page
     payment_state: Payment State
+    payment_identifier: Payment Identifier
     payment_states:
       balance_due: balance due
       checkout: checkout
@@ -1154,7 +1160,6 @@ en:
     reference: Reference
     reference_contains: Reference Contains
     refund: Refund
-    refund_amount_must_be_greater_than_zero: Refund amount must be greater than zero
     refund_reasons: Refund Reasons
     refunded_amount: Refunded Amount
     refunds: Refunds

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.2.2"
+    "3.2.3"
   end
 end

data/lib/spree/localized_number.rb

@@ -15,6 +15,9 @@ module Spree
       # then replace the locale-specific decimal separator with the standard separator if necessary
       number.gsub!(separator, '.') unless separator == '.'
 
+      # Returns 0 to avoid ArgumentError: invalid value for BigDecimal(): "" for empty string
+      return 0 unless number.present?
+
       number.to_d
     end
 

data/spree_core.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '~> 5.0.0'
   s.add_dependency 'ransack', '~> 1.8.0'
   s.add_dependency 'responders'
-  s.add_dependency 'state_machines-activerecord', '~> 0.2'
+  s.add_dependency 'state_machines-activerecord', '~> 0.5'
   s.add_dependency 'stringex'
   s.add_dependency 'twitter_cldr', '~> 3.0'
   s.add_dependency 'sprockets-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement