blend_spreadsheet_loan_generator 0.1.43 → 0.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579b2d03b24b45a57e78c9c5ddf59b268e308bed4cc8430abe7d1c16ef0f1947
-  data.tar.gz: c0ba98674ce0c1d2a77571969e30fd4dbdb4da04a7c38dff8fbce8e66dc939d7
+  metadata.gz: 67df2b7e1ae954e3a178958ff9ae38eac5c075dad5da0e0746a2dbe5d2ef12a4
+  data.tar.gz: 8fb75d6abae44e6df84aa79a3df562ee468c70d904db568a4cc452988af47f7d
 SHA512:
-  metadata.gz: 839a032643e22e7445b1dfe06d3cc2bd97db8ee65c84bc2f4e18f157206a5a068b83825100595af093dde0925babfb3a119843ed321cb36a52f08974323e789a
-  data.tar.gz: f17f59099f9ab23e65cbef14230c76bd17ce90aad022d9e433a4b3b53bf2ec4cafefc82c988ca478e0ceac8b606acade5c89845f0edecb254dfc5876db6f1971
+  metadata.gz: e3920a396b1195ce22bb4d20682747d98896c37e68bc93bee8936505192357a71c09e10a5c5e8cfee7116309a45d61b421c58a79dbaba4b6a530249919884167
+  data.tar.gz: ea1a0ea185b50379b64f0425f2f18967bad50a893c06531cd89f751da36c911827f8ac1c2611603b8177d037716b390e9fa2126527702900cef0b4844d7ac8c2

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -170,12 +170,7 @@ module BlendSpreadsheetLoanGenerator
 
     def period_calculated_fees_formula(line:, early_repayment: false)
       term = line - 1
-      if loan.deferred_and_capitalized > 0 && term > loan.deferred_and_capitalized
-        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)} + #{period_fees_rate(line)})^#{loan.deferred_and_capitalized} * (#{period_rate(line)} + #{period_fees_rate(line)})"
-        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{loan.deferred_and_capitalized} * #{period_rate(line)}"
-
-        "=#{with_fees} - #{without_fees}"
-      elsif loan.bullet_term?(term)
+      if loan.bullet_term?(term)
         index = (
           if early_repayment
             index(line - 1)
@@ -188,6 +183,11 @@ module BlendSpreadsheetLoanGenerator
         current = "#{with_fees} - #{without_fees}"
 
         "=#{current} - #{capitalized_fees_start(line)}"
+      elsif loan.deferred_and_capitalized > 0 && term > loan.deferred_and_capitalized
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)} + #{period_fees_rate(line)})^#{loan.deferred_and_capitalized} * (#{period_rate(line)} + #{period_fees_rate(line)})"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{loan.deferred_and_capitalized} * #{period_rate(line)}"
+
+        "=#{with_fees} - #{without_fees}"
       else
         amount_to_capitalize = [
           '(',

data/lib/blend_spreadsheet_loan_generator/version.rb

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