blend_spreadsheet_loan_generator 0.1.103 → 0.1.107

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a53645750943fd847c6d787a9bbc73f23982daa5793ecb37f92100167d905b9e
-  data.tar.gz: 895e30e96a23336012ca31e8f772f354efb8feb0670d612fa2ca068b5979444b
+  metadata.gz: e066d31e3aac210b466d4e3e6993d408dc26dcba046a5a1ecfe181b2dabb0989
+  data.tar.gz: b52baa3e2c499f79960579c5cfd0d33e28d288c3ca0b1263e3b02c7ba271657f
 SHA512:
-  metadata.gz: bf34f63e6d2bcfe7c983f4a191fa12de929dc56cf859f54f3676a0a981b3a7d735e9499b89d3599094ff7294f0a7fd07ddc523ec32343b9c4dd08fef4b72f644
-  data.tar.gz: 741777ca11694b3330609ce0aefd11df91234af988091d23605b75a895387466f3a5bb48bae43acdd4da2648e30193a142962871570402a59e63f635221a066c
+  metadata.gz: 2637dd47c2545133a83c24d299cd4c72dd81ca02056fd210504a4100c85cc2eaa0534303c0a0415c9a83d76983893fdc9c567945ae29619a8d32ebb3f38a64d1
+  data.tar.gz: a3b538214455f066f8bcddeae2920df8255bf43d9f5294efd25e715978b83a0836b6cb82f65786b2f52712e48a91f82ae3663176de15cd41967244da64d7545d

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -80,19 +80,16 @@ module BlendSpreadsheetLoanGenerator
       due_on = values[last_paid_line + 1][:due_on] + 1.month
 
       capital_paid = amount_paid.to_f - (
-        values[last_paid_line + 1][:capitalized_interests_start] +
-        values[last_paid_line + 1][:capitalized_fees_start] +
-        values[last_paid_line + 1][:period_calculated_interests] +
-        values[last_paid_line + 1][:period_calculated_fees]
+        values[last_paid_line + 1][:capitalized_interests_end] +
+        values[last_paid_line + 1][:capitalized_fees_end]
       )
       capital_paid_for_ratio = amount_paid.to_f - (
-        values[last_paid_line + 1][:capitalized_fees_start] +
-        values[last_paid_line + 1][:period_calculated_fees]
+        values[last_paid_line + 1][:period_interests] +
+        values[last_paid_line + 1][:period_fees]
       )
       remaining_capital_for_ratio = (
-        values[last_paid_line + 1][:remaining_capital_start] +
-        values[last_paid_line + 1][:capitalized_interests_start] +
-        values[last_paid_line + 1][:period_calculated_interests]
+        values[last_paid_line + 1][:remaining_capital_end] +
+        values[last_paid_line + 1][:capitalized_interests_end]
       )
 
       ratio = options.fetch(:ratio, capital_paid_for_ratio.to_f / remaining_capital_for_ratio).to_f

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -170,7 +170,7 @@ module BlendSpreadsheetLoanGenerator
 
     def period_calculated_fees_formula(line:, first_term_skip: false)
       term = line - 1
-      return excel_float(0.0) if first_term_skip
+      return excel_float(0.0) if first_term_skip && term == 1
       if loan.bullet_term?(term)
         index = first_term_skip ? index(line - 1) : index(line)
 
@@ -180,7 +180,7 @@ module BlendSpreadsheetLoanGenerator
 
         "=#{current} - #{capitalized_fees_start(line)}"
       elsif loan.deferred_and_capitalized > 0 && term > loan.deferred_and_capitalized
-        index = first_term_skip ? loan.deferred_and_capitalized : loan.deferred_and_capitalized - 1
+        index = first_term_skip ? loan.deferred_and_capitalized - 1 : loan.deferred_and_capitalized
 
         with_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)} + #{period_fees_rate(line)})^#{index} * (#{period_rate(line)} + #{period_fees_rate(line)})"
         without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index} * #{period_rate(line)}"
@@ -207,7 +207,7 @@ module BlendSpreadsheetLoanGenerator
 
     def capitalized_fees_end_formula(line:, first_term_skip: false)
       term = line - 1
-      return excel_float(0.0) if first_term_skip
+      return excel_float(0.0) if first_term_skip && term == 1
       if term <= loan.deferred_and_capitalized
         index = first_term_skip ? index(line - 1) : index(line)
         with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index}"

data/lib/blend_spreadsheet_loan_generator/restructure.rb

@@ -74,7 +74,7 @@ module BlendSpreadsheetLoanGenerator
 
       @formula = Formula.new(loan: loan)
 
-      apply_formulas(worksheet: worksheet, first_term_skip: true)
+      apply_formulas(worksheet: worksheet)
       apply_formats(worksheet: worksheet)
 
       worksheet.save

data/lib/blend_spreadsheet_loan_generator/version.rb

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