solidus-returnly 0.5.0.rc1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0378de242c83b1090100232a64079f636aac6d6
-  data.tar.gz: a8a53e96a4ee82075fa58cbcae02b4e3cbf48ece
+  metadata.gz: a9edf2b667482113a215f7917d02a5e0cf9cd8dd
+  data.tar.gz: 5ef6fc23050351bebe96e0709d7799f321755700
 SHA512:
-  metadata.gz: 8cb73efb7d1ff47ccde5a81e79a8f1adf881a2f4895d2e43ee25f4f2f69414fcc822cbf77350f23efdfa778fbbd1aa66d537c0d663c8d586705418ecdbf81901
-  data.tar.gz: 40173c56054f424e3021add1e74dea276db3583e53887f57d413d646c0b0eff9bc24257c706ba743f9143e3a98362565a08d96fed26ced6e0984e77180d86de5
+  metadata.gz: d8d04617201af5df391a32f9f64b1232be810b696e3a9a2f50d3d821db8ce08acb9000dfe55c2bf02070370def937422818195d2b44cf28e4d7fdb891edfe668
+  data.tar.gz: 1695d8f7d61946f15bc7d80fa2a45805a284a80bb12a55591c855240aa4c5b631931283fbfe43aa4c7b41a5830c572e26409e99e18a83d4a845413d656b689f1

data/lib/returnly.rb

@@ -2,3 +2,8 @@ require 'returnly/engine'
 require 'returnly/refunds_configuration'
 require 'returnly/refunder'
 require 'returnly/refund_calculator'
+
+require 'returnly/version'
+require 'returnly/refund/amount_calculator'
+require 'returnly/refund/return_item_restock_policy'
+require 'returnly/refund_presenter'

data/lib/returnly/refund_calculator.rb

@@ -55,7 +55,7 @@ module Returnly
     def returnable_inventory_units
       @_inventory_units ||= order.inventory_units.includes(:line_item)
                                 .where(line_item_id: requested_line_items)
-                                .where('state is not "returned"')
+                                .where('state != ?', 'returned')
     end
 
     def returnable_line_items

data/lib/returnly/refund_presenter.rb

@@ -10,15 +10,17 @@ module Returnly
         sub_total += Money.from_amount return_item.pre_tax_amount
       end
 
+      total_refund_amount = total - calculator.order.promo_total
+      shipping_tax        = calculator.shipping_tax
       {
-        product_amount: sub_total.to_f,
-        tax_amount: (total - sub_total).to_f,
-        discount_amount: calculator.order.promo_total.to_f,
-        total_refund_amount: (total - calculator.order.promo_total).to_f,
-        refundable_shipping_amount: calculator.order.shipment_total.to_f,
-        refundable_shipping_tax_amount: calculator.shipping_tax.to_f,
-        max_refundable_amount: calculator.order.total.to_f,
-        refunds_by_payment_method: refunds_by_payment(calculator.order)
+        product_amount:                 sub_total.to_f,
+        tax_amount:                     (total - sub_total).to_f,
+        discount_amount:                calculator.order.promo_total.to_f,
+        total_refund_amount:            total_refund_amount.to_f,
+        refundable_shipping_amount:     calculator.order.shipment_total.to_f,
+        refundable_shipping_tax_amount: shipping_tax.to_f,
+        max_refundable_amount:          calculator.order.total.to_f,
+        refunds_by_payment_method:      refunds_by_payment(calculator.order, total_refund_amount.to_d + calculator.order.shipment_total + shipping_tax)
       }
     end
 
@@ -65,11 +67,14 @@ module Returnly
       }
     end
 
-    private_class_method def self.refunds_by_payment(order)
-                           order.payments.each_with_object([]) do |payment, payments|
+    private_class_method def self.refunds_by_payment(order, amount)
+                           completed_payments = order.payments.completed
+                           payment_amount = amount / completed_payments.count
+
+                           completed_payments.each_with_object([]) do |payment, payments|
                              payments << {
                                code:                    payment.source_type.constantize.model_name.human,
-                               amount:                  (order.item_total + order.adjustment_total).to_f,
+                               amount:                  payment_amount.to_f,
                                original_transaction_id: ''
                              }
                            end

data/lib/returnly/version.rb

@@ -1,5 +1,5 @@
 module Returnly
-  VERSION = '0.5.0.rc1'
+  VERSION = '0.5.0'
 
   def platform_version
     defined?(Solidus)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus-returnly
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc1
+  version: 0.5.0
 platform: ruby
 authors:
 - Returnly Technologies, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_auth_devise
@@ -360,9 +360,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11