solidus-returnly 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8133650d26f4d86877bf02cf2d5306f64c4b8d7d
-  data.tar.gz: 176a63204f4bc506e6247069c993d1755344e990
+  metadata.gz: b0f4def9162a15735d56d0e508c00f16b208d490
+  data.tar.gz: 4a4871b9e78dbbabaf7749a4e3367011567c46d9
 SHA512:
-  metadata.gz: 3a35811dedbce70c640b8df0d153445cc4dd7eecfcc4eb95966322ddfb2845e0047ad6fef07e199ceceddd0f8ba5403f035aface8c588851e842641a74ce4d0e
-  data.tar.gz: 34dbb6b1a962345cc37c930b159b5132ca85c8e5b2b552c7ccb8fece606c4e22f5bed7889211cd6100550d5b843932eea620128b16e99965a07fa156ced803fe
+  metadata.gz: 5c8a78e67e2dbcd2ec8c42f451f0105c81f2b83d71b2b44935f995722c81dfc450a7876d9aaac786f23b9fabdd26c38525c98341adde5c3b8c6c250d54505d46
+  data.tar.gz: 31e5fcbcb4fa977710be28e31dea281c1554248390a142f8b52e0a47354d8fb117b2eb7dcd43c183d8fb4b111caef1c2f75c837f57d10f4ff1b9118234ff29ab

data/LICENSE

@@ -1,26 +1,21 @@
-Copyright (c) 2017 [name of plugin creator]
-All rights reserved.
+The MIT License
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Copyright (c) 2017 Returnly Technologies, Inc.
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
-      endorse or promote products derived from this software without specific
-      prior written permission.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -3,19 +3,13 @@ Solidus Returnly
 
 This gem adds the required APIs to allow returnly obtain an estimate, process a return and apply a reimbursement
 
-
-KNOW ISSUES
------------
-* Currently the restock feature only supports the order shipping warehouse
-* The API user should have the right to create an order there is no an special permission yet for this api
-
 Installation
 ------------
 
 Add solidus_returnly to your Gemfile:
 
 ```ruby
-gem 'solidus_returnly'
+gem 'solidus-returnly'
 ```
 
 Bundle your dependencies and run the installation generator:
@@ -155,4 +149,4 @@ Response:
 ```
 
 
-Copyright (c) 2017 Returnly Technologies, Inc, released under the New BSD License
+Copyright (c) 2017 Returnly Technologies, Inc

data/Rakefile

@@ -22,6 +22,6 @@ end
 
 desc 'Generates a dummy app for testing'
 task :test_app do
-  ENV['LIB_NAME'] = 'solidus_returnly'
+  ENV['LIB_NAME'] = 'solidus-returnly'
   Rake::Task['extension:test_app'].invoke
 end

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

@@ -2,7 +2,6 @@ module Spree
   module Api
     module Returnly
       class RefundsController < ApiController
-
         def estimate
           authorize! :create, Order
           render json: Solidus::Returnly::Calculator.process(order, line_items_params)
@@ -39,4 +38,3 @@ module Spree
     end
   end
 end
-

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

@@ -1,13 +1,14 @@
 module Spree
   module Api
-    class ReturnlyVersionController < ApiController
-      def index
-        render json: {
-            extension_version: Solidus::Returly::VERSION,
-            platform_version: Solidus::VERSION,
-        }
+    module Returnly
+      class VersionController < ApiController
+        def index
+          render json: {
+              extension_version: Solidus::Returnly::VERSION,
+              platform_version: Spree.solidus_version
+          }
+        end
       end
-
     end
   end
 end

data/lib/generators/solidus_returnly/install/install_generator.rb

@@ -4,26 +4,15 @@ module SolidusReturnly
       class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_javascripts
-        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_returnly\n"
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_returnly\n"
       end
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_returnly\n", before: /\*\//, verbose: true
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_returnly\n", before: /\*\//, verbose: true
       end
 
       def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=solidus_returnly'
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
-        if run_migrations
-          run 'bundle exec rake db:migrate'
-        else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!'
-        end
       end
     end
   end

data/lib/solidus-returnly.rb

@@ -2,4 +2,4 @@ require 'solidus_core'
 
 require 'solidus/returnly/engine'
 require 'solidus/returnly/refunds'
-require 'solidus/returnly/calculator'
+require 'solidus/returnly/calculator'

data/lib/solidus/returnly/calculator.rb

@@ -13,16 +13,18 @@ module Solidus
       end
 
       def calculated_estimate
-        total = line_items_return_items.values.sum {|iu| iu.sum(&:pre_tax_amount)}
+        total = 0.0
+        sub_total = 0.0
 
-        tax_amount = returnable_inventory_units.sum do |inventory_unit|
-          calculate_tax inventory_unit
+        line_items_return_items.values.flatten.each do |return_item|
+          total += return_item.total
+          sub_total += return_item.pre_tax_amount
         end
 
         {
             total_amount: total,
-            subtotal_amount: total - tax_amount,
-            tax_amount: tax_amount,
+            subtotal_amount: sub_total,
+            tax_amount: total - sub_total,
             discount_amount: order.promo_total,
             shipping_amount: order.shipment_total,
             line_items: present_line_items
@@ -30,44 +32,58 @@ module Solidus
       end
 
       def present_line_items
-        line_items_return_items.map do |line_item_id, inventory_units|
-          line_item = line_item(line_item_id)
+        line_items_return_items.values.map do |return_items|
+          line_item = return_items.first.inventory_unit.line_item
+
+          total_amount = 0.0
+          sub_total = 0.0
+
+          return_items.each do |return_item|
+            total_amount += return_item.total
+            sub_total += return_item.pre_tax_amount
+          end
 
           {
               order_line_item_id: line_item.id,
-              quantity: inventory_units.size,
-              total_amount: inventory_units.sum(&:amount),
-              tax_amount: line_item.included_tax_total,
-              discount_amount: line_item.adjustment_total,
+              quantity: return_items.size,
+              total_amount: total_amount,
+              tax_amount: total_amount - sub_total
           }
         end
       end
 
+      def set_tax(return_item)
+        percent_of_tax = (return_item.amount <= 0) ? 0 : return_item.amount /
+          Spree::ReturnItem.refund_amount_calculator.new.compute(return_item)
 
-      def calculate_tax(inventory_unit)
-        return_item = Spree::ReturnItem.from_inventory_unit(inventory_unit)
-        (return_item.amount <= 0) ? 0 : return_item.amount /
-            Spree::ReturnItem.refund_amount_calculator.new.compute(return_item)
-      end
+        additional_tax_total = percent_of_tax * return_item.inventory_unit.additional_tax_total
+        included_tax_total   = percent_of_tax * return_item.inventory_unit.included_tax_total
+
+        return_item.additional_tax_total = additional_tax_total
+        return_item.included_tax_total = included_tax_total
 
+        return_item
+      end
 
       def line_items_return_items
         found_return_items = {}
 
-        self.line_items.each do |line_item|
+        line_items.each do |line_item|
           quantity = line_item[:quantity].to_i
 
-          if quantity > 0
-            available_inventory_units = line_item_inventory_unit(line_item).slice(0, quantity)
-
-            available_inventory_units.each do |inventory_unit|
-              found_return_items[line_item[:order_line_item_id]] ||= []
-              found_return_items[line_item[:order_line_item_id]] << Spree::ReturnItem.new({amount: inventory_unit.line_item.price,
-                                                                                           acceptance_status: 'accepted',
-                                                                                           inventory_unit_id: inventory_unit.id,
-                                                                                           reception_status_event: 'receive'
-                                                                                          })
-            end
+          next unless quantity > 0
+          available_inventory_units = line_item_inventory_unit(line_item).slice(0, quantity)
+
+          available_inventory_units.each do |inventory_unit|
+            found_return_items[line_item[:order_line_item_id]] ||= []
+
+            return_item = Spree::ReturnItem.new({ amount: inventory_unit.line_item.price,
+                                                 acceptance_status: 'accepted',
+                                                 inventory_unit_id: inventory_unit.id,
+                                                 reception_status_event: 'receive'
+                                                })
+
+            found_return_items[line_item[:order_line_item_id]] << set_tax(return_item)
           end
         end
 
@@ -75,11 +91,11 @@ module Solidus
       end
 
       def line_item_inventory_unit(line_item)
-        returnable_inventory_units.select {|iu| iu.line_item_id == line_item[:order_line_item_id].to_i}
+        returnable_inventory_units.select { |iu| iu.line_item_id == line_item[:order_line_item_id].to_i }
       end
 
       def line_item(id)
-        returnable_line_items.select {|i| i.id == id.to_i}.first
+        returnable_line_items.find { |i| i.id == id.to_i }
       end
 
       def returnable_inventory_units
@@ -93,10 +109,8 @@ module Solidus
       end
 
       def requested_line_items
-        line_items.map {|item| item[:order_line_item_id]}
+        line_items.map { |item| item[:order_line_item_id] }
       end
     end
   end
 end
-
-

data/lib/solidus/returnly/engine.rb

@@ -52,5 +52,4 @@ module Solidus
       end
     end
   end
-
-end
+end

data/lib/solidus/returnly/refunds.rb

@@ -1,7 +1,7 @@
 module Solidus
   module Returnly
     class Refunds
-      attr_accessor :calculator, :order, :line_items, :restock, :transactions
+      attr_accessor :calculator, :order, :line_items, :restock, :transactions, :customer_return
 
       def initialize(order:, line_items:, restock: true, transactions:)
         self.order = order
@@ -9,25 +9,19 @@ module Solidus
         self.calculator = Calculator.new order, line_items
         self.restock = restock
         self.transactions = transactions
-      end
-
-      def restock_return(customer_return)
-        customer_return.return_items.each do |item|
-          customer_return.stock_location.restock(item.inventory_unit.variant, 1, customer_return)
-        end
+        self.customer_return = Spree::CustomerReturn.new customer_return_params
       end
 
       def proceed!
-        customer_return = Spree::CustomerReturn.new customer_return_params
         customer_return.return_items = calculator.line_items_return_items.values.flatten
 
         customer_return.return_items.each do |return_item|
-          return_item.amount = refund_amount_per_item
-          return_item.resellable = self.restock
+          return_item.amount = refund_amount_per_item - Money.from_amount(return_item.total - return_item.pre_tax_amount)
+          return_item.resellable = restock
         end
 
         if customer_return.save!
-          reimbursement = perform_reimbursement(customer_return)
+          perform_reimbursement
           processed_customer_return(customer_return, reimbursement)
         end
       end
@@ -37,32 +31,35 @@ module Solidus
             refund_id: customer_return.number,
             created_at: customer_return.created_at,
             updated_at: customer_return.updated_at,
-            line_items: customer_return.return_items.map {|ri|
+            line_items: customer_return.return_items.group_by{ |ri| ri.inventory_unit.line_item.id }.map {|_, return_items|
               {
-                  refund_line_item_id: ri.id,
-                  order_line_item_id: ri.inventory_unit.line_item.id,
-                  quantity: 1
+                  refund_line_item_id: return_items.first.id,
+                  order_line_item_id: return_items.first.inventory_unit.line_item.id,
+                  refunded_amount_per_item: return_items.first.amount.to_f,
+                  total_refunded_per_line_item: return_items.sum(&:amount).to_f,
+                  quantity: return_items.size
               }
             },
             transactions: [
                 id: reimbursement.id,
                 amount: reimbursement.total
             ],
-            note: "comment text",
-            restock: true
+            restock: restock
         }
       end
 
-      def perform_reimbursement(customer_return)
-        reimbursement = Spree::Reimbursement.build_from_customer_return(customer_return)
+      def perform_reimbursement
         reimbursement.save!
         reimbursement.perform!
-        reimbursement
+      end
+
+      def reimbursement
+        @_reimbursement ||= Spree::Reimbursement.build_from_customer_return(customer_return)
       end
 
       def customer_return_params
         {
-            stock_location_id: stock_location_id,
+            stock_location_id: stock_location_id
         }
       end
 
@@ -71,7 +68,7 @@ module Solidus
       end
 
       def refund_available_amount
-        @available_amount ||= self.transactions.sum {|t| Money.from_amount(t[:amount].to_f)}
+        @available_amount ||= transactions.sum { |t| Money.from_amount(t[:amount].to_f) }
       end
 
       def refund_amount_per_item
@@ -79,5 +76,4 @@ module Solidus
       end
     end
   end
-
-end
+end

data/lib/solidus/returnly/version.rb

@@ -1,5 +1,5 @@
 module Solidus
   module Returnly
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus-returnly
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Returnly Technologies, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Solidus API extensions for returnly
 email: support@returnly.com
 executables: []