Expand and pick up layout.

resources/assets/v2/vite.config.js

@@ -36,8 +36,8 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
     let https = null;
     if (command === 'serve') {
         https = {
-            key: fs.readFileSync(`/vagrant/tls-certificates/wildcard.sd.internal.key`),
+            key: fs.readFileSync(`/Users/sander/Sites/vm/tls-certificates/wildcard.sd.internal.key`),
-            cert: fs.readFileSync(`/vagrant/tls-certificates/wildcard.sd.internal.crt`),
+            cert: fs.readFileSync(`/Users/sander/Sites/vm/tls-certificates/wildcard.sd.internal.crt`),
         };
     }
 
@@ -83,7 +83,7 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
 
         server: {
             cors: true,
-            origin: 'https://firefly.sd.internal:5173',
+            origin: 'https://localhost:5173',
             watch: {
                 usePolling: true,
             },

resources/views/list/groups.twig

@@ -165,20 +165,28 @@
                 <td style="{{ style|raw }};text-align:right">
                     {#  deposit #}
                     {% if transaction.transaction_type_type == 'Deposit' %}
+                        {# amount of deposit #}
                         {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                        {# foreign amount of deposit #}
                         {% if null != transaction.foreign_amount %}
                             ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                         {% endif %}
+                        {# native amount of deposit #}
                         {% if convertToNative and 0 != transaction.native_amount %}
                             ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
                         {% endif %}
                         {# transfer #}
                     {% elseif transaction.transaction_type_type == 'Transfer' %}
                         <span class="text-info money-transfer">
+                            {# amount of transfer #}
                             {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+
+                            {# foreign amount of transfer #}
                             {% if null != transaction.foreign_amount %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                             {% endif %}
+
+                            {# native amount of transfer #}
                             {% if convertToNative and 0 != transaction.native_amount %}
                                 ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
                             {% endif %}
@@ -244,10 +252,14 @@
 
                         {# THE REST #}
                     {% else %}
+                        {# amount of withdrawal #}
                         {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+
+                        {# foreign amount of withdrawal #}
                         {% if null != transaction.foreign_amount %}
                             ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                         {% endif %}
+                        {# native amount of withdrawal #}
                         {% if convertToNative and 0 != transaction.native_amount %}
                             ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
                         {% endif %}

resources/views/v2/partials/dashboard/account-list.blade.php

@@ -9,7 +9,7 @@
             <div class="card">
                 <div class="card-header">
                     <h3 class="card-title">
-                        <a :href="'{{ route('accounts.show', '0') }}/' + account.id"
+                        <a :href="'{{ route('accounts.show', '') }}/' + account.id"
                            x-text="account.name"></a>
 
                         <span class="small">
@@ -42,7 +42,7 @@
                                             <template x-if="group.transactions[0].type === 'transfer'">
                                                 <span class="text-muted fa-solid fa-arrows-rotate fa-fw"></span>
                                             </template>
-                                        <a :href="'{{route('transactions.show', '0') }}/' + group.id" x-text="group.title"></a><br/></span>
+                                        <a :href="'{{route('transactions.show', '') }}/' + group.id" x-text="group.title"></a><br/></span>
                                     </template>
                                     <ul class="list-unstyled list-no-margin">
                                     <template x-for="transaction in group.transactions">
@@ -61,7 +61,7 @@
                                                   <template x-if="transaction.type == 'transfer'">
                                                       <span class="text-muted fa-solid fa-arrows-rotate fa-fw"></span>
                                                   </template>
-                                                  <a :href="'{{route('transactions.show', '0') }}/' + group.id" x-text="transaction.description"></a>
+                                                  <a :href="'{{route('transactions.show', '') }}/' + group.id" x-text="transaction.description"></a>
                                                 </span>
                                             </template>
                                             </li>
@@ -75,7 +75,7 @@
                                     <ul class="list-unstyled list-no-margin">
                                     <template x-for="transaction in group.transactions">
                                         <li>
-                                            @include('partials.elements.amount', ['convertToNative' => true,'type' => 'transaction.type','amount' => 'transaction.amount','native' => 'transaction.native_amount'])
+                                            @include('partials.elements.amount', ['convertToNative' => true,'type' => 'transaction.type','amount' => 'transaction.amount','native' => 'transaction.amount'])
                                         </li>
                                     </template>
                                     </ul>

resources/views/v2/partials/dashboard/subscriptions.blade.php

@@ -30,7 +30,7 @@
                         <template x-for="bill in group.bills">
                             <tr>
                                 <td>
-                                    <a :href="'{{ route('subscriptions.show',['0'])  }}/' + bill.id" :title="bill.name">
+                                    <a :href="'{{ route('subscriptions.show',[''])  }}/' + bill.id" :title="bill.name">
                                         <span x-text="bill.name"></span>
                                     </a>
                                     <template x-if="bill.paid">

routes/web.php

@@ -183,7 +183,7 @@ Route::group(
 
         // show
         Route::get('show/{account}/all', ['uses' => 'Account\ShowController@showAll', 'as' => 'show.all']);
-        Route::get('show/{account}/{start_date?}/{end_date?}', ['uses' => 'Account\ShowController@show', 'as' => 'show'])
+        Route::get('show/{account?}/{start_date?}/{end_date?}', ['uses' => 'Account\ShowController@show', 'as' => 'show'])
             ->where(['start_date' => DATEFORMAT])
             ->where(['end_date' => DATEFORMAT])
         ;
@@ -255,7 +255,7 @@ Route::group(
         Route::get('create', ['uses' => 'Bill\CreateController@create', 'as' => 'create']);
         Route::get('edit/{bill}', ['uses' => 'Bill\EditController@edit', 'as' => 'edit']);
         Route::get('delete/{bill}', ['uses' => 'Bill\DeleteController@delete', 'as' => 'delete']);
-        Route::get('show/{bill}', ['uses' => 'Bill\ShowController@show', 'as' => 'show']);
+        Route::get('show/{bill?}', ['uses' => 'Bill\ShowController@show', 'as' => 'show']);
 
         Route::post('store', ['uses' => 'Bill\CreateController@store', 'as' => 'store']);
         Route::post('update/{bill}', ['uses' => 'Bill\EditController@update', 'as' => 'update']);
@@ -1295,7 +1295,7 @@ Route::group(
         // unreconcile
         Route::post('unreconcile/{tj}', ['uses' => 'Transaction\EditController@unreconcile', 'as' => 'unreconcile']);
 
-        Route::get('show/{transactionGroup}', ['uses' => 'Transaction\ShowController@show', 'as' => 'show']);
+        Route::get('show/{transactionGroup?}', ['uses' => 'Transaction\ShowController@show', 'as' => 'show']);
         Route::get('debug/{transactionGroup}', ['uses' => 'Transaction\ShowController@debugShow', 'as' => 'debug']);
     }
 );