blend_spreadsheet_loan_generator 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1357474c60cfb9e4c2856a80890d3d009fc78a66d38848e1b280ba3e1326dbd1
-  data.tar.gz: 6c7c524d35b0877d3d8a446142fc7c3e7bb5291af9fa9c07fc8343334e7dba6f
+  metadata.gz: b00db62c718e38412c067656409ac37d1fdcf8c9b4d5a9c9699ca192e3607b14
+  data.tar.gz: 364c5ef55c018309ee0492ca1608c069259bccb7ea2d71d483a2ed03dc0c4a6c
 SHA512:
-  metadata.gz: 774098b91a0e32d71bfa251adf70f888e5a2447172da89fe6f8310d2e6dc460910c3c9e60cf05589e41fd03a95ad466b3ee1fc3a1f2c2e98d3713ef49a96736e
-  data.tar.gz: 269d14778cc7c31d65a900e6542cc2a0dfe101d07aa2670b11bf8ed22b9556cf13d97df81b2d64a3f615d7c03d5b50a52baf56927b7904c6b04d72c5e46bf009
+  metadata.gz: 7852e9e3f19fdadd753878ac77ffa2a26175890f7b85ea338e260158580b6482637b1d03ed4af6c3528ae1928a1511218500aa3de8eaaf3bd3ab7e8b16def27b
+  data.tar.gz: 596d3dc61d9f379e89b4ac08dcc59e245a3192efc530df68f43818a354d2273eb5f5bca277b7a7167484fadf0b0cf99cf2efca283ce4540cf30b2962039d3c3d

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -87,13 +87,20 @@ module BlendSpreadsheetLoanGenerator
         end
       end
 
+      def custom_early_repayment
+        %w[
+          period_calculated_fees
+          capitalized_fees_end
+        ]
+      end
+
       def apply_formulas(worksheet:, early_repayment: true)
         columns.each.with_index do |title, column|
           worksheet[1, column + 1] = title
         end
         loan.duration.times do |line|
           columns.each.with_index do |title, column|
-            if early_repayment && title == 'period_calculated_fees'
+            if early_repayment && title.in?(custom_early_repayment)
               worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2, early_repayment: true)
             else
               worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2)

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -168,6 +168,10 @@ module BlendSpreadsheetLoanGenerator
       worksheet[2, columns.index('period_reimbursed_guaranteed_fees') + 1] =
         excel_float(guaranteed_fees_paid)
 
+      worksheet[2, columns.index('period_calculated_fees') + 1] =
+        excel_float(0.0)
+
+
       apply_formats(worksheet: worksheet)
 
       worksheet.save

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -207,11 +207,12 @@ module BlendSpreadsheetLoanGenerator
       "=ARRONDI(#{capitalized_fees_end(line - 1)}; 2)"
     end
 
-    def capitalized_fees_end_formula(line:)
+    def capitalized_fees_end_formula(line:, early_repayment: false)
       term = line - 1
       if term <= loan.deferred_and_capitalized
-        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)}"
+        index = early_repayment ? index(line - 1) : index(line)
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index}"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index}"
         "=ARRONDI(#{with_fees} - #{without_fees}; 2)"
       else
         "=ARRONDI(#{capitalized_fees_start(line)} - #{period_reimbursed_capitalized_fees(line)}; 2)"

data/lib/blend_spreadsheet_loan_generator/version.rb

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