solidus-returnly 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddffe240ef5edcbc4fc3bddbef636c9e5fc81f55
-  data.tar.gz: 24c1a5a4fbea8296524a01681ed3c7273af07c8e
+  metadata.gz: '083e914f59852fdd042dcb656a7586374fe4f780'
+  data.tar.gz: e99474dab16979ca9aa30dce9a1fa814dd1002c4
 SHA512:
-  metadata.gz: 746ff00afaf6114e99bfe2e1dee76398ee5f0625646d27d6fe7e39d7225b49d278ec3f98c1180d5b1467527924b72128e825421330b953d3712165f6f4aa1807
-  data.tar.gz: 2ec89ad7b3236b8c58618d2633fd735189d8f3a5447f9392206defc956853036f8bbd4aff28604d42769aaa5579ec01d037e182f3d96b86b3661401f178c56ec
+  metadata.gz: 93c7c301d731ad1a45c41caefb37cd42d343af2413ec8466ad2b580b8c81c6d7fe45d7391cb7b182f7a5dc484384003d73ca5de182dc447af9ed37e317e44392
+  data.tar.gz: b650b812d349d35541d116fed203d3400da769610e716a2c91286d9da516a09ddd676578c830dfd09a205ceae93509b3ee161af3e90b2d46d097b0a952a45ef6

data/README.md

@@ -164,23 +164,23 @@ Overriding Refund Logic
 
 Is possible to override the default behavior of the Refund Gem by extending the following classes
 
-`lib/solidus/returnly/refund/return_item_restock_policy.rb`
+`lib/returnly/refund/return_item_restock_policy.rb`
 
 ```ruby
 class CustomReturnItemRestockPolicy < ReturnItemRestockPolicy
-        def should_return_item?(return_item)
-          return_item.cost > 1 
-        end
+  def should_return_item?(return_item)
+    return_item.cost > 1 
+  end
 end
 ```
 
-`lib/solidus/returnly/refund/amount_calculator.rb`
+`lib/returnly/refund/amount_calculator.rb`
 
 ```ruby 
 class CustomAmountCalculator < AmountCalculator
-        def return_item_refund_amount(return_item)
-          default_amount(return_item) - 5.0
-        end
+  def return_item_refund_amount(return_item)
+    default_amount(return_item) - 5.0
+  end
 end
 ```
 
@@ -188,12 +188,13 @@ to set your custom classes to the returns process just
 add an initializer file: `cofnig/initializers/returnly.rb`
 
 ```ruby 
-      Returnly.configure do |config|
-        config.return_item_amount_calculator = CustomAmountCalculator
-        config.return_item_restock_policy = CustomReturnItemRestockPolicy
-        config.refunder = CustomRefunder
-        config.refund_calculator = CustomRefunderCalculator
-      end
+Returnly.configure do |config|
+  config.return_item_amount_calculator = CustomAmountCalculator
+  config.return_item_restock_policy = CustomReturnItemRestockPolicy
+  config.refunder = CustomRefunder
+  config.refund_calculator = CustomRefunderCalculator
+  config.reimbursement_type_no_items = CustomOriginalPaymentNoItems
+end
 ```
 
 Copyright (c) 2017 Returnly Technologies, Inc

data/app/controllers/spree/api/returnly/refunds_controller.rb

@@ -22,6 +22,7 @@ module Spree
         private
 
         def line_items_params
+          return [] if params[:items].blank?
           params.require(:items)
         end
 

data/app/models/reimbursement_type/original_payment_no_items.rb

@@ -0,0 +1,17 @@
+module ReimbursementType
+  class OriginalPaymentNoItems < Spree::ReimbursementType
+    extend Spree::ReimbursementType::ReimbursementHelpers
+
+    class << self
+      def reimburse(reimbursement, _return_items, simulate)
+        unpaid_amount = reimbursement.total.round(2, :down)
+        payments = reimbursement.order.payments.completed
+
+        refund_list, _unpaid_amount = create_refunds(reimbursement, payments, unpaid_amount, simulate)
+        reimbursement.update(total: refund_list.sum(&:amount))
+        refund_list
+      end
+    end
+  end
+
+end

data/lib/returnly/refund_presenter.rb

@@ -19,7 +19,7 @@ module Returnly
         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,
+        max_refundable_amount:          (calculator.order.total - calculator.order.refunds.sum(&:amount)).to_f,
         refunds_by_payment_method:      refunds_by_payment(calculator.order, total_refund_amount.to_d + calculator.order.shipment_total + shipping_tax)
       }
     end
@@ -50,7 +50,7 @@ module Returnly
       customer_return = refunder.customer_return
 
       {
-        refund_id:    customer_return.number,
+        refund_id:    refunder.order.refunds.last.try(:id),
         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
           {

data/lib/returnly/refunder.rb

@@ -29,6 +29,7 @@ module Returnly
     end
 
     def proceed!
+      return proceed_without_line_items if line_items.empty?
       process_return_items
 
       if customer_return.save!
@@ -57,11 +58,26 @@ module Returnly
       self.refund_calculator = refund_calculator_class.new(order, line_items)
     end
 
+    def proceed_without_line_items
+      reimburse_without_items!
+      RefundPresenter.present_refund(self)
+    end
+
     def perform_reimbursement
       reimbursement.save!
       reimbursement.perform!
     end
 
+    def reimburse_without_items!
+      reimbursement_total = product_refund_amount.to_d + shipping_refund_amount.to_d
+      @_reimbursement = Spree::Reimbursement.new(
+        order: order,
+        total: reimbursement_total.round(2, :down)
+      )
+      reimbursement.save!
+      ::ReimbursementType::OriginalPaymentNoItems.reimburse(reimbursement, nil, false)
+    end
+
     def each_return_item
       customer_return.return_items = refund_calculator.line_items_return_items.values.flatten
       customer_return.return_items.each do |return_item|

data/lib/returnly/version.rb

@@ -1,5 +1,5 @@
 module Returnly
-  VERSION = '0.5.1'
+  VERSION = '0.6.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.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Returnly Technologies, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -330,6 +330,7 @@ files:
 - app/controllers/spree/api/returnly/api_controller.rb
 - app/controllers/spree/api/returnly/refunds_controller.rb
 - app/controllers/spree/api/returnly/version_controller.rb
+- app/models/reimbursement_type/original_payment_no_items.rb
 - app/models/spree/return_item_decorator.rb
 - config/locales/en.yml
 - config/routes.rb