shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan 2022-06-14 16:23:18 +03:00 committed by GitHub
commit 209c71af93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 239 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Abstracts/View/Components/Transactions/Show.php
View File

@ -299,6 +299,9 @@ abstract class Show extends Component
/** @var bool */ /** @var bool */
public $hideRecurringMessage; public $hideRecurringMessage;
/** @var bool */
public $hideCreated;
/** /**
* Create a new component instance. * Create a new component instance.
* *
@ -327,7 +330,7 @@ abstract class Show extends Component
string $routeDocumentShow = '', string $routeTransactionShow = '', string $textButtonAddNew = '', string $routeDocumentShow = '', string $routeTransactionShow = '', string $textButtonAddNew = '',
bool $hideSchedule = false, bool $hideChildren = false, bool $hideAttachment = false, $attachment = [], bool $hideSchedule = false, bool $hideChildren = false, bool $hideAttachment = false, $attachment = [],
array $connectTranslations = [], string $textRecurringType = '', bool $hideRecurringMessage = false array $connectTranslations = [], string $textRecurringType = '', bool $hideRecurringMessage = false, bool $hideCreated = false
) { ) {
$this->type = $type; $this->type = $type;
$this->transaction = $transaction; $this->transaction = $transaction;
@ -461,6 +464,7 @@ abstract class Show extends Component
$this->textRecurringType = $this->getTextRecurringType($type, $textRecurringType); $this->textRecurringType = $this->getTextRecurringType($type, $textRecurringType);
$this->hideRecurringMessage = $hideRecurringMessage; $this->hideRecurringMessage = $hideRecurringMessage;
$this->hideCreated = $hideCreated;
} }
protected function getTransactionTemplate($type, $transactionTemplate) protected function getTransactionTemplate($type, $transactionTemplate)

8
resources/views/components/empty-page.blade.php
View File

@ -46,9 +46,13 @@
<li class="border-b p-2 hover:bg-gray-100"> <li class="border-b p-2 hover:bg-gray-100">
<a href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs"> <a href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs">
<div class="truncate"> <div class="truncate">
<h2 class="">{{ $suggestion->name }}</h2> <h2>
{{ $suggestion->name }}
</h2>
<div class="h-4 overflow-hidden text-black-400 truncate">Enter details and create your first expense easily</div> <div class="h-4 overflow-hidden text-black-400 truncate">
{{ $suggestion->description ?? '' }}
</div>
</div> </div>
<span class="material-icons text-gray-500">chevron_right</span> <span class="material-icons text-gray-500">chevron_right</span>

2
resources/views/components/layouts/modules/show/information.blade.php
View File

@ -6,6 +6,6 @@
<div x-show="price_type == false" class="text-center text-sm mt-3 mb--2"> <div x-show="price_type == false" class="text-center text-sm mt-3 mb--2">
<span style="font-size: 12px;"> <span style="font-size: 12px;">
<span class="text-danger">*</span> <a href="https://akaunting.com/features/why-akaunting-cloud?utm_source=app&utm_medium=show&utm_campaign={{ $module->name }}" target="_blank">{!! trans('modules.information_monthly') !!}</a> <span class="text-danger">*</span> <a href="https://akaunting.com/features/why-akaunting-cloud?utm_source=app_show&utm_medium=software&utm_campaign={{ str_replace('-', '', $module->slug) }}" target="_blank">{!! trans('modules.information_monthly') !!}</a>
</span> </span>
</div> </div>

2
resources/views/components/transactions/show/content.blade.php
View File

@ -29,10 +29,12 @@
@stack('recurring_message_end') @stack('recurring_message_end')
@stack('row_create_start') @stack('row_create_start')
@if (! $hideCreated)
<x-transactions.show.create <x-transactions.show.create
type="{{ $type }}" type="{{ $type }}"
:transaction="$transaction" :transaction="$transaction"
/> />
@endif
@stack('row_create_end') @stack('row_create_end')
@stack('schedule_start') @stack('schedule_start')

44
resources/views/components/transactions/template/default.blade.php
View File

@ -181,7 +181,6 @@
<table class="border-bottom-1" style="padding-bottom:15px;"> <table class="border-bottom-1" style="padding-bottom:15px;">
@if (! $hideContact) @if (! $hideContact)
@if (! $hideContactInfo) @if (! $hideContactInfo)
<tr> <tr>
<td style="margin: 0px; padding: 0 0 8px 0; font-size: 12px;"> <td style="margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
@ -196,6 +195,7 @@
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;"> <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
{{ trans('general.name') }} {{ trans('general.name') }}
</td> </td>
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;"> <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
{{ $transaction->contact->name }} {{ $transaction->contact->name }}
</td> </td>
@ -209,6 +209,7 @@
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;"> <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
{{ trans('general.address') }} {{ trans('general.address') }}
</td> </td>
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;"> <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
{!! nl2br($transaction->contact->address) !!} {!! nl2br($transaction->contact->address) !!}
</td> </td>
@ -222,6 +223,7 @@
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;"> <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
{{ trans('general.tax_number') }} {{ trans('general.tax_number') }}
</td> </td>
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;"> <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
@if ($transaction->contact->tax_number) @if ($transaction->contact->tax_number)
{{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }}
@ -237,6 +239,7 @@
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;"> <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
{{ trans('general.phone') }} {{ trans('general.phone') }}
</td> </td>
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;"> <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
@if ($transaction->contact->phone) @if ($transaction->contact->phone)
{{ $transaction->contact->phone }} {{ $transaction->contact->phone }}
@ -252,6 +255,7 @@
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;"> <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
{{ trans('general.email') }} {{ trans('general.email') }}
</td> </td>
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;"> <td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
{{ $transaction->contact->email }} {{ $transaction->contact->email }}
</td> </td>
@ -259,6 +263,7 @@
@endif @endif
@stack('email_input_end') @stack('email_input_end')
@endif @endif
<tr> <tr>
<td></td> <td></td>
</tr> </tr>
@ -269,7 +274,9 @@
<table> <table>
<tr> <tr>
<td style="padding:15px 0 0 0;"> <td style="padding:15px 0 0 0;">
<h2 style="font-size: 12px; font-weight:600; margin-bottom: 15px;">{{ trans($textRelatedTransansaction) }}</h2> <h2 style="font-size: 12px; font-weight:600; margin-bottom: 15px;">
{{ trans($textRelatedTransansaction) }}
</h2>
</td> </td>
</tr> </tr>
</table> </table>
@ -279,32 +286,39 @@
<tr class="border-bottom-1"> <tr class="border-bottom-1">
<th class="item text-alignment-left text-left" style="padding:5px 0;"> <th class="item text-alignment-left text-left" style="padding:5px 0;">
@if (! $hideRelatedDocumentNumber) @if (! $hideRelatedDocumentNumber)
<span style="font-size: 13px;">{{ trans_choice($textRelatedDocumentNumber, 1) }}</span> <br /> <span style="font-size: 13px;">
{{ trans_choice($textRelatedDocumentNumber, 1) }}
</span>
<br />
@endif @endif
@if (! $hideRelatedContact) @if (! $hideRelatedContact)
<span style="font-weight:500;"> {{ trans_choice($textRelatedContact, 1) }} </span> <span style="font-weight:500;">
{{ trans_choice($textRelatedContact, 1) }}
</span>
@endif @endif
</th> </th>
@if (! $hideRelatedDocumentDate) @if (! $hideRelatedDocumentDate)
<th class="price" style="padding:5px 0; text-align:center;"> <th class="price" style="padding:5px 0; text-align:center;">
{{ trans($textRelatedDocumentDate) }} {{ trans($textRelatedDocumentDate) }}
</th> </th>
@endif @endif
<th class="price text-alignment-right text-right" style="padding: 5px 0;"> <th class="price text-alignment-right text-right" style="padding: 5px 0;">
@if (! $hideRelatedDocumentAmount) @if (! $hideRelatedDocumentAmount)
<span style="font-size: 13px;">{{ trans($textRelatedDocumentAmount) }}</span><br /> <span style="font-size: 13px;">
{{ trans($textRelatedDocumentAmount) }}
</span>
<br />
@endif @endif
@if (! $hideRelatedAmount) @if (! $hideRelatedAmount)
<span style="font-weight:500;">{{ trans($textRelatedAmount) }}</span> <span style="font-weight:500;">
{{ trans($textRelatedAmount) }}
</span>
@endif @endif
</th> </th>
</tr> </tr>
</thead> </thead>
@ -314,11 +328,14 @@
@if (! $hideRelatedDocumentNumber) @if (! $hideRelatedDocumentNumber)
<a class="text-medium" style="border-bottom:1px solid;" href="{{ route($routeDocumentShow, $transaction->document->id) }}"> <a class="text-medium" style="border-bottom:1px solid;" href="{{ route($routeDocumentShow, $transaction->document->id) }}">
{{ $transaction->document->document_number }} {{ $transaction->document->document_number }}
</a> <br /> </a>
<br />
@endif @endif
@if (! $hideRelatedContact) @if (! $hideRelatedContact)
<span style="color: #6E6E6E"> {{ $transaction->document->contact_name }} </span> <span style="color: #6E6E6E">
{{ $transaction->document->contact_name }}
</span>
@endif @endif
</td> </td>
@ -334,7 +351,9 @@
@endif @endif
@if (! $hideRelatedAmount) @if (! $hideRelatedAmount)
<span style="color: #6E6E6E"> @money($transaction->amount, $transaction->currency_code, true) </span> <span style="color: #6E6E6E">
@money($transaction->amount, $transaction->currency_code, true)
</span>
@endif @endif
</td> </td>
</tr> </tr>
@ -352,6 +371,7 @@
<td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;"> <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
{{ trans($textAmount) }}: {{ trans($textAmount) }}:
</td> </td>
<td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;"> <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
@money($transaction->amount, $transaction->currency_code, true) @money($transaction->amount, $transaction->currency_code, true)
</td> </td>