blend_spreadsheet_loan_generator 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf298e238200e25827511da7dac19fb3632a4e4a85b1ea86f16323dd2e28b58
-  data.tar.gz: 52fc113243acc66cc02c65016871ba435cbeb70762b28d9240e07afb0a27dbd9
+  metadata.gz: 8afe8c32a76a11a3afd5fd90cc9c5728116650fdb99c3d68cbc9a69c6016d671
+  data.tar.gz: d727c22901f61615b4ef4cb592fe9f357dfbe1dfb65ca3fccb6a9b3ef1149b76
 SHA512:
-  metadata.gz: a41171c8bda9961b3b483fdc911a2eca6c0e7cd7d7fa47824e14d306f8d65316c6a9a8ec8e00fe16d25e0d9927d990664f69d75c0728d2c8608586dfde06fe72
-  data.tar.gz: 9bf8c3e0e21dc5f5419d90db5fd3be45032bf6f485c9cf4c077d441acfa443f73a7e16102fd4c2bba751ac21351fa50530debd677ef240a82ec446977caa7a66
+  metadata.gz: bd1c6e2922917ca77eb25f0bb316e9e693d1ecf8a6abddfbeb174c5facd778ad01979233af173bcaa822ee2f45805641738ebffd8657ef865645ddfc0aa2d139
+  data.tar.gz: 89a27d018920a740a9813a016fdc12bc183a10deabd001bd029274cfb9c384d1728401093e6ff1aff51abcaf2c437ecdbd8169d56fa6fb77346a517b590756d5

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -163,21 +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),
-        ')'
-      ].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:)

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.33'.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.33
+  version: 0.1.34
 platform: ruby
 authors:
 - MZiserman