blend_spreadsheet_loan_generator 0.1.30 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c65bb8dcbc3561cd3fa134d4eac3153934937c0de336afd2f41054a87e87a1e0
-  data.tar.gz: d90db3f308d1b6580f70d3c898e9ff38c0dc2fdbb59cd5c688b08a12169b232d
+  metadata.gz: 8afe8c32a76a11a3afd5fd90cc9c5728116650fdb99c3d68cbc9a69c6016d671
+  data.tar.gz: d727c22901f61615b4ef4cb592fe9f357dfbe1dfb65ca3fccb6a9b3ef1149b76
 SHA512:
-  metadata.gz: 531b9805eb3433e1835010a33fda24014e7071b5a21692bf8e66c78aeebe6cd45a1d05048158d97ccb484c2e9b3b76315034aad73efd7923b6b511a5e695331d
-  data.tar.gz: 0c2e0a0d93fff9c3620abbf6cea28750f7375e1fb4becc799447e481ec655b02c94ca07907712aef2aed350bd5a798b03ffc22ce85a7f3d184294de0336ebaf8
+  metadata.gz: bd1c6e2922917ca77eb25f0bb316e9e693d1ecf8a6abddfbeb174c5facd778ad01979233af173bcaa822ee2f45805641738ebffd8657ef865645ddfc0aa2d139
+  data.tar.gz: 89a27d018920a740a9813a016fdc12bc183a10deabd001bd029274cfb9c384d1728401093e6ff1aff51abcaf2c437ecdbd8169d56fa6fb77346a517b590756d5

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -163,23 +163,30 @@ module BlendSpreadsheetLoanGenerator
       term = line - 1
       if term <= loan.deferred_and_capitalized
         excel_float(0.0)
+      elsif loan.deferred_and_capitalized > 0 && loan.deferred.present?
+
       else
         "=ARRONDI(#{period_calculated_fees(line)}; 2)"
       end
     end
 
     def period_calculated_fees_formula(line:)
-      amount_to_capitalize = [
-        '(',
-        remaining_capital_start(line),
-        '+',
-        capitalized_interests_start(line),
-        '+',
-        capitalized_fees_start(line),
-        ')'
-      ].join(' ')
-
-      "=#{amount_to_capitalize} * #{period_fees_rate(line)}"
+      term = line - 1
+      if loan.deferred_and_capitalized > 0 && term > loan.deferred_and_capitalized
+        with_fees = "#{remaining_capital_start(line: line)} * (1 + #{period_rate(line: line)} + #{period_fees_rate(line: line)})^#{loan.deferred_and_capitalized} * (#{period_rate(line: line)} + #{period_fees_rate(line: line)})"
+        without_fees = "#{remaining_capital_start(line: line)} * (1 + #{period_rate(line: line)})^#{loan.deferred_and_capitalized} * #{period_rate(line: line)}"
+        "=#{with_fees} - #{without_fees}"
+      else
+        amount_to_capitalize = [
+          '(',
+          remaining_capital_start(line),
+          '+',
+          capitalized_interests_start(line),
+          ')'
+        ].join(' ')
+
+        "=#{amount_to_capitalize} * #{period_fees_rate(line)}"
+      end
     end
 
     def capitalized_fees_start_formula(line:)
@@ -191,9 +198,9 @@ module BlendSpreadsheetLoanGenerator
     def capitalized_fees_end_formula(line:)
       term = line - 1
       if term <= loan.deferred_and_capitalized
-        with_fees = "#{remaining_capital_start_formula(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index(line)}"
-        without_fees = "#{remaining_capital_start_formula(line)} * (1 + #{period_rate(line)})^#{index(line)}"
-        "=ARRONDI(#{with_fees} - #{without_fees})"
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index(line)}"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index(line)}"
+        "=ARRONDI(#{with_fees} - #{without_fees}; 2)"
       else
         "=ARRONDI(#{capitalized_fees_start(line)} - #{period_reimbursed_capitalized_fees(line)}; 2)"
       end

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.30'.freeze
+  VERSION = '0.1.34'.freeze
 
   class Version < Dry::CLI::Command
     desc 'Print version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blend_spreadsheet_loan_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.34
 platform: ruby
 authors:
 - MZiserman