Fix some cases in loans

app/Services/Internal/Support/CreditRecalculateService.php

@@ -72,11 +72,8 @@ class CreditRecalculateService
 
             return;
         }
-        $this->processWork();
-
-
         Log::debug('Will now do CreditRecalculationService');
-        // do something
+        $this->processWork();
     }
 
     /**
@@ -111,7 +108,7 @@ class CreditRecalculateService
         $transactions = $account->transactions()->get();
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
-            $leftOfDebt = $this->processTransaction($transaction, $leftOfDebt);
+            $leftOfDebt = $this->processTransaction($account, $transaction, $leftOfDebt);
         }
         $factory->crud($account, 'current_debt', $leftOfDebt);
 
@@ -242,13 +239,28 @@ class CreditRecalculateService
      *
      * @return string
      */
-    private function processTransaction(Transaction $transaction, string $amount): string
+    private function processTransaction(Account $account, Transaction $transaction, string $amount): string
     {
+        Log::debug(sprintf('Now in %s(#%d, %s)', __METHOD__, $transaction->id, $amount));
         $journal = $transaction->transactionJournal;
         $type    = $journal->transactionType->type;
+
+        Log::debug(sprintf('Type is "%s"', $type));
+        if (in_array($type, [TransactionType::WITHDRAWAL]) && (int)$account->id === (int)$transaction->account_id && 1 === bccomp($transaction->amount, '0')) {
+            Log::debug(sprintf('Transaction #%d is withdrawal into liability #%d, does not influence the amount left.', $account->id, $transaction->account_id));
+
+            return $amount;
+        }
+        if (in_array($type, [TransactionType::DEPOSIT]) && (int)$account->id === (int)$transaction->account_id && -1 === bccomp($transaction->amount, '0')) {
+            Log::debug(sprintf('Transaction #%d is deposit from liability #%d,does not influence the amount left.', $account->id, $transaction->account_id));
+
+            return $amount;
+        }
+
         if (in_array($type, [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER], true)) {
             $amount = bcadd($amount, bcmul($transaction->amount, '-1'));
         }
+        Log::debug(sprintf('Amount is now %s', $amount));
 
         return $amount;
     }

resources/views/v1/list/groups.twig

@@ -139,11 +139,13 @@
                     {% endif %}
                 </td>
                 <td style=" {{ style|raw }}">
+                    {#  deposit #}
                     {% if transaction.transaction_type_type == 'Deposit' %}
                         {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                         {% if null != transaction.foreign_amount %}
                             ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                         {% endif %}
+                    {# transfer #}
                     {% elseif transaction.transaction_type_type == 'Transfer' %}
                         <span class="text-info">
                         {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
@@ -151,6 +153,7 @@
                                 ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                             {% endif %}
                             </span>
+                    {# opening balance #}
                     {% elseif transaction.transaction_type_type == 'Opening balance' %}
                         {% if transaction.source_account_type == 'Initial balance account' %}
                             {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -163,6 +166,7 @@
                                 ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             {% endif %}
                         {% endif %}
+                    {# reconciliation #}
                     {% elseif transaction.transaction_type_type == 'Reconciliation' %}
                         {% if transaction.source_account_type == 'Reconciliation account' %}
                             {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
@@ -175,6 +179,22 @@
                                 ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             {% endif %}
                         {% endif %}
+                    {# liability credit #}
+                    {% elseif transaction.transaction_type_type == 'Liability credit' %}
+                        {% if transaction.source_account_type == 'Liability credit' %}
+                            {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% if null != transaction.foreign_amount %}
+                                ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                            {% endif %}
+                        {% else %}
+                            {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% if null != transaction.foreign_amount %}
+                                ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                            {% endif %}
+                        {% endif %}
+
+
+                        {# THE REST #}
                     {% else %}
                         {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                         {% if null != transaction.foreign_amount %}