🔀 Merge pull request #34 from cristianlivella/develop

✨ Implemented new methods for RW final value calculation (fix #19)
cristianlivella · Mar 17, 2022 · 79b3f83 · 79b3f83
2 parents 60ac70e + 18ea539
commit 79b3f83
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/app/Controllers/WebAppController.php b/src/app/Controllers/WebAppController.php
@@ -62,10 +62,11 @@ public static function printModelloRedditi() {
         $settings = self::getSelectedReportSettings();
         $compensateCapitalLosses = $settings['compensate_losses'] ?? true;
         $exchangeSettings = $settings['exchanges'] ?? [];
+        $finalValueMethod = $settings['rw_final_value_method'] ?? 'average_value';
 
         $reportWrapper = new ReportWrapper(self::getSelectedReportContent(), $exchangeSettings);
 
-        echo $reportWrapper->getModelloRedditi($year, $compensateCapitalLosses);
+        echo $reportWrapper->getModelloRedditi($year, $compensateCapitalLosses, $finalValueMethod);
     }
 
     public static function printModelloF24() {
@@ -122,6 +123,10 @@ public static function setSettings() {
             $settings['compensate_losses'] = filter_var($_POST['compensate_losses'] ?? true, FILTER_VALIDATE_BOOLEAN);
         }
 
+        if (isset($_POST['rw_final_value_method'])) {
+            $settings['rw_final_value_method'] = $_POST['rw_final_value_method'];
+        }
+
         self::setCookie('SETTINGS-' . $reportId, base64_encode(json_encode($settings)));
     }
 

diff --git a/src/app/Models/Report.php b/src/app/Models/Report.php
@@ -393,14 +393,23 @@ public function getInfoForModelloRedditi() {
      *
      * @return array
      */
-    public function getModelloRedditiSectionRwInfo() {
+    public function getModelloRedditiSectionRwInfo($finalValueMethod = 'average_value') {
+        if ($finalValueMethod === 'real_value') {
+            $finalValue = $this->cryptoInfoBag->getTotalValues()['value_end_of_year'];
+        } elseif ($finalValueMethod === 'real_value_more_incomes') {
+            $finalValue = $this->cryptoInfoBag->getTotalValues()['value_end_of_year'] + $this->currentYearIncome;
+        } else {
+            // fallback to average_value
+            $finalValue = $this->cryptoInfoBag->getTotalValues()['average_value'];
+        }
+
         return [
             'initial_value' => (
                 $this->fiscalYear === $this->getFirstYear() ?
                 $this->transactionsBag->transactions[1]->value :
                 $this->cryptoInfoBag->getTotalValues()['value_start_of_year']
             ),
-            'final_value' => $this->cryptoInfoBag->getTotalValues()['average_value']
+            'final_value' => $finalValue
         ];
     }
 

diff --git a/src/app/Models/ReportWrapper.php b/src/app/Models/ReportWrapper.php
@@ -113,12 +113,12 @@ public function getReport($year) {
         ]);
     }
 
-    public function getModelloRedditi($year, $compensateCapitalLosses = true) {
+    public function getModelloRedditi($year, $compensateCapitalLosses = true, $finalValueMethod = 'average_value') {
         $this->elaborateReport($year);
 
         $info = $this->report->getInfoForModelloRedditi() + [
             'rl' => $this->getSectionRlInfo($year),
-            'rw' => $this->report->getModelloRedditiSectionRwInfo(),
+            'rw' => $this->report->getModelloRedditiSectionRwInfo($finalValueMethod),
             'rt' => $this->getSectionRtInfo($year, $compensateCapitalLosses),
             'rm' => $this->getSectionRmInfo($year)
         ];