Merge branch 'akaunting:master' into master
This commit is contained in:
Burak Civan
GitHub
commit
209c71af93
@ -299,6 +299,9 @@ abstract class Show extends Component
|
||||
/** @var bool */
|
||||
public $hideRecurringMessage;
|
||||
|
||||
/** @var bool */
|
||||
public $hideCreated;
|
||||
|
||||
/**
|
||||
* Create a new component instance.
|
||||
*
|
||||
@ -327,7 +330,7 @@ abstract class Show extends Component
|
||||
string $routeDocumentShow = '', string $routeTransactionShow = '', string $textButtonAddNew = '',
|
||||
|
||||
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->transaction = $transaction;
|
||||
@ -461,6 +464,7 @@ abstract class Show extends Component
|
||||
|
||||
$this->textRecurringType = $this->getTextRecurringType($type, $textRecurringType);
|
||||
$this->hideRecurringMessage = $hideRecurringMessage;
|
||||
$this->hideCreated = $hideCreated;
|
||||
}
|
||||
|
||||
protected function getTransactionTemplate($type, $transactionTemplate)
|
||||
|
||||
@ -46,9 +46,13 @@
|
||||
<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">
|
||||
<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>
|
||||
|
||||
<span class="material-icons text-gray-500">chevron_right</span>
|
||||
|
||||
@ -6,6 +6,6 @@
|
||||
|
||||
<div x-show="price_type == false" class="text-center text-sm mt-3 mb--2">
|
||||
<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>
|
||||
</div>
|
||||
@ -29,10 +29,12 @@
|
||||
@stack('recurring_message_end')
|
||||
|
||||
@stack('row_create_start')
|
||||
@if (! $hideCreated)
|
||||
<x-transactions.show.create
|
||||
type="{{ $type }}"
|
||||
:transaction="$transaction"
|
||||
/>
|
||||
@endif
|
||||
@stack('row_create_end')
|
||||
|
||||
@stack('schedule_start')
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<div class="print-template">
|
||||
@stack('company_start')
|
||||
@if (!$hideCompany)
|
||||
@if (! $hideCompany)
|
||||
<table class="border-bottom-1">
|
||||
<tr>
|
||||
@if (!$hideCompanyLogo)
|
||||
@if (! $hideCompanyLogo)
|
||||
<td style="width:20%; padding: 0 0 15px 0;" valign="top">
|
||||
@stack('company_logo_start')
|
||||
@if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id))
|
||||
@ -15,20 +15,20 @@
|
||||
</td>
|
||||
@endif
|
||||
|
||||
@if (!$hideCompanyDetails)
|
||||
@if (! $hideCompanyDetails)
|
||||
<td class="text" style="width: 80%; padding: 0 0 15px 0;">
|
||||
@stack('company_details_start')
|
||||
@if (!$hideCompanyName)
|
||||
@if (! $hideCompanyName)
|
||||
<h2 class="text-semibold text">
|
||||
{{ setting('company.name') }}
|
||||
</h2>
|
||||
@endif
|
||||
|
||||
@if (!$hideCompanyAddress)
|
||||
@if (! $hideCompanyAddress)
|
||||
<p>{!! (setting('company.address')) !!}</p>
|
||||
@endif
|
||||
|
||||
@if (!$hideCompanyTaxNumber)
|
||||
@if (! $hideCompanyTaxNumber)
|
||||
@if (setting('company.tax_number'))
|
||||
<p>
|
||||
{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
|
||||
@ -36,7 +36,7 @@
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if (!$hideCompanyPhone)
|
||||
@if (! $hideCompanyPhone)
|
||||
@if (setting('company.phone'))
|
||||
<p>
|
||||
{{ setting('company.phone') }}
|
||||
@ -44,7 +44,7 @@
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if (!$hideCompanyEmail)
|
||||
@if (! $hideCompanyEmail)
|
||||
<p>{{ setting('company.email') }}</p>
|
||||
@endif
|
||||
@stack('company_details_end')
|
||||
@ -55,7 +55,7 @@
|
||||
@endif
|
||||
@stack('company_end')
|
||||
|
||||
@if (!$hideContentTitle)
|
||||
@if (! $hideContentTitle)
|
||||
<table>
|
||||
<tr>
|
||||
<td style="width: 60%; padding: 15px 0 15px 0;">
|
||||
@ -69,7 +69,7 @@
|
||||
|
||||
<table>
|
||||
@stack('number_input_start')
|
||||
@if (!$hideNumber)
|
||||
@if (! $hideNumber)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans_choice($textNumber, 1) }}:
|
||||
@ -83,7 +83,7 @@
|
||||
@stack('number_input_end')
|
||||
|
||||
@stack('paid_at_input_start')
|
||||
@if (!$hidePaidAt)
|
||||
@if (! $hidePaidAt)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans($textPaidAt) }}:
|
||||
@ -97,7 +97,7 @@
|
||||
@stack('paid_at_input_end')
|
||||
|
||||
@stack('account_id_input_start')
|
||||
@if (!$hideAccount)
|
||||
@if (! $hideAccount)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans_choice($textAccount, 1) }}:
|
||||
@ -111,7 +111,7 @@
|
||||
@stack('account_id_input_end')
|
||||
|
||||
@stack('category_id_input_start')
|
||||
@if (!$hideCategory)
|
||||
@if (! $hideCategory)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans_choice($textCategory, 1) }}:
|
||||
@ -125,7 +125,7 @@
|
||||
@stack('category_id_input_end')
|
||||
|
||||
@stack('payment_method_input_start')
|
||||
@if (!$hidePaymentMethods)
|
||||
@if (! $hidePaymentMethods)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans_choice($textPaymentMethods, 1) }}:
|
||||
@ -139,7 +139,7 @@
|
||||
@stack('payment_method_input_end')
|
||||
|
||||
@stack('reference_input_start')
|
||||
@if (!$hideReference)
|
||||
@if (! $hideReference)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans($textReference) }}:
|
||||
@ -153,7 +153,7 @@
|
||||
@stack('reference_input_end')
|
||||
|
||||
@stack('description_input_start')
|
||||
@if (!$hideDescription)
|
||||
@if (! $hideDescription)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans($textDescription) }}:
|
||||
@ -180,8 +180,7 @@
|
||||
</table>
|
||||
|
||||
<table class="border-bottom-1" style="padding-bottom:15px;">
|
||||
@if (!$hideContact)
|
||||
|
||||
@if (! $hideContact)
|
||||
@if (! $hideContactInfo)
|
||||
<tr>
|
||||
<td style="margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
|
||||
@ -191,11 +190,12 @@
|
||||
@endif
|
||||
|
||||
@stack('name_input_start')
|
||||
@if (!$hideContactName)
|
||||
@if (! $hideContactName)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans('general.name') }}
|
||||
</td>
|
||||
|
||||
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
|
||||
{{ $transaction->contact->name }}
|
||||
</td>
|
||||
@ -204,11 +204,12 @@
|
||||
@stack('name_input_end')
|
||||
|
||||
@stack('address_input_start')
|
||||
@if (!$hideContactAddress)
|
||||
@if (! $hideContactAddress)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans('general.address') }}
|
||||
</td>
|
||||
|
||||
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
|
||||
{!! nl2br($transaction->contact->address) !!}
|
||||
</td>
|
||||
@ -217,11 +218,12 @@
|
||||
@stack('address_input_end')
|
||||
|
||||
@stack('tax_number_input_start')
|
||||
@if (!$hideContactTaxNumber)
|
||||
@if (! $hideContactTaxNumber)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans('general.tax_number') }}
|
||||
</td>
|
||||
|
||||
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
|
||||
@if ($transaction->contact->tax_number)
|
||||
{{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }}
|
||||
@ -232,11 +234,12 @@
|
||||
@stack('tax_number_input_end')
|
||||
|
||||
@stack('phone_input_start')
|
||||
@if (!$hideContactPhone)
|
||||
@if (! $hideContactPhone)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans('general.phone') }}
|
||||
</td>
|
||||
|
||||
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
|
||||
@if ($transaction->contact->phone)
|
||||
{{ $transaction->contact->phone }}
|
||||
@ -247,11 +250,12 @@
|
||||
@stack('phone_input_end')
|
||||
|
||||
@stack('email_start')
|
||||
@if (!$hideContactEmail)
|
||||
@if (! $hideContactEmail)
|
||||
<tr>
|
||||
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
|
||||
{{ trans('general.email') }}
|
||||
</td>
|
||||
|
||||
<td class="border-bottom-dashed-black" style="width:70%; margin: 0px; padding: 8px 0 0 0; font-size: 12px;">
|
||||
{{ $transaction->contact->email }}
|
||||
</td>
|
||||
@ -259,17 +263,20 @@
|
||||
@endif
|
||||
@stack('email_input_end')
|
||||
@endif
|
||||
|
||||
<tr>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@if (!$hideRelated)
|
||||
@if (! $hideRelated)
|
||||
@if ($transaction->document)
|
||||
<table>
|
||||
<tr>
|
||||
<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>
|
||||
</tr>
|
||||
</table>
|
||||
@ -278,63 +285,75 @@
|
||||
<thead style="color:#424242; font-size:12px;">
|
||||
<tr class="border-bottom-1">
|
||||
<th class="item text-alignment-left text-left" style="padding:5px 0;">
|
||||
@if (!$hideRelatedDocumentNumber)
|
||||
<span style="font-size: 13px;">{{ trans_choice($textRelatedDocumentNumber, 1) }}</span> <br />
|
||||
@if (! $hideRelatedDocumentNumber)
|
||||
<span style="font-size: 13px;">
|
||||
{{ trans_choice($textRelatedDocumentNumber, 1) }}
|
||||
</span>
|
||||
<br />
|
||||
@endif
|
||||
|
||||
@if (!$hideRelatedContact)
|
||||
<span style="font-weight:500;"> {{ trans_choice($textRelatedContact, 1) }} </span>
|
||||
@if (! $hideRelatedContact)
|
||||
<span style="font-weight:500;">
|
||||
{{ trans_choice($textRelatedContact, 1) }}
|
||||
</span>
|
||||
@endif
|
||||
</th>
|
||||
|
||||
|
||||
@if (!$hideRelatedDocumentDate)
|
||||
<th class="price" style=" padding:5px 0; text-align:center;">
|
||||
@if (! $hideRelatedDocumentDate)
|
||||
<th class="price" style="padding:5px 0; text-align:center;">
|
||||
{{ trans($textRelatedDocumentDate) }}
|
||||
</th>
|
||||
@endif
|
||||
|
||||
|
||||
<th class="price text-alignment-right text-right" style="padding: 5px 0;">
|
||||
@if (!$hideRelatedDocumentAmount)
|
||||
<span style="font-size: 13px;">{{ trans($textRelatedDocumentAmount) }}</span><br />
|
||||
@if (! $hideRelatedDocumentAmount)
|
||||
<span style="font-size: 13px;">
|
||||
{{ trans($textRelatedDocumentAmount) }}
|
||||
</span>
|
||||
<br />
|
||||
@endif
|
||||
|
||||
@if (!$hideRelatedAmount)
|
||||
<span style="font-weight:500;">{{ trans($textRelatedAmount) }}</span>
|
||||
@if (! $hideRelatedAmount)
|
||||
<span style="font-weight:500;">
|
||||
{{ trans($textRelatedAmount) }}
|
||||
</span>
|
||||
@endif
|
||||
</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="item text-alignment-left text-left" style="color:#424242; font-size:12px; padding-left:0;">
|
||||
@if (!$hideRelatedDocumentNumber)
|
||||
@if (! $hideRelatedDocumentNumber)
|
||||
<a class="text-medium" style="border-bottom:1px solid;" href="{{ route($routeDocumentShow, $transaction->document->id) }}">
|
||||
{{ $transaction->document->document_number }}
|
||||
</a> <br />
|
||||
</a>
|
||||
<br />
|
||||
@endif
|
||||
|
||||
@if (!$hideRelatedContact)
|
||||
<span style="color: #6E6E6E"> {{ $transaction->document->contact_name }} </span>
|
||||
@if (! $hideRelatedContact)
|
||||
<span style="color: #6E6E6E">
|
||||
{{ $transaction->document->contact_name }}
|
||||
</span>
|
||||
@endif
|
||||
</td>
|
||||
|
||||
@if (!$hideRelatedDocumentDate)
|
||||
@if (! $hideRelatedDocumentDate)
|
||||
<td class="price" style="color:#424242; font-size:12px; text-align:center;">
|
||||
@date($transaction->document->due_at)
|
||||
</td>
|
||||
@endif
|
||||
|
||||
<td class="price text-alignment-right text-right" style="color:#424242; font-size:12px; padding-right:0;">
|
||||
@if (!$hideRelatedDocumentAmount)
|
||||
@if (! $hideRelatedDocumentAmount)
|
||||
@money($transaction->document->amount, $transaction->document->currency_code, true) <br />
|
||||
@endif
|
||||
|
||||
@if (!$hideRelatedAmount)
|
||||
<span style="color: #6E6E6E"> @money($transaction->amount, $transaction->currency_code, true) </span>
|
||||
@if (! $hideRelatedAmount)
|
||||
<span style="color: #6E6E6E">
|
||||
@money($transaction->amount, $transaction->currency_code, true)
|
||||
</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@ -343,7 +362,7 @@
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if (!$hideAmount)
|
||||
@if (! $hideAmount)
|
||||
<table style="text-align: right; margin-top:55px;">
|
||||
<tr>
|
||||
<td valign="center" style="width:80%; display:block; float:right; background-color: #55588B; -webkit-print-color-adjust: exact; color:#ffffff; border-radius: 5px;">
|
||||
@ -352,6 +371,7 @@
|
||||
<td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
|
||||
{{ trans($textAmount) }}:
|
||||
</td>
|
||||
|
||||
<td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
|
||||
@money($transaction->amount, $transaction->currency_code, true)
|
||||
</td>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user