Fixed document transaction create missing document totals issue solved..

akaunting · Feb 15, 2024 · ab2325d · ab2325d
1 parent 2d825b2
commit ab2325d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 24 deletions.
diff --git a/app/Http/Controllers/Modals/DocumentTransactions.php b/app/Http/Controllers/Modals/DocumentTransactions.php
@@ -55,12 +55,12 @@ public function create(Document $document)
             $document->{$document_total->code} = $document_total->amount;
         }
 
-        $total = money($document->total, $currency->code)->format();
+        $total = money($document?->total ?? 0, $currency->code)->format();
 
         $document->grand_total = money($total, $currency->code, false)->getAmount();
 
         if (! empty($paid)) {
-            $document->grand_total = round($document->total - $paid, $currency->precision);
+            $document->grand_total = round($document?->total ?? 0 - $paid, $currency->precision);
         }
 
         $amount =  $document->grand_total;
@@ -163,12 +163,12 @@ public function edit(Document $document, Transaction $transaction)
             $document->{$document_total->code} = $document_total->amount;
         }
 
-        $total = money($document->total, $currency->code)->format();
+        $total = money($document?->total ?? 0, $currency->code)->format();
 
         $document->grand_total = money($total, $currency->code, false)->getAmount();
 
         if (! empty($paid)) {
-            $document->grand_total = round($document->total - $paid, $currency->precision);
+            $document->grand_total = round($document?->total ?? 0 - $paid, $currency->precision);
         }
 
         $document->paid_at = $transaction->paid_at;

diff --git a/resources/views/components/documents/show/get-paid.blade.php b/resources/views/components/documents/show/get-paid.blade.php
@@ -94,16 +94,26 @@ class="py-1.5 mb-3 sm:mb-0 text-xs bg-transparent hover:bg-transparent font-medi
 
                             <span class="mt-1 mr-2 ml-2"> - </span>
 
-                            <x-button
-                                @click="onEditPayment('{{ route('modals.documents.document.transactions.edit', ['document' => $document->id, 'transaction' => $transaction->id]) }}')"
-                                id="show-slider-actions-transaction-edit-{{ $document->type }}-{{ $transaction->id }}"
-                                class="text-purple mt-1"
-                                override="class"
-                            >
-                                <x-button.hover color="to-purple">
-                                    {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }}
-                                </x-button.hover>
-                            </x-button>
+                            @if ($document->totals->count())
+                                <x-button
+                                    @click="onEditPayment('{{ route('modals.documents.document.transactions.edit', ['document' => $document->id, 'transaction' => $transaction->id]) }}')"
+                                    id="show-slider-actions-transaction-edit-{{ $document->type }}-{{ $transaction->id }}"
+                                    class="text-purple mt-1"
+                                    override="class"
+                                >
+                                    <x-button.hover color="to-purple">
+                                        {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }}
+                                    </x-button.hover>
+                                </x-button>
+                            @else
+                                <x-tooltip message="{{ trans('invoices.messages.totals_required', ['type' => $type]) }}" placement="top">
+                                    <x-button disabled="disabled" id="show-slider-actions-transaction-edit-{{ $document->type }}-{{ $transaction->id }}" class="text-purple mt-1" override="class">
+                                        <x-button.hover color="to-purple">
+                                            {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }}
+                                        </x-button.hover>
+                                    </x-button>
+                                </x-tooltip>
+                            @endif
 
                             <span class="mt-1 mr-2 ml-2"> - </span>
 

diff --git a/resources/views/components/documents/show/make-payment.blade.php b/resources/views/components/documents/show/make-payment.blade.php
@@ -77,16 +77,26 @@ class="px-3 py-1.5 mb-3 sm:mb-0 rounded-lg text-xs font-medium leading-6 bg-gree
 
                             <span class="mt-1 mr-2 ml-2"> - </span>
 
-                            <x-button
-                                @click="onEditPayment('{{ route('modals.documents.document.transactions.edit', ['document' => $document->id, 'transaction' => $transaction->id]) }}')"
-                                id="show-slider-actions-transaction-edit-{{ $document->type }}-{{ $transaction->id }}"
-                                class="text-purple mt-1"
-                                override="class"
-                            >
-                                <x-button.hover color="to-purple">
-                                    {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }}
-                                </x-button.hover>
-                            </x-button>
+                            @if ($document->totals->count())
+                                <x-button
+                                    @click="onEditPayment('{{ route('modals.documents.document.transactions.edit', ['document' => $document->id, 'transaction' => $transaction->id]) }}')"
+                                    id="show-slider-actions-transaction-edit-{{ $document->type }}-{{ $transaction->id }}"
+                                    class="text-purple mt-1"
+                                    override="class"
+                                >
+                                    <x-button.hover color="to-purple">
+                                        {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }}
+                                    </x-button.hover>
+                                </x-button>
+                            @else
+                                <x-tooltip message="{{ trans('invoices.messages.totals_required', ['type' => $type]) }}" placement="top">
+                                    <x-button disabled="disabled" id="show-slider-actions-transaction-edit-{{ $document->type }}-{{ $transaction->id }}" class="text-purple mt-1" override="class">
+                                        <x-button.hover color="to-purple">
+                                            {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }}
+                                        </x-button.hover>
+                                    </x-button>
+                                </x-tooltip>
+                            @endif
 
                             <span class="mt-1 mr-2 ml-2"> - </span>