Expand view for #780

app/Http/Controllers/TransactionController.php

@@ -17,6 +17,7 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalTaskerInterface;
@@ -28,7 +29,6 @@ use Log;
 use Navigation;
 use Preferences;
 use Response;
-use Steam;
 use View;
 
 /**
@@ -198,7 +198,7 @@ class TransactionController extends Controller
         $cache->addProperty('transaction-list-entries');
 
         if ($cache->has()) {
-            return $cache->get(); // @codeCoverageIgnore
+            // return $cache->get(); // @codeCoverageIgnore
         }
 
         Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
@@ -212,35 +212,24 @@ class TransactionController extends Controller
             $collector = app(JournalCollectorInterface::class);
             $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withOpposingAccount()->setTypes($types);
             $collector->removeFilter(InternalTransferFilter::class);
-            $set      = $collector->getJournals();
+            $journals = $collector->getJournals();
-            $sum      = $set->sum('transaction_amount');
+            $sum      = $journals->sum('transaction_amount');
-            $journals = $set->count();
+
+            // count per currency:
+            $sums     = $this->sumPerCurrency($journals);
             $dateStr  = $end->format('Y-m-d');
             $dateName = Navigation::periodShow($end, $range);
             $array    = [
                 'string' => $dateStr,
                 'name'   => $dateName,
-                'count'       => $journals,
+                'sum'    => $sum,
-                'spent'       => 0,
+                'sums'   => $sums,
-                'earned'      => 0,
-                'transferred' => 0,
                 'date'   => clone $end,
             ];
             Log::debug(sprintf('What is %s', $what));
-            switch ($what) {
+            if ($journals->count() > 0) {
-                case 'withdrawal':
-                    $array['spent'] = $sum;
-                    break;
-                case 'deposit':
-                    $array['earned'] = $sum;
-                    break;
-                case 'transfers':
-                case 'transfer':
-                    $array['transferred'] = Steam::positive($sum);
-                    break;
-
-            }
                 $entries->push($array);
+            }
             $end = Navigation::subtractPeriod($end, $range, 1);
         }
         Log::debug('End of loop');
@@ -249,4 +238,41 @@ class TransactionController extends Controller
         return $entries;
     }
 
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function sumPerCurrency(Collection $collection): array
+    {
+        $return = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $currencyId = $transaction->transaction_currency_id;
+
+            // save currency information:
+            if (!isset($return[$currencyId])) {
+                $currencySymbol      = $transaction->transaction_currency_symbol;
+                $decimalPlaces       = $transaction->transaction_currency_dp;
+                $currencyCode        = $transaction->transaction_currency_code;
+                $return[$currencyId] = [
+                    'currency' => [
+                        'id'     => $currencyId,
+                        'code'   => $currencyCode,
+                        'symbol' => $currencySymbol,
+                        'dp'     => $decimalPlaces,
+                    ],
+                    'sum'      => '0',
+                    'count'    => 0,
+                ];
+            }
+            // save amount:
+            $return[$currencyId]['sum'] = bcadd($return[$currencyId]['sum'], $transaction->transaction_amount);
+            $return[$currencyId]['count']++;
+        }
+        asort($return);
+
+        return $return;
+    }
+
 }

app/Models/Transaction.php

@@ -60,6 +60,10 @@ use Watson\Validating\ValidatingTrait;
  * @property string      $notes
  * @property string      $tags
  *
+ * @property string      $transaction_currency_symbol
+ * @property int         $transaction_currency_dp
+ * @property string      $transaction_currency_code
+ *
  * @package FireflyIII\Models
  */
 class Transaction extends Model

config/twigbridge.php

@@ -158,6 +158,7 @@ return [
             'Lang',
             'Preferences',
             'URL',
+            'Steam',
             'Config',
             'Request',
             'ExpandedForm' => [

resources/views/transactions/index.twig

@@ -15,6 +15,7 @@
         </div>
     {% endif %}
 
+    {# list with journals #}
     <div class="row">
         <div class="{% if periods.count > 0 %}col-lg-10 col-md-10 col-sm-12{% else %}col-lg-12 col-md-12 col-sm-12{% endif %}">
             <div class="box">
@@ -22,7 +23,10 @@
                     <h3 class="box-title">{{ subTitle }}</h3>
                 </div>
                 <div class="box-body ">
+                    {# actual list #}
                     {% include 'list.journals' with {'journals': journals} %}
+
+                    {# links for other views #}
                     {% if periods.count > 0 %}
                         <p>
                             <i class="fa fa-calendar"></i>
@@ -38,10 +42,13 @@
             </div>
         </div>
 
+        {# boxes with info #}
         {% if periods.count > 0 %}
             <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12">
                 {% for period in periods %}
-                    {% if period.count > 0 %}
+
+                    {% if period.sum != 0 %}
+
                         <div class="box {% if period.date == start %}box-solid box-primary{% endif %}">
                             <div class="box-header with-border">
                                 <h3 class="box-title"><a href="{{ route('transactions.index',[what, period.string]) }}">{{ period.name }}</a>
@@ -49,29 +56,34 @@
                             </div>
                             <div class="box-body no-padding">
                                 <table class="table table-hover">
+                                    <tbody>
+                                    {% for sum in period.sums %}
                                         <tr>
-                                        <td style="width:33%;">{{ 'transactions'|_ }}</td>
+                                            <td style="width:33%;">
-                                        <td style="text-align: right;">{{ period.count }}</td>
-                                    </tr>
                                                 {% if what == 'withdrawal' %}
-                                        <tr>
+                                                    {{ 'spent'|_ }}
-                                            <td style="width:33%;">{{ 'spent'|_ }}</td>
-                                            <td style="text-align: right;">{{ period.spent|formatAmount }}</td>
-                                        </tr>
                                                 {% endif %}
                                                 {% if what == 'deposit' %}
-                                        <tr>
+                                                    {{ 'earned'|_ }}
-                                            <td style="width:33%;">{{ 'earned'|_ }}</td>
-                                            <td style="text-align: right;">{{ period.earned|formatAmount }}</td>
-                                        </tr>
                                                 {% endif %}
                                                 {% if what == 'transfers' or what == 'transfer' %}
-                                        <tr>
+                                                    {{ 'transferred'|_ }}
-                                            <td style="width:33%;">{{ 'transferred'|_ }}</td>
-                                            <td style="text-align: right;" class="text-info">{{ period.transferred|formatAmountPlain }}</td>
-                                        </tr>
                                                 {% endif %}
+                                            </td>
+                                            <td style="text-align: right;" title="{{ trans('list.number_of_transactions') }}: {{ sum.count }}">
+                                                {% if what == 'transfers' or what == 'transfer' %}
+                                                    <span class="text-info">
+                                                        {{ formatAmountBySymbol(Steam.positive(sum.sum), sum.currency.symbol, sum.currency.dp, false) }}
+                                                    </span>
+                                                {% else %}
+                                                    {{ formatAmountBySymbol(sum.sum, sum.currency.symbol, sum.currency.dp) }}
+                                                {% endif %}
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                    </tbody>
                                 </table>
+
                             </div>
                         </div>
                     {% endif %}