blend_spreadsheet_loan_generator 0.1.32 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c908a47e7cfd11f049bbcf71442c828536f4c29e1b92fed35fb2e496c7a039
-  data.tar.gz: bcb3723e79bd901866231af08940d11a01e790e9c1303b240f981748c4a770bc
+  metadata.gz: 27190e62c6f022886585a05178b48b3145887fc2299d32dd184572d034f8a22f
+  data.tar.gz: 4208f3be04bc68c700ad262fcd90e7e6130c3eb3414ef5ac8ae46035a6d7cb30
 SHA512:
-  metadata.gz: 9b2ce78a943c5265d0ff1fc5f086b0b5d4ddd189589b492f428a9fdc3df01f4d0ea14394befe2f4388afc19d9caac0a1fb3fcd6eecc7c16e1321af7f0924c412
-  data.tar.gz: 923d79bab361d9eac36d94dc6f0738a580c36cfa69b3b2898986b50f49e7d22dcb83c7eb8b83aa0a92d6699ca97a2f59b543eb07a58e1245e09bbe2386298d96
+  metadata.gz: 075fae95ddf44ce9ce1b360debd2942c5cfbb94a623f9f37519f74109db3f43cab3624953c383a14dfc829819a1e3d363e569aada4305ea63755313ccc58df3b
+  data.tar.gz: 1c2721d5083b1e9e5bda9055dcc9ae3afe69744fb3b98036373a6b57f18e2d6dce2e0d34e0894cff7e21c8dd376b5fe9ea3e9790935e85cf721dc6456328327c

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -169,17 +169,28 @@ module BlendSpreadsheetLoanGenerator
     end
 
     def period_calculated_fees_formula(line:)
-      amount_to_capitalize = [
-        '(',
-        remaining_capital_start(line),
-        '+',
-        capitalized_interests_start(line),
-        '+',
-        capitalized_fees_start(line),
-        ')'
-      ].join(' ')
+      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 == 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}"
 
-      "=#{amount_to_capitalize} * #{period_fees_rate(line)}"
+        "=#{current} - #{capitalized_fees_end(line - 1)}"
+      else
+        amount_to_capitalize = [
+          '(',
+          remaining_capital_start(line),
+          '+',
+          capitalized_interests_start(line),
+          ')'
+        ].join(' ')
+
+        "=#{amount_to_capitalize} * #{period_fees_rate(line)}"
+      end
     end
 
     def capitalized_fees_start_formula(line:)

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.32'.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.32
+  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