blend_spreadsheet_loan_generator 0.1.34 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8afe8c32a76a11a3afd5fd90cc9c5728116650fdb99c3d68cbc9a69c6016d671
-  data.tar.gz: d727c22901f61615b4ef4cb592fe9f357dfbe1dfb65ca3fccb6a9b3ef1149b76
+  metadata.gz: d043810b8912e85bfe40bcfee3a276bc123abfd79347ab6673ee81e752fade55
+  data.tar.gz: d1eaab1e4233d002cb125bd57f2027e165e3f41585e41ec01550d302f73f89f2
 SHA512:
-  metadata.gz: bd1c6e2922917ca77eb25f0bb316e9e693d1ecf8a6abddfbeb174c5facd778ad01979233af173bcaa822ee2f45805641738ebffd8657ef865645ddfc0aa2d139
-  data.tar.gz: 89a27d018920a740a9813a016fdc12bc183a10deabd001bd029274cfb9c384d1728401093e6ff1aff51abcaf2c437ecdbd8169d56fa6fb77346a517b590756d5
+  metadata.gz: a86ad2ef28e743138548bc11ef58215557eeada70dbf373b38e34e9a64fdcaf1c301ef95fe4ff31dda5becdc384747799ce214151ed2ec964d00ca82608ff12f
+  data.tar.gz: 876b38428df482b091fc480dfae9a643e9a8c4b231f7ff60a3c488f7b3553fcf4e152ac3d9e45aa16ec1ae8213d7edc3276fc4c1c91e95276c1da2c7ebcc6cf2

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -163,8 +163,6 @@ 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
@@ -173,9 +171,15 @@ module BlendSpreadsheetLoanGenerator
     def period_calculated_fees_formula(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 = "#{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)
+        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)}"
+        current = "#{with_fees} - #{without_fees}"
+
+        "=#{current} - #{capitalized_fees_start(line)}"
       else
         amount_to_capitalize = [
           '(',

data/lib/blend_spreadsheet_loan_generator/loan.rb

@@ -112,6 +112,10 @@ module BlendSpreadsheetLoanGenerator
       fully_deferred? && deferred_and_capitalized == total_deferred_duration
     end
 
+    def bullet_term?(term)
+      deferred_and_capitalized <= term || bullet? # for last term
+    end
+
     def in_fine?
       fully_deferred? && deferred == total_deferred_duration
     end

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.34'.freeze
+  VERSION = '0.1.39'.freeze
 
   class Version < Dry::CLI::Command
     desc 'Print version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blend_spreadsheet_loan_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.34
+  version: 0.1.39
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport