blend_spreadsheet_loan_generator 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0473a465aaf8c05516fd8ed8eeff3009996f4afe3c9dbc5578df88fb4985a03a
-  data.tar.gz: a73d70c1cbfd2d2241dd2bc875750358bf6893914739b0b5efaf65271e8800f1
+  metadata.gz: 169f284925fdd8ff961eecf431c8fd62625cf9b5cc1006cf2c0d1fe2ff3d290d
+  data.tar.gz: af871dff6102cbb857cd7fbc65f75265b597cee10689adc820c1b7060cf72dbe
 SHA512:
-  metadata.gz: 55e0989827c375bc5f13d58c7bef7d7bf0024126f838997b7a5c669e5a4bb378020c4dff1d616b78f6686f3b3050bbba7a5132fd18385cf0aaa668d1e8fd09a6
-  data.tar.gz: 76cbd06e23b5250740ad087e08f4f61f22c6ae828e2ea1dec23559a2d55ae4bfbd5e1f7d72f81f0efa823ca3de7dd7dd86c2ca3c864fb68e7a7d7e4ee41a6bf8
+  metadata.gz: 483fbcafe2c4f763f2b1a53108d4d80f344471a730de69e2a938370ae5159581925f93b1efa33e29530afbc74897a0aaf4251a9885c46ac2f7926478a15c51cc
+  data.tar.gz: da813c5b56325a72db5023b2fad4be50008bb112c2198ac491a99d7d17c57131245eb2bc48750aef5c19addd9b2825a27e34a7e639a59ac125844c63e4aa4e11

data/exe/bslg

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/blend_spreadsheet_loan_generator'
+
 Dry::CLI.new(BlendSpreadsheetLoanGenerator).call

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -80,27 +80,24 @@ module BlendSpreadsheetLoanGenerator
 
       capital_paid = amount_paid.to_f - (
         values[last_paid_line + 1][:capitalized_interests_start] +
-        values[last_paid_line + 1][:capitalized_fees_start]
-      )
-      actual_capital_paid = (
-        capital_paid -
-        values[last_paid_line + 1][:period_calculated_interests] -
+        values[last_paid_line + 1][:capitalized_fees_start] +
+        values[last_paid_line + 1][:period_calculated_interests] +
         values[last_paid_line + 1][:period_calculated_fees]
       )
 
-      ratio = options.fetch(:ratio, (actual_capital_paid.to_f / values[last_paid_line + 1][:remaining_capital_start])).to_f
+      ratio = options.fetch(:ratio, (capital_paid.to_f / values[last_paid_line + 1][:remaining_capital_start])).to_f
       guaranteed_interests_paid = (
         ratio * total_guaranteed_interests
       )
-      capital_paid -= guaranteed_interests_paid
 
       amount = (
         if last_paid_line == -1
-          values[0][:remaining_capital_end]
+          values[0][:remaining_capital_start]
         else
           values[last_paid_line][:remaining_capital_end]
         end
       )
+
       @loan = Loan.new(
         amount: amount,
         duration: duration,
@@ -124,10 +121,10 @@ module BlendSpreadsheetLoanGenerator
       apply_formulas(worksheet: worksheet)
 
       worksheet[2, columns.index('remaining_capital_start') + 1] =
-        excel_float(values[last_paid_line][:remaining_capital_end])
+        excel_float(values[last_paid_line + 1][:remaining_capital_start])
 
       worksheet[2, columns.index('remaining_capital_end') + 1] =
-        "=#{excel_float(values[last_paid_line][:remaining_capital_end])} - #{period_capital(2)}"
+        "=#{excel_float(values[last_paid_line + 1][:remaining_capital_start])} - #{period_capital(2)}"
 
       worksheet[2, columns.index('period_interests') + 1] =
         "=ARRONDI(#{period_theoric_interests(2)}; 2)"
@@ -138,8 +135,7 @@ module BlendSpreadsheetLoanGenerator
       worksheet[2, columns.index('period_fees') + 1] =
         "=#{excel_float(values[last_paid_line + 1][:period_calculated_fees])}"
 
-      worksheet[2, columns.index('period_capital') + 1] =
-        "=#{excel_float(capital_paid)} - #{period_interests(2)} - #{period_fees(2)}"
+      worksheet[2, columns.index('period_capital') + 1] = "=#{excel_float(capital_paid)}"
 
       worksheet[2, columns.index('capitalized_interests_start') + 1] =
         excel_float(values[last_paid_line + 1][:capitalized_interests_start])

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.24'.freeze
+  VERSION = '0.1.25'.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.24
+  version: 0.1.25
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport