Merge pull request #2724 from EnesSacid-Buker/stacks

The names of stacks in blades (transaction & transfer)

resources/views/components/transactions/template/default.blade.php

@@ -264,6 +264,10 @@
             @stack('email_input_end')
         @endif
 
+        @stack('amount_input_start')
+        {{-- The reason for adding the amount part here is because the amount style is broken in the view. --}}
+        @stack('amount_input_end')
+
         <tr>
             <td></td>
         </tr>

resources/views/components/transfers/template/default.blade.php

@@ -2,7 +2,7 @@
     @stack('from_account_start')
     <table class="border-bottom-1">
         <tbody>
-            @stack('from_account_id_start')
+            @stack('from_account_id_input_start')
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
                     <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
@@ -86,7 +86,7 @@
                     @endif
                 </td>
             </tr>
-            @stack('from_account_id_end')
+            @stack('from_account_id_input_end')
         </tbody>
     </table>
     @stack('from_account_end')
@@ -94,7 +94,7 @@
     @stack('to_account_start')
     <table class="border-bottom-1" style="margin-top:15px;">
         <tbody>
-            @stack('to_account_id_start')
+            @stack('to_account_id_input_start')
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
                     <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
@@ -178,7 +178,7 @@
                     @endif
                 </td>
             </tr>
-            @stack('to_account_id_end')
+            @stack('to_account_id_input_end')
         </tbody>
     </table>
     @stack('to_account_end')
@@ -247,19 +247,21 @@
         </tr>
         @stack('description_input_end')
 
+        @stack('amount_input_start')
+        {{-- The reason for adding the amount part here is because the amount style is broken in the view. --}}
+        @stack('amount_input_end')
+
         <tr>
             <td></td>
         </tr>
     </table>
     @stack('details_end')
 
-    @stack('amount_start')
+    
     <table style="text-align: right; margin-top:55px;">
-        @stack('amount_table_start')
         <tr>
             <td valign="center" style="width:80%; display:block; float:right; background-color: #55588B; -webkit-print-color-adjust: exact; color:#ffffff; border-radius: 5px;">
                 <table>
-                    @stack('amount_input_start')
                     <tr>
                         <td valign="center" class="font-semibold" style="padding:0; font-size: 14px; color:#ffffff;">
                             <span class="ml-2">
@@ -269,11 +271,8 @@
                             <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
                         </td>
                     </tr>
-                    @stack('amount_input_end')
                 </table>
             </td>
         </tr>
-        @stack('amount_table_end')
     </table>
-    @stack('amount_end')
 </div>

resources/views/components/transfers/template/second.blade.php

@@ -68,7 +68,7 @@
     @stack('from_account_start')
     <table style="width: 100%; margin-top:35px;">
         <tbody>
-            @stack('from_account_id_start')
+            @stack('from_account_id_input_start')
             <tr>
                 <td class="border-bottom-1 border-top-1" style="width: 60%; padding: 15px 0 15px 0;">
                     <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
@@ -152,7 +152,7 @@
                     @endif
                 </td>
             </tr>
-            @stack('from_account_id_end')
+            @stack('from_account_id_input_end')
         </tbody>
     </table>
     @stack('from_account_end')
@@ -160,7 +160,7 @@
     @stack('to_account_start')
     <table style="width: 100%; margin-top:15px;">
         <tbody>
-            @stack('to_account_id_start')
+            @stack('to_account_id_input_start')
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
                     <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
@@ -242,20 +242,21 @@
                         @stack('to_account_address_input_end')
                     </table>
                     @endif
+
+                    @stack('amount_input_start')
+                    {{-- The reason for adding the amount part here is because the amount style is broken in the view. --}}
+                    @stack('amount_input_end')
                 </td>
             </tr>
-            @stack('to_account_id_end')
+            @stack('to_account_id_input_end')
         </tbody>
     </table>
     @stack('to_account_end')
 
-    @stack('amount_start')
     <table style="text-align: right;">
-        @stack('amount_table_start')
         <tr>
             <td valign="center" style="width:80%; display:block; float:right;">
                 <table>
-                    @stack('amount_input_start')
                     <tr>
                         <td valign="center" class="font-semibold" style="padding:0; font-size: 14px;">
                             <span class="ml-2">
@@ -265,11 +266,8 @@
                             <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
                         </td>
                     </tr>
-                    @stack('amount_input_end')
                 </table>
             </td>
         </tr>
-        @stack('amount_table_end')
     </table>
-    @stack('amount_end')
 </div>

resources/views/components/transfers/template/third.blade.php

@@ -6,7 +6,7 @@
                     @stack('from_account_start')
                     <table>
                         <tbody>
-                            @stack('from_account_id_start')
+                            @stack('from_account_id_input_start')
                             <tr>
                                 <td style="padding:0;">
                                     <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
@@ -90,7 +90,7 @@
                                     @endif
                                 </td>
                             </tr>
-                            @stack('from_account_id_end')
+                            @stack('from_account_id_input_end')
                         </tbody>
                     </table>
                     @stack('from_account_end')
@@ -100,7 +100,7 @@
                     @stack('to_account_start')
                     <table>
                         <tbody>
-                            @stack('to_account_id_start')
+                            @stack('to_account_id_input_start')
                             <tr>
                                 <td style="padding:0;">
                                     <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
@@ -184,7 +184,7 @@
                                     @endif
                                 </td>
                             </tr>
-                            @stack('to_account_id_end')
+                            @stack('to_account_id_input_end')
                         </tbody>
                     </table>
                     @stack('to_account_end')
@@ -257,19 +257,20 @@
         </tr>
         @stack('description_input_end')
 
+        @stack('amount_input_start')
+        {{-- The reason for adding the amount part here is because the amount style is broken in the view. --}}
+        @stack('amount_input_end')
+
         <tr>
             <td></td>
         </tr>
     </table>
     @stack('details_end')
 
-    @stack('amount_start')
     <table style="text-align: right;">
-        @stack('amount_table_start')
         <tr>
             <td valign="center" style="width:80%; display:block; float:right;">
                 <table>
-                    @stack('amount_input_start')
                     <tr>
                         <td valign="center" class="font-semibold" style="width: 80%; padding:0; font-size: 14px;">
                             <span class="ml-2">
@@ -279,11 +280,8 @@
                             <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
                         </td>
                     </tr>
-                    @stack('amount_input_end')
                 </table>
             </td>
         </tr>
-        @stack('amount_table_end')
     </table>
-    @stack('amount_end')
 </div>