solidus-returnly 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '083e914f59852fdd042dcb656a7586374fe4f780'
-  data.tar.gz: e99474dab16979ca9aa30dce9a1fa814dd1002c4
+  metadata.gz: 2043001dcfb19498dc6e5ef56b5b39248485632a
+  data.tar.gz: ec0c2f446acf7b5eac9687c8efa8d81e71f7b020
 SHA512:
-  metadata.gz: 93c7c301d731ad1a45c41caefb37cd42d343af2413ec8466ad2b580b8c81c6d7fe45d7391cb7b182f7a5dc484384003d73ca5de182dc447af9ed37e317e44392
-  data.tar.gz: b650b812d349d35541d116fed203d3400da769610e716a2c91286d9da516a09ddd676578c830dfd09a205ceae93509b3ee161af3e90b2d46d097b0a952a45ef6
+  metadata.gz: 29c6dfe656d053f93198ce4a5987b3070b7a0511d361b44f6cf0a79912f267bb086503e7c445b549a7900c894541965788b5c26d341adb5915fedfb752616964
+  data.tar.gz: b315483a1960b7640f5004e537a2ecaa21d7300a8a3cc06d4754007a1cf7f1a1a46c190d59f44a8aab59817c7c70ec03aa9af0a0292e81e735f878ac924638d4

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

@@ -2,7 +2,7 @@ module Spree
   module Api
     module Returnly
       class ApiController < Spree::Api::BaseController
-        before_filter :set_headers
+        before_action :set_headers
 
         def set_headers
           response.headers['X-Returnly-Extension-Version'] = ::Returnly::VERSION

data/lib/returnly.rb

@@ -1,9 +1,12 @@
 require 'returnly/engine'
 require 'returnly/refunds_configuration'
 require 'returnly/refunder'
+require 'returnly/discounts/order'
+require 'returnly/discounts/line_item'
+require 'returnly/discount_calculator'
 require 'returnly/refund_calculator'
 
 require 'returnly/version'
 require 'returnly/refund/amount_calculator'
 require 'returnly/refund/return_item_restock_policy'
-require 'returnly/refund_presenter'
+require 'returnly/refund_presenter'

data/lib/returnly/discount_calculator.rb

@@ -0,0 +1,51 @@
+module Returnly
+  class DiscountCalculator
+    attr_accessor :order
+
+    DISCOUNTER_CLASSES = {
+      'Spree::Order' => Returnly::Discounts::Order,
+      'Spree::LineItem' => Returnly::Discounts::LineItem
+    }.freeze
+
+    def initialize(order)
+      @order = order
+    end
+
+    def calculate(line_items = [])
+      line_items.inject(0) do |discount_amount, item|
+        line_item = find_line_item(item[:order_line_item_id])
+        next discount_amount if line_item.nil?
+
+        discount_amount += discount_amount_for(line_item, item[:units].to_i)
+        discount_amount
+      end
+    end
+
+    private
+
+    def discount_amount_for(line_item, units)
+      discounters.inject(0) do |amount, discounter|
+        amount += discounter.discount_amount(line_item, units)
+        amount
+      end
+    end
+
+    def discounters
+      order_promotion_adjustments.map { |promotion_adjustment| build_discounter_by(promotion_adjustment) }.compact
+    end
+
+    def build_discounter_by(promotion_adjustment)
+      discounter_class = DISCOUNTER_CLASSES[promotion_adjustment.adjustable_type]
+      return nil if discounter_class.nil?
+      discounter_class.new(order, promotion_adjustment)
+    end
+
+    def order_promotion_adjustments
+      order.all_adjustments.where(source_type: 'Spree::PromotionAction', eligible: true)
+    end
+
+    def find_line_item(id)
+      order.line_items.find_by(id: id)
+    end
+  end
+end

data/lib/returnly/discounts/line_item.rb

@@ -0,0 +1,26 @@
+module Returnly
+  module Discounts
+    class LineItem
+      attr_reader :adjustment, :order
+
+      def initialize(order, adjustment)
+        @adjustment = adjustment
+        @order      = order
+      end
+
+      def discount_amount(line_item, units = 0)
+        return 0.0 if units <= 0
+        return 0.0 if adjustment.adjustable != line_item
+
+        units = line_item.quantity if units > line_item.quantity
+        adjustment.amount * weight_of(line_item, units.to_d)
+      end
+
+      private
+
+      def weight_of(line_item, units)
+        (units / line_item.quantity).round(2, :down)
+      end
+    end
+  end
+end

data/lib/returnly/discounts/order.rb

@@ -0,0 +1,33 @@
+module Returnly
+  module Discounts
+    class Order
+      attr_reader :adjustment, :order
+
+      def initialize(order, adjustment)
+        @adjustment = adjustment
+        @order      = order
+      end
+
+      def discount_amount(line_item, units = 0)
+        return 0.0 if units <= 0
+
+        units = line_item.quantity if units > line_item.quantity
+        (adjustment.amount * price_percent(line_item) / 100) * weight_of(line_item, units.to_d)
+      end
+
+      private
+
+      def price_percent(line_item)
+        (line_item.price * 100 / order_items_price).round(2, :down)
+      end
+
+      def order_items_price
+        order.line_items.sum(&:price)
+      end
+
+      def weight_of(line_item, units)
+        (units / line_item.quantity).round(2, :down)
+      end
+    end
+  end
+end

data/lib/returnly/refund_calculator.rb

@@ -24,6 +24,10 @@ module Returnly
       return_item
     end
 
+    def discount
+      Returnly::DiscountCalculator.new(order).calculate(line_items)
+    end
+
     def shipping_tax
       order.all_adjustments.where(source_type: 'Spree::TaxRate', adjustable_type: 'Spree::Shipment').sum(&:amount)
     end

data/lib/returnly/refund_presenter.rb

@@ -10,12 +10,13 @@ module Returnly
         sub_total += Money.from_amount return_item.pre_tax_amount
       end
 
-      total_refund_amount = total - calculator.order.promo_total
+      discount = Money.from_amount(calculator.discount)
+      total_refund_amount = total - (discount * -1) # discount is negative, so we multiply it by -1 to make it positive for subtraction
       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,
+        discount_amount:                discount.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,

data/lib/returnly/version.rb

@@ -1,5 +1,5 @@
 module Returnly
-  VERSION = '0.6.0'
+  VERSION = '0.6.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.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Returnly Technologies, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -335,6 +335,9 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/returnly.rb
+- lib/returnly/discount_calculator.rb
+- lib/returnly/discounts/line_item.rb
+- lib/returnly/discounts/order.rb
 - lib/returnly/engine.rb
 - lib/returnly/factories.rb
 - lib/returnly/refund/amount_calculator.rb
@@ -366,7 +369,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