rock_rms 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd2e5a738f2c8d538e07197bb5594a0776d5633
-  data.tar.gz: b79e6f614094b84eec16722719be9db159e16231
+  metadata.gz: 0c3c3cbc6390883ed496a1e832688b8536ee19fd
+  data.tar.gz: 9164e643821a03ea8fbc00ef48f7e791f930d649
 SHA512:
-  metadata.gz: 99237295b01bfc1a1f94f7b1ea86d73fa5384e003585b68b5285f1c3d440e5d1a59c6e9da3aff7377bd700f6f14c2b308167f4eab7015d1b6164af2b3865435d
-  data.tar.gz: b06b878b04735ae4f73fb55cb610d5aa148263197ff0933f00b903adc055ae781cd566b1f4814e833f64bbae787b90466722f76c8f6eb2b035963c9f710b3b94
+  metadata.gz: 68044d1978168c99b2fb9a25595d99be949b250d560b5a0293c7072843be923139bb3bf7af1de166c6f2030d03f119d84552b078ce3e1912cda8465bf1d957a8
+  data.tar.gz: e9188f8e41ba589a9e4748a462ef914e0d8196845675ee8be750052f64a908a51d452983c6a952b26a811f5fd2ba8fcfad0f7c0726d52241101049a116914795

data/lib/rock_rms/resources/refund.rb

@@ -8,13 +8,19 @@ module RockRMS
         date:,
         reason_id:,
         transaction_id:,
-        transaction_code: nil
+        transaction_code: nil,
+        amount: nil
       )
+
         old_transaction = list_transactions(
           '$expand' => 'TransactionDetails',
           '$filter' => "Id eq #{transaction_id}"
         ).first
 
+        transaction_amount = old_transaction[:details].map{|d| d[:amount]}.reduce(0.0){|sum,x| sum + x }
+
+        refund_amount = amount || transaction_amount
+
         params = {
           'OriginalTransactionId' => transaction_id,
           'RefundReasonValueId' => reason_id,
@@ -24,7 +30,7 @@ module RockRMS
             'FinancialPaymentDetailId' => old_transaction[:payment_detail_id],
             'TransactionCode'     => transaction_code,
             'TransactionDateTime' => date,
-            'TransactionDetails'  => translate_negative(old_transaction[:details]),
+            'TransactionDetails'  => refunded_details(old_transaction[:details], transaction_amount, refund_amount),
             'TransactionTypeValueId' => old_transaction[:transaction_type_id]
           }
         }
@@ -33,8 +39,8 @@ module RockRMS
 
       private
 
