solidus-returnly 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d71aa3fc918ca44c18793faf76d987bf02f6f7
-  data.tar.gz: dee66d85096e0b8ff6e934d8b2d256e8848727c6
+  metadata.gz: 75f8eee45930bec292d27a3b6fb876f21361b0df
+  data.tar.gz: 425e7dbb0fed050f6762c4b5c766d7e77ac89bbc
 SHA512:
-  metadata.gz: deb9e37418ecf8dac19d58a3fb6e93cc4c6efeb8e49f2cec3ea988604d194a1c3204edd8564f7bf4da566ceb1ab562b797728e52d1d123362bf8a7bb19dc525c
-  data.tar.gz: 980a0001ced5190de64c12b3a42370e9c4064ce3b0ae00d78300255688d1f5813d1b18a1dca3d0590e924466220cd0d20e202da36efa1dd2a6c58ba947a2b44a
+  metadata.gz: 90d55e4b55a56af2737040bc1c9826fe9ab80269a724a48dd43f133a33152bc7056b101180461959735ec1f9ff12efb8205075b269c1392625569f3c35144b37
+  data.tar.gz: ceeb5f3e0c0f472a213b3e736ed92e86d1b44dc35c56fb475a1e26c99cd87138b3c2d3caebf6a5d71e4db5ae3010d15067fb9ea49d177237236e3b1eb3721c84

data/app/services/refund_methods.rb

@@ -7,19 +7,14 @@ module RefundMethods
 
   class_methods do
     def whitelisted_refund_methods
-      # Solidus 2.3.0 deprecates "Spree::Gateway::Bogus" and recommends using "Spree::PaymentMethod::BogusCreditCard" instead.
-      %w[Spree::Gateway::Bogus Spree::PaymentMethod::SimpleBogusCreditCard Spree::PaymentMethod::BogusCreditCard Spree::PaymentMethod::Check Spree::PaymentMethod::StoreCredit].inject([]) do |methods, payment_method|
-        begin
-          methods << payment_method.constantize
-          methods
-        rescue
-          methods
-        end
-      end
+      # Override this methods to whitelist payment methods
+      []
     end
 
     def defined_refund_methods
-      Spree::PaymentMethod.order('id DESC').pluck(:type).map(&:constantize)
+      payment_methods = Spree::PaymentMethod.pluck(:type)
+      sorted_payment_methods = payment_methods.reject { |payment_method| payment_method =~ /StoreCredit/ }
+      (sorted_payment_methods | payment_methods).map(&:constantize)
     end
   end
 end

data/lib/returnly/refund_presenter.rb

@@ -51,20 +51,23 @@ module Returnly
       customer_return = refunder.customer_return
 
       {
-        refund_id:    refunder.order.refunds.last.try(:id),
+        refund_id:    refunder.order.reload.refunds.last.try(:id).try(:to_s),
         line_items:   customer_return.return_items.group_by { |ri| ri.inventory_unit.line_item.id }.map do |_, return_items|
           first_return_item = return_items.first
           {
-            refund_line_item_id:      first_return_item.id,
-            order_line_item_id:       first_return_item.inventory_unit.line_item.id,
-            refunded_amount_per_item: first_return_item.amount.to_f,
-            units:                    return_items.size
+            refund_line_item_id: first_return_item.id.to_s,
+            order_line_item_id:  first_return_item.inventory_unit.line_item.id.to_s,
+            units:               return_items.size,
+            restock:             first_return_item.resellable
           }
         end,
-        transactions: [
-                        id:     refunder.reimbursement.id,
-                        amount: refunder.reimbursement.total
-                      ]
+        transactions: refunder.reimbursement.refunds.map do |refund|
+          {
+            id: refund.transaction_id,
+            amount: refund.amount.to_f,
+            code: refund.payment.source_type.constantize.model_name.human
+          }
+        end
       }
     end
 

data/lib/returnly/version.rb

@@ -1,5 +1,5 @@
 module Returnly
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 
   def platform_version
     defined?(Solidus)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus-returnly
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Returnly Technologies, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -373,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Returnly integration with Solidus