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')

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

@ -1,9 +1,9 @@
<div class="print-template"> <div class="print-template">
@stack('company_start') @stack('company_start')
@if (!$hideCompany) @if (! $hideCompany)
<table class="border-bottom-1"> <table class="border-bottom-1">
<tr> <tr>
@if (!$hideCompanyLogo) @if (! $hideCompanyLogo)
<td style="width:20%; padding: 0 0 15px 0;" valign="top"> <td style="width:20%; padding: 0 0 15px 0;" valign="top">
@stack('company_logo_start') @stack('company_logo_start')
@if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id))
@ -15,20 +15,20 @@
</td> </td>
@endif @endif
@if (!$hideCompanyDetails) @if (! $hideCompanyDetails)
<td class="text" style="width: 80%; padding: 0 0 15px 0;"> <td class="text" style="width: 80%; padding: 0 0 15px 0;">
@stack('company_details_start') @stack('company_details_start')
@if (!$hideCompanyName) @if (! $hideCompanyName)
<h2 class="text-semibold text"> <h2 class="text-semibold text">
{{ setting('company.name') }} {{ setting('company.name') }}
</h2> </h2>
@endif @endif
@if (!$hideCompanyAddress) @if (! $hideCompanyAddress)
<p>{!! (setting('company.address')) !!}</p> <p>{!! (setting('company.address')) !!}</p>
@endif @endif
@if (!$hideCompanyTaxNumber) @if (! $hideCompanyTaxNumber)
@if (setting('company.tax_number')) @if (setting('company.tax_number'))
<p> <p>
{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
@ -36,7 +36,7 @@
@endif @endif
@endif @endif
@if (!$hideCompanyPhone) @if (! $hideCompanyPhone)
@if (setting('company.phone')) @if (setting('company.phone'))
<p> <p>
{{ setting('company.phone') }} {{ setting('company.phone') }}
@ -44,7 +44,7 @@
@endif @endif
@endif @endif
@if (!$hideCompanyEmail) @if (! $hideCompanyEmail)
<p>{{ setting('company.email') }}</p> <p>{{ setting('company.email') }}</p>
@endif @endif
@stack('company_details_end') @stack('company_details_end')
@ -55,7 +55,7 @@
@endif @endif
@stack('company_end') @stack('company_end')
@if (!$hideContentTitle) @if (! $hideContentTitle)
<table> <table>
<tr> <tr>
<td style="width: 60%; padding: 15px 0 15px 0;"> <td style="width: 60%; padding: 15px 0 15px 0;">
@ -69,7 +69,7 @@
<table> <table>
@stack('number_input_start') @stack('number_input_start')
@if (!$hideNumber) @if (! $hideNumber)
<tr> <tr>
<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_choice($textNumber, 1) }}: {{ trans_choice($textNumber, 1) }}:
@ -83,7 +83,7 @@
@stack('number_input_end') @stack('number_input_end')
@stack('paid_at_input_start') @stack('paid_at_input_start')
@if (!$hidePaidAt) @if (! $hidePaidAt)
<tr> <tr>
<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($textPaidAt) }}: {{ trans($textPaidAt) }}:
@ -97,7 +97,7 @@
@stack('paid_at_input_end') @stack('paid_at_input_end')
@stack('account_id_input_start') @stack('account_id_input_start')
@if (!$hideAccount) @if (! $hideAccount)
<tr> <tr>
<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_choice($textAccount, 1) }}: {{ trans_choice($textAccount, 1) }}:
@ -111,7 +111,7 @@
@stack('account_id_input_end') @stack('account_id_input_end')
@stack('category_id_input_start') @stack('category_id_input_start')
@if (!$hideCategory) @if (! $hideCategory)
<tr> <tr>
<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_choice($textCategory, 1) }}: {{ trans_choice($textCategory, 1) }}:
@ -125,7 +125,7 @@
@stack('category_id_input_end') @stack('category_id_input_end')
@stack('payment_method_input_start') @stack('payment_method_input_start')
@if (!$hidePaymentMethods) @if (! $hidePaymentMethods)
<tr> <tr>
<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_choice($textPaymentMethods, 1) }}: {{ trans_choice($textPaymentMethods, 1) }}:
@ -139,7 +139,7 @@
@stack('payment_method_input_end') @stack('payment_method_input_end')
@stack('reference_input_start') @stack('reference_input_start')
@if (!$hideReference) @if (! $hideReference)
<tr> <tr>
<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($textReference) }}: {{ trans($textReference) }}:
@ -153,7 +153,7 @@
@stack('reference_input_end') @stack('reference_input_end')
@stack('description_input_start') @stack('description_input_start')
@if (!$hideDescription) @if (! $hideDescription)
<tr> <tr>
<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($textDescription) }}: {{ trans($textDescription) }}:
@ -180,8 +180,7 @@
</table> </table>
<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;">
@ -191,11 +190,12 @@
@endif @endif
@stack('name_input_start') @stack('name_input_start')
@if (!$hideContactName) @if (! $hideContactName)
<tr> <tr>
<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>
@ -204,11 +204,12 @@
@stack('name_input_end') @stack('name_input_end')
@stack('address_input_start') @stack('address_input_start')
@if (!$hideContactAddress) @if (! $hideContactAddress)
<tr> <tr>
<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>
@ -217,11 +218,12 @@
@stack('address_input_end') @stack('address_input_end')
@stack('tax_number_input_start') @stack('tax_number_input_start')
@if (!$hideContactTaxNumber) @if (! $hideContactTaxNumber)
<tr> <tr>
<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 }}
@ -232,11 +234,12 @@
@stack('tax_number_input_end') @stack('tax_number_input_end')
@stack('phone_input_start') @stack('phone_input_start')
@if (!$hideContactPhone) @if (! $hideContactPhone)
<tr> <tr>
<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 }}
@ -247,11 +250,12 @@
@stack('phone_input_end') @stack('phone_input_end')
@stack('email_start') @stack('email_start')
@if (!$hideContactEmail) @if (! $hideContactEmail)
<tr> <tr>
<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,17 +263,20 @@
@endif @endif
@stack('email_input_end') @stack('email_input_end')
@endif @endif
<tr> <tr>
<td></td> <td></td>
</tr> </tr>
</table> </table>
@if (!$hideRelated) @if (! $hideRelated)
@if ($transaction->document) @if ($transaction->document)
<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>
@ -278,63 +285,75 @@
<thead style="color:#424242; font-size:12px;"> <thead style="color:#424242; font-size:12px;">
<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>
<tbody> <tbody>
<tr> <tr>
<td class="item text-alignment-left text-left" style="color:#424242; font-size:12px; padding-left:0;"> <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) }}"> <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>
@if (!$hideRelatedDocumentDate) @if (! $hideRelatedDocumentDate)
<td class="price" style="color:#424242; font-size:12px; text-align:center;"> <td class="price" style="color:#424242; font-size:12px; text-align:center;">
@date($transaction->document->due_at) @date($transaction->document->due_at)
</td> </td>
@endif @endif
<td class="price text-alignment-right text-right" style="color:#424242; font-size:12px; padding-right:0;"> <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 /> @money($transaction->document->amount, $transaction->document->currency_code, true) <br />
@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>
@ -343,7 +362,7 @@
@endif @endif
@endif @endif
@if (!$hideAmount) @if (! $hideAmount)
<table style="text-align: right; margin-top:55px;"> <table style="text-align: right; margin-top:55px;">
<tr> <tr>
<td valign="center" style="width:80%; display:block; float:right; background-color: #55588B; -webkit-print-color-adjust: exact; color:#ffffff; border-radius: 5px;"> <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;"> <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>