solidus-returnly 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff60269717cc854516bde94a85ab7c708fad2eed35bacdee31933460416c502f
-  data.tar.gz: 90e483a9b1da8e55de1eed1a01da9b008a8d6b206f5d0410a006249ba1da89cb
+  metadata.gz: bbba58335cd0c6733fd3ac7ac1cd1138f9fe60c3c9fd054d333d6cd214880af4
+  data.tar.gz: 92908dfff3ed9d1725e8439404ea3da94bbe7849d6b004ea95eb81dca871e7ac
 SHA512:
-  metadata.gz: f273e4f016e1eb454eccb16a9cbfecfd3260069a70f90fca9a56a8e7ec23944dc2cbe10553f267fc644646c70eedd1b8d1f35f178720438599a79b99de3aeb72
-  data.tar.gz: 373866d8194a4f50077d3e35d005ffaed3f037b666092a4108116db6efec2417809153b1d3d463511d061c393ea5c0ae0c6ccfffebfadf7a9207b447cfb0f0f5
+  metadata.gz: acb300cf3987ae5db4687721141f20336abb11cd333e27f44edd60a45a8b0b63d362a5c1cd31da59654c7788a2f07a8099b554facacf5bd8f9273c339d222f48
+  data.tar.gz: bc19abf556483df2f5c5931f1e607607fc2f414cb51e93423c0c1287091c4eee51ecef94e47de732a8c1f7645151ee8c7807e5d4fb403a4cb47191144784245c

data/lib/returnly/builders/return_item.rb

@@ -8,23 +8,30 @@ module Returnly
       end
 
       def build_by_requested_line_items(requested_line_items)
-        requested_line_items.each_with_object([]) do |request_line_item, return_items|
+        is_returned_item = false
+        items = requested_line_items.each_with_object([]) do |request_line_item, return_items|
           quantity = request_line_item[:units].to_i
           next return_items unless quantity > 0
 
-          inventory_units_by(request_line_item[:order_line_item_id]).take(quantity).each do |inventory_unit|
+          inventory_units = inventory_units_by(request_line_item[:order_line_item_id])
+          if inventory_units.empty?
+            inventory_units = returned_inventory_units_by(request_line_item[:order_line_item_id])
+            request_line_item[:find_return?] = true
+            is_returned_item = true
+          end
+          inventory_units.take(quantity).each do |inventory_unit|
             return_items << build_by_inventory_unit(inventory_unit, request_line_item)
           end
 
           return_items
         end
+        {
+          items: items,
+          is_returned_items: is_returned_item
+        }
       end
 
-      def build_for_estimate(requested_line_items)
-        build_by_requested_line_items(requested_line_items)
-      end
-
-      def build_by_inventory_unit(inventory_unit, options = {})
+      def exact_build_by_inventory_unit(inventory_unit, options = {})
         Spree::ReturnItem.new(
           amount: inventory_unit.line_item.price,
           acceptance_status: 'accepted',
@@ -34,6 +41,14 @@ module Returnly
         )
       end
 
+      def build_by_inventory_unit(inventory_unit, options = {})
+        return exact_build_by_inventory_unit(inventory_unit, options) unless options[:find_return?]
+        Spree::ReturnItem.find_by(
+          amount: inventory_unit.line_item.price,
+          inventory_unit_id: inventory_unit.id
+        )
+      end
+
       private
 
       def inventory_units_by(line_item_ids)
@@ -41,6 +56,12 @@ module Returnly
           .where(line_item_id: line_item_ids)
           .where.not(state: 'returned')
       end
+
+      def returned_inventory_units_by(line_item_ids)
+        order.inventory_units.includes(:line_item, :return_items)
+          .where(line_item_id: line_item_ids, state: 'returned')
+          .where(spree_return_items: { reimbursement_id: nil })
+      end
     end
   end
 end

data/lib/returnly/refund_calculator.rb

@@ -20,13 +20,18 @@ module Returnly
       (line_item.adjustments.tax.sum(&:amount).to_d / line_item.quantity).round(2, :down)
     end
 
-    def line_items_return_items(is_estimate)
-      available_return_items(is_estimate).each_with_object({}) do |return_item, return_items|
+    def line_items_return_items
+      available_to_return = available_return_items
+      items = available_to_return[:items].each_with_object({}) do |return_item, return_items|
         line_item_id = return_item.inventory_unit.line_item_id
         return_items[line_item_id] ||= []
         return_items[line_item_id] << set_tax(return_item)
         return_items
       end
+      {
+        items: items,
+        is_returned_items: available_to_return[:is_returned_items]
+      }
     end
 
     def shipping_tax
@@ -35,9 +40,7 @@ module Returnly
 
     protected
 
-    def available_return_items(is_estimate)
-      return self.class.return_item_builder_class.new(order).build_for_estimate(line_items) if is_estimate
-
+    def available_return_items
       self.class.return_item_builder_class.new(order).build_by_requested_line_items(line_items)
     end
 

data/lib/returnly/refund_presenter.rb

@@ -5,12 +5,16 @@ module Returnly
       sub_total = Money.new 0
       tax = Money.new 0
 
-      calculator.line_items_return_items(true).values.flatten.each do |return_item|
+      return_items = calculator.line_items_return_items
+      return_items[:items].values.flatten.each do |return_item|
         sub_total += Money.from_amount return_item.total_excluding_vat
         tax += Money.from_amount calculator.line_item_tax(return_item.inventory_unit.line_item)
       end
 
       discount = Money.from_amount(calculator.discount)
+      if return_items[:is_returned_items]
+        sub_total += discount
+      end
       total_refund_amount = sub_total + tax - (discount * -1) # discount is negative, so we multiply it by -1 to make it positive for subtraction
       shipping_tax        = calculator.shipping_tax
       {

data/lib/returnly/refunder.rb

@@ -95,7 +95,7 @@ module Returnly
     end
 
     def each_return_item
-      return_items = refund_calculator.line_items_return_items(false).values.flatten
+      return_items = refund_calculator.line_items_return_items[:items].values.flatten
       self.customer_return = Returnly::Builders::CustomerReturn.build_by_return_items(return_items)
 
       return_items.each do |return_item|

data/lib/returnly/version.rb

@@ -1,5 +1,5 @@
 module Returnly
-  VERSION = '0.10.0'
+  VERSION = '0.11.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.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Returnly Technologies, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus