blend_spreadsheet_loan_generator 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a7e3accb3a4c91a0e137d14ce6edd247ee88ebfe3d0274eecc6c00c8992bff3
-  data.tar.gz: 07d4a5959dfff0b803ebd21d8bd8373169d5e59e112a8ed8d9004cdfa6afff0c
+  metadata.gz: 27190e62c6f022886585a05178b48b3145887fc2299d32dd184572d034f8a22f
+  data.tar.gz: 4208f3be04bc68c700ad262fcd90e7e6130c3eb3414ef5ac8ae46035a6d7cb30
 SHA512:
-  metadata.gz: f696017d9e91af295abfa3f6c35a2a8a166b4c2db458df06119e8572d19e36bdba78442f2529cced271394e5652fe8c29483c322daf513a75faeb28dcb5a8bd3
-  data.tar.gz: d98ef75e469b8bda35fd9a6d1f46ebaecf7e57d2f3e20164f7b2839a147aba24a1b2d5d59e09da7d13a97e317a89e98bac144efd05177a02b2b1594b0be8fe57
+  metadata.gz: 075fae95ddf44ce9ce1b360debd2942c5cfbb94a623f9f37519f74109db3f43cab3624953c383a14dfc829819a1e3d363e569aada4305ea63755313ccc58df3b
+  data.tar.gz: 1c2721d5083b1e9e5bda9055dcc9ae3afe69744fb3b98036373a6b57f18e2d6dce2e0d34e0894cff7e21c8dd376b5fe9ea3e9790935e85cf721dc6456328327c

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
@@ -176,6 +174,12 @@ module BlendSpreadsheetLoanGenerator
         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 == loan.duration
+        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_end(line - 1)}"
       else
         amount_to_capitalize = [
           '(',

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.36'.freeze
+  VERSION = '0.1.37'.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.36
+  version: 0.1.37
 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