blend_spreadsheet_loan_generator 0.1.101 → 0.1.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 921655773138be86f9be5537649ee90ca790e2d67e552c743a5cd74115db1bc7
-  data.tar.gz: d83df61bf603fecc1b04d7c13ff25fdf2f1e5370baaf12eb0063ad2ba84349c2
+  metadata.gz: 72957cc9d2f27e41c08296925655eb7a260e7fdaef6c0930dcc308f9a7c8ab25
+  data.tar.gz: ff081b04d72056d4de09f73e026069c4eae6151f1a684fab698aa796065ae635
 SHA512:
-  metadata.gz: 9e80b9833c4a7cf49a850e3343cd85cfb2df61877c81b05d0b94d45fcb07fc318e1aaadf4a7cde6687a0497870bcadee7786ef16c8b0b04a86e3e7e72d4076e0
-  data.tar.gz: 7ed5dbc054272947b041186687e35845f4dc0c267cb9e686758782b259b1d22b4db31123f368ec518184aace63096ad45c1150ca7d09cdb8f79e6e9a2089ffe8
+  metadata.gz: 22fd450d7087a51b999348bb324a9d38726ea33425ba85e77c77026a871e7ff4ff0fb2e2ff685aa7110d3920efaeccabce75382e15f4f3ee8dc2558e27dbd04c
+  data.tar.gz: 12e57b1f793e676501f7d1c127052eaf0d1f313b9a10a90238c1aa6164fb0ab2bd6082a79cde7b3c1dc78522d9044b02e1b6ee978b839f3d222a38dda537c0de

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -100,7 +100,7 @@ module BlendSpreadsheetLoanGenerator
         end
         loan.duration.times do |line|
           columns.each.with_index do |title, column|
-            if first_term_skip && title.in?(custom_early_repayment)
+            if first_term_skip && title.in?(first_term_skip_columns)
               worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2, first_term_skip: true)
             else
               worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2)

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -170,6 +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 && term == 1
       if loan.bullet_term?(term)
         index = first_term_skip ? index(line - 1) : index(line)
 
@@ -179,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)}"
@@ -206,6 +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 && 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.101'.freeze
+  VERSION = '0.1.105'.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.101
+  version: 0.1.105
 platform: ruby
 authors:
 - MZiserman