-      def translate_negative(details)
-        details.map do |dt|
+      def refunded_details(details, transaction_amount, refund_amount)
+        apportion_refund_amount_over_accounts(details, transaction_amount, refund_amount).map do |dt|
           {
             'Amount' => -dt[:amount],
             'AccountId' => dt[:fund_id]
@@ -42,6 +48,27 @@ module RockRMS
         end
       end
 
+      def apportion_refund_amount_over_accounts(details, transaction_amount, refund_amount)
+        if refund_amount >= transaction_amount
+          details
+        else
+          ratio = refund_amount / transaction_amount
+          initial_acc = {total_amount: transaction_amount, details: []}
+          result = details.reduce(initial_acc) do |acc, detail|
+            amount_for_this_detail = (detail[:amount] * ratio).round(2)
+            new_total_amount = acc[:total_amount] - amount_for_this_detail
+            detail[:amount] = amount_for_this_detail
+            new_details = acc[:details] << detail
+            {
+              total_amount: new_total_amount,
+              details: new_details,
+            }
+          end
+
+          result[:details]
+        end
+      end
+
       def refund_path(id = nil)
         id ? "#{PATH}/#{id}" : PATH
       end

data/lib/rock_rms/version.rb

@@ -1,3 +1,3 @@
 module RockRMS
-  VERSION = '4.2.3'.freeze
+  VERSION = '4.3.0'.freeze
 end

data/spec/rock_rms/resources/refund_spec.rb

@@ -27,42 +27,81 @@ RSpec.describe RockRMS::Client::Refund, type: :model do
 
     end
 
-    subject(:resource) do
-      client.create_refund(
-        transaction_id: 1422,
-        batch_id: 1,
-        date: '2018-02-01',
-        reason_id: 1
-      )
-    end
+    context "without amount param" do
+
+      subject(:resource) do
+        client.create_refund(
+          transaction_id: 3000,
+          batch_id: 1,
+          date: '2018-02-01',
+          reason_id: 1
+        )
+      end
+
+      it 'returns integer' do
+        expect(resource).to be_a(Integer)
+      end
+
+      it 'passes options' do
+        expect(client).to receive(:post)
+          .with(
+            'FinancialTransactionRefunds',
+            'OriginalTransactionId' => 3000,
+            'RefundReasonValueId' => 1,
+            'FinancialTransaction' => {
+              'AuthorizedPersonAliasId' => 120,
+              'BatchId' => 1,
+              'FinancialPaymentDetailId' => 156,
+              'TransactionDateTime' => '2018-02-01',
+              'TransactionDetails'  => [{"Amount"=>-10.0, "AccountId"=>23}, {"Amount"=>-90.0, "AccountId"=>24}],
+              'TransactionTypeValueId' => 53,
+              'TransactionCode' => nil
+            }
+          )
+          .and_call_original
+        resource
+      end
 
-    it 'returns integer' do
-      expect(resource).to be_a(Integer)
     end
 
-    it 'passes options' do
-      expect(client).to receive(:post)
-        .with(
-          'FinancialTransactionRefunds',
-          'OriginalTransactionId' => 1422,
-          'RefundReasonValueId' => 1,
-          'FinancialTransaction' => {
-            'AuthorizedPersonAliasId' => 120,
-            'BatchId' => 1,
-            'FinancialPaymentDetailId' => 156,
-            'TransactionDateTime' => '2018-02-01',
-            'TransactionDetails'  => [
-              {
-                'Amount' => -100.0,
-                'AccountId' => 23
-              }
-            ],
-            'TransactionTypeValueId' => 53,
-            'TransactionCode' => nil
-          }
+    context "with amount param" do
+
+      subject(:resource) do
+        client.create_refund(
+          transaction_id: 3000,
+          batch_id: 1,
+          date: '2018-02-01',
+          reason_id: 1,
+          amount: 75.55,
         )
-        .and_call_original
-      resource
+      end
+
+      it 'returns integer' do
+        expect(resource).to be_a(Integer)
+      end
+
+      it 'passes options' do
+        expect(client).to receive(:post)
+          .with(
+            'FinancialTransactionRefunds',
+            'OriginalTransactionId' => 3000,
+            'RefundReasonValueId' => 1,
+            'FinancialTransaction' => {
+              'AuthorizedPersonAliasId' => 120,
+              'BatchId' => 1,
+              'FinancialPaymentDetailId' => 156,
+              'TransactionDateTime' => '2018-02-01',
+              'TransactionDetails'  => [{"Amount"=>-7.56, "AccountId"=>23}, {"Amount"=>-67.99, "AccountId"=>24}],
+              'TransactionTypeValueId' => 53,
+              'TransactionCode' => nil
+            }
+          )
+          .and_call_original
+        resource
+      end
+      
     end
+
   end
+
 end

data/spec/rock_rms/response/transaction_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe RockRMS::Response::Transaction, type: :model do
     end
 
     it 'translates keys' do
-      result.zip(parsed) do |r, p|
+      result.take(1).zip(parsed) do |r, p|
         expect(r[:id]).to eq(p['Id'])
         expect(r[:date]).to eq(p['TransactionDateTime'])
         expect(r[:batch_id]).to eq(p['BatchId'])

data/spec/support/fixtures/transaction_details.json

@@ -3,7 +3,7 @@
     "TransactionId": 1422,
     "AccountId": 23,
     "IsNonCash": false,
-    "Amount": 100.00,
+    "Amount": 10.00,
     "Summary": null,
     "EntityTypeId": null,
     "EntityId": null,
@@ -21,5 +21,28 @@
     "ForeignId": null,
     "ForeignGuid": null,
     "ForeignKey": null
+  },
+  {
+    "TransactionId": 1422,
+    "AccountId": 24,
+    "IsNonCash": false,
+    "Amount": 90.00,
+    "Summary": null,
+    "EntityTypeId": null,
+    "EntityId": null,
+    "Account": null,
+    "EntityType": null,
+    "CreatedDateTime": "2018-01-25T02:00:14.973",
+    "ModifiedDateTime": "2018-01-25T02:00:14.973",
+    "CreatedByPersonAliasId": null,
+    "ModifiedByPersonAliasId": null,
+    "ModifiedAuditValuesAlreadyUpdated": false,
+    "Attributes": null,
+    "AttributeValues": null,
+    "Id": 346,
+    "Guid": "a3bdcc01-5476-4e08-8245-dec2630c9471",
+    "ForeignId": null,
+    "ForeignGuid": null,
+    "ForeignKey": null
   }
 ]

data/spec/support/fixtures/transactions.json

@@ -36,7 +36,12 @@
         "TransactionDetails": [{
           "Id": 345,
           "AccountId": 23,
-          "Amount": 100.00
+          "Amount": 10.00
+        },
+        {
+          "Id": 346,
+          "AccountId": 24,
+          "Amount": 90.00
         }],
         "TransactionTypeValueId": 53
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rock_rms
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday