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

file updated..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-06-27 11:14:01 +03:00
parent 156fb83e37
commit 71394f895b
7 changed files with 222 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/type.php
View File

@ -99,7 +99,8 @@ return [
//'create' => 'create-sales-revenues', //'create' => 'create-sales-revenues',
], ],
'translation' => [ 'translation' => [
'prefix' => 'revenues', // this translation file name. 'prefix' => 'revenues', // this translation file name.
'related_document_amount' => 'invoices.invoice_amount',
], ],
'contact_type' => 'customer', 'contact_type' => 'customer',
], ],
@ -116,7 +117,8 @@ return [
//'create' => 'create-purchases-payments', //'create' => 'create-purchases-payments',
], ],
'translation' => [ 'translation' => [
'prefix' => 'payments', // this translation file name. 'prefix' => 'payments', // this translation file name.
'related_document_amount' => 'bills.bill_amount',
], ],
'contact_type' => 'vendor', 'contact_type' => 'vendor',
], ],

1
resources/lang/en-GB/bills.php
View File

@ -4,6 +4,7 @@ return [
'bill_number' => 'Bill Number', 'bill_number' => 'Bill Number',
'bill_date' => 'Bill Date', 'bill_date' => 'Bill Date',
'bill_amount' => 'Bill Amount',
'total_price' => 'Total Price', 'total_price' => 'Total Price',
'due_date' => 'Due Date', 'due_date' => 'Due Date',
'order_number' => 'Order Number', 'order_number' => 'Order Number',

1
resources/lang/en-GB/invoices.php
View File

@ -4,6 +4,7 @@ return [
'invoice_number' => 'Invoice Number', 'invoice_number' => 'Invoice Number',
'invoice_date' => 'Invoice Date', 'invoice_date' => 'Invoice Date',
'invoice_amount' => 'Invoice Amount',
'total_price' => 'Total Price', 'total_price' => 'Total Price',
'due_date' => 'Due Date', 'due_date' => 'Due Date',
'order_number' => 'Order Number', 'order_number' => 'Order Number',

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

@ -33,7 +33,7 @@
</td> </td>
<td class="col-xs-4 col-sm-6 text-left long-texts"> <td class="col-xs-4 col-sm-6 text-left long-texts">
{{ $history->created->name }} {{ $history->creator->name }}
</td> </td>
@stack('row_footer_histories_body_td_end') @stack('row_footer_histories_body_td_end')
</tr> </tr>

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

@ -2,52 +2,53 @@
@if (!$hideCompany) @if (!$hideCompany)
<table class="border-bottom-1"> <table class="border-bottom-1">
<tr> <tr>
<td style="width:5%;" valign="top"> @if (!$hideCompanyLogo)
@stack('company_logo_start') <td style="width:5%;" valign="top">
@if (!$hideCompanyLogo) @stack('company_logo_start')
@if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
<img src="{{ Storage::url($document->contact->logo->id) }}" height="128" width="128" alt="{{ $document->contact_name }}" /> <img src="{{ Storage::url($document->contact->logo->id) }}" height="128" width="128" alt="{{ $document->contact_name }}" />
@else @else
<img src="{{ $logo }}" alt="{{ setting('company.name') }}" /> <img src="{{ $logo }}" alt="{{ setting('company.name') }}" />
@endif @endif
@endif @stack('company_logo_end')
@stack('company_logo_end') </td>
</td> @endif
<td style="width: 60%;">
@stack('company_details_start') @if (!$hideCompanyDetails)
@if (!$hideCompanyDetails) <td style="width: 60%;">
@stack('company_details_start')
@if (!$hideCompanyName) @if (!$hideCompanyName)
<h2 class="mb-1" style="font-size: 16px;"> <h2 class="mb-1" style="font-size: 16px;">
{{ setting('company.name') }} {{ setting('company.name') }}
</h2> </h2>
@endif @endif
@if (!$hideCompanyAddress) @if (!$hideCompanyAddress)
<p style="margin:0; padding:0; font-size:14px;">{!! nl2br(setting('company.address')) !!}</p> <p style="margin:0; padding:0; font-size:14px;">{!! nl2br(setting('company.address')) !!}</p>
@endif @endif
@if (!$hideCompanyTaxNumber) @if (!$hideCompanyTaxNumber)
<p style="margin:0; padding:0; font-size:14px;"> <p style="margin:0; padding:0; font-size:14px;">
@if (setting('company.tax_number')) @if (setting('company.tax_number'))
{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
@endif @endif
</p> </p>
@endif @endif
@if (!$hideCompanyPhone) @if (!$hideCompanyPhone)
<p style="margin:0; padding:0; font-size:14px;"> <p style="margin:0; padding:0; font-size:14px;">
@if (setting('company.phone')) @if (setting('company.phone'))
{{ setting('company.phone') }} {{ setting('company.phone') }}
@endif @endif
</p> </p>
@endif @endif
@if (!$hideCompanyEmail) @if (!$hideCompanyEmail)
<p style="margin:0; padding:0; font-size:14px;">{{ setting('company.email') }}</p> <p style="margin:0; padding:0; font-size:14px;">{{ setting('company.email') }}</p>
@endif @endif
@endif @stack('company_details_end')
@stack('company_details_end') </td>
</td> @endif
</tr> </tr>
</table> </table>
@endif @endif
@ -57,7 +58,9 @@
<table> <table>
<tr> <tr>
<td style="padding-bottom: 0; padding-top: 32px;"> <td style="padding-bottom: 0; padding-top: 32px;">
<h2 class="text-center text-uppercase" style="font-size: 16px;">{{ trans('invoices.revenue_made') }}</h2> <h2 class="text-center text-uppercase" style="font-size: 16px;">
{{ trans($textContentTitle) }}
</h2>
</td> </td>
</tr> </tr>
</table> </table>
@ -69,129 +72,169 @@
<table> <table>
@if (!$hidePaidAt) @if (!$hidePaidAt)
<tr> <tr>
<td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">{{ trans('general.date') }}:</td> <td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;"> @date($transaction->paid_at)</td> {{ trans($textPaidAt) }}:
</td>
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">
@date($transaction->paid_at)
</td>
</tr> </tr>
@endif @endif
@if (!$hideAccount) @if (!$hideAccount)
<tr> <tr>
<td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">{{ trans_choice('general.accounts', 1) }}:</td> <td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">{{ $transaction->account->name }}</td> {{ trans_choice($textAccount, 1) }}:
</td>
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">
{{ $transaction->account->name }}
</td>
</tr> </tr>
@endif @endif
@if (!$hideCategory) @if (!$hideCategory)
<tr> <tr>
<td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">{{ trans_choice('general.categories', 1) }}:</td> <td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">{{ $transaction->category->name }}</td> {{ trans_choice($textCategory, 1) }}:
</td>
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">
{{ $transaction->category->name }}
</td>
</tr> </tr>
@endif @endif
@if (!$hidePaymentMethods) @if (!$hidePaymentMethods)
<tr> <tr>
<td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">{{ trans_choice('general.payment_methods', 1) }}:</td> <td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">{{ $payment_methods[$transaction->payment_method] }}</td> {{ trans_choice($textPaymentMethods, 1) }}:
</td>
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">
{{ $payment_methods[$transaction->payment_method] }}
</td>
</tr> </tr>
@endif @endif
@if (!$hideReference) @if (!$hideReference)
<tr> <tr>
<td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">{{ trans('general.reference') }}:</td> <td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">{{ $transaction->reference }}</td> {{ trans($textReference) }}:
</td>
<td class="border-bottom-1" style="width:80%; padding-bottom:3px; font-size:14px;">
{{ $transaction->reference }}
</td>
</tr> </tr>
@endif @endif
@if (!$hideDescription) @if (!$hideDescription)
<tr> <tr>
<td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">{{ trans('general.description') }}:</td> <td style="width: 20%; padding-bottom:3px; font-size:14px; font-weight: bold;">
{{ trans($textDescription) }}:
</td>
<td style="width:80%; padding-bottom:3px; font-size:14px;"> <td style="width:80%; padding-bottom:3px; font-size:14px;">
<p style="font-size:14px; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; margin: 0;">{!! nl2br($transaction->description) !!}</p> <p style="font-size:14px; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; margin: 0;">
{!! nl2br($transaction->description) !!}
</p>
</td> </td>
</tr> </tr>
@endif @endif
@if (!$hideContact) @if (!$hideContact)
<tr> <tr>
<td style="padding-top:45px; padding-bottom:0;"> <td style="padding-top:45px; padding-bottom:0;">
<h2 style="font-size: 16px;">{{ trans('general.paid_by') }}</h2> <h2 style="font-size: 16px;">
{{ trans($textDescription) }}
</h2>
</td> </td>
</tr> </tr>
@if ($hideContactInfo)
<tr>
<td style="padding-bottom:5px; padding-top:0; font-size:14px;">
<strong>{{ trans($textContactInfo) }}</strong><br>
</td>
</tr>
@endif
@stack('name_input_start') @if ($hideContactInfo)
@if (!$hideContactName) <tr>
<tr> <td style="padding-bottom:5px; padding-top:0; font-size:14px;">
<td style="padding-bottom:5px; padding-top:0; font-size:14px;"> <strong>{{ trans($textContactInfo) }}</strong><br>
<strong>{{ $transaction->contact->name }}</strong><br> </td>
</td> </tr>
</tr> @endif
@endif
@stack('name_input_end')
@stack('address_input_start') @stack('name_input_start')
@if (!$hideContactAddress) @if (!$hideContactName)
<tr> <tr>
<td style="padding-bottom:5px; padding-top:0; font-size:14px;"> <td style="padding-bottom:5px; padding-top:0; font-size:14px;">
<p style="margin:0; padding:0; font-size:14px;">{!! nl2br($transaction->contact->address) !!}</p> <strong>{{ $transaction->contact->name }}</strong><br>
</td> </td>
</tr> </tr>
@endif @endif
@stack('address_input_end') @stack('name_input_end')
@stack('tax_number_input_start') @stack('address_input_start')
@if (!$hideContactTaxNumber) @if (!$hideContactAddress)
<tr> <tr>
<td style="padding-bottom:5px; padding-top:0; font-size:14px;"> <td style="padding-bottom:5px; padding-top:0; font-size:14px;">
<p style="margin:0; padding:0; font-size:14px;"> <p style="margin:0; padding:0; font-size:14px;">
@if ($transaction->contact->tax_number) {!! nl2br($transaction->contact->address) !!}
{{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} </p>
@endif </td>
</p> </tr>
</td> @endif
</tr> @stack('address_input_end')
@endif
@stack('tax_number_input_end')
@stack('phone_input_start') @stack('tax_number_input_start')
@if (!$hideContactPhone) @if (!$hideContactTaxNumber)
<tr> <tr>
<td style="padding-bottom:0; padding-top:0; font-size:14px;"> <td style="padding-bottom:5px; padding-top:0; font-size:14px;">
<p style="margin:0; padding:0; font-size:14px;"> <p style="margin:0; padding:0; font-size:14px;">
@if ($transaction->contact->phone) @if ($transaction->contact->tax_number)
{{ $transaction->contact->phone }} {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }}
@endif @endif
</p> </p>
</td> </td>
</tr> </tr>
@endif @endif
@stack('phone_input_end') @stack('tax_number_input_end')
@stack('email_start') @stack('phone_input_start')
@if (!$hideContactEmail) @if (!$hideContactPhone)
<tr> <tr>
<td style="padding-bottom:0; padding-top:0; font-size:14px;"> <td style="padding-bottom:0; padding-top:0; font-size:14px;">
<p style="margin:0; padding:0; font-size:14px;"> <p style="margin:0; padding:0; font-size:14px;">
{{ $transaction->contact->email }} @if ($transaction->contact->phone)
</p> {{ $transaction->contact->phone }}
</td> @endif
</tr> </p>
@endif </td>
@stack('email_input_end') </tr>
@endif
@stack('phone_input_end')
@stack('email_start')
@if (!$hideContactEmail)
<tr>
<td style="padding-bottom:0; padding-top:0; font-size:14px;">
<p style="margin:0; padding:0; font-size:14px;">
{{ $transaction->contact->email }}
</p>
</td>
</tr>
@endif
@stack('email_input_end')
@endif @endif
</table> </table>
</td> </td>
@if (!$hideAmount) @if (!$hideAmount)
<td style="width:30%; padding-top:32px; padding-left: 25px;" valign="top"> <td style="width:30%; padding-top:32px; padding-left: 25px;" valign="top">
<table> <table>
<tr> <tr>
<td style="background-color: #6da252; -webkit-print-color-adjust: exact; width: 280px; font-weight:bold !important; display:block;"> <td style="background-color: #6da252; -webkit-print-color-adjust: exact; width: 280px; font-weight:bold !important; display:block;">
<h5 class="text-muted mb-0 text-white" style="font-size: 20px; color:#ffffff; text-align:center; margin-top: 16px;">{{ trans('general.amount') }}</h5> <h5 class="text-muted mb-0 text-white" style="font-size: 20px; color:#ffffff; text-align:center; margin-top: 16px;">
{{ trans($textAmount) }}
</h5>
<p class="font-weight-bold mb-0 text-white" style="font-size: 32px; color:#ffffff; text-align:center;"> <p class="font-weight-bold mb-0 text-white" style="font-size: 32px; color:#ffffff; text-align:center;">
@money($transaction->amount, $transaction->currency_code, true) @money($transaction->amount, $transaction->currency_code, true)
</p> </p>
@ -203,81 +246,92 @@
</tr> </tr>
</table> </table>
<table>
<tr>
<td class="border-bottom-1" style="padding-bottom: 0; padding-top:16px;"></td>
</tr>
</table>
@if (!$hideReletad) @if (!$hideReletad)
@if ($transaction->document) @if ($transaction->document)
<table>
<tr>
<td class="border-bottom-1" style="padding-bottom: 0; padding-top:16px;"></td>
</tr>
</table>
<table> <table>
<tr> <tr>
<td style="padding-bottom: 0; padding-top:36px;"> <td style="padding-bottom: 0; padding-top:36px;">
<h2 style="font-size: 16px;">{{ trans('invoices.related_revenue') }}</h2> <h2 style="font-size: 16px;">{{ trans($textReleatedTransansaction) }}</h2>
</td> </td>
</tr> </tr>
</table> </table>
<table class="table table-flush table-hover" cellspacing="0" cellpadding="0" style="margin-bottom: 36px;"> <table class="table table-flush table-hover" cellspacing="0" cellpadding="0" style="margin-bottom: 36px;">
<thead style="background-color: #f6f9fc; -webkit-print-color-adjust: exact; font-family: Arial, sans-serif; color:#8898aa; font-size:11px;"> <thead style="background-color: #f6f9fc; -webkit-print-color-adjust: exact; font-family: Arial, sans-serif; color:#8898aa; font-size:11px;">
<tr class="border-bottom-1"> <tr class="border-bottom-1">
<th class="item text-left" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;"> @if (!$hideReletadDocumentNumber)
<span>{{ trans_choice('general.numbers', 1) }}</span> <th class="item text-left" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;">
</th> <span>{{ trans_choice($textReleatedDocumentNumber, 1) }}</span>
</th>
@endif
<th class="quantity" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;"> @if (!$hideReletadContact)
{{ trans_choice('general.customers', 1) }} <th class="quantity" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;">
</th> {{ trans_choice($textReleatedContact, 1) }}
</th>
@endif
<th class="price" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;"> @if (!$hideReletadDocumentDate)
{{ trans('invoices.invoice_date') }} <th class="price" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;">
</th> {{ trans($textReleatedDocumentDate) }}
</th>
@endif
<th class="price" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;"> @if (!$hideReletadDocumentAmount)
{{ trans('invoices.invoice_date') }} <th class="price" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;">
</th> {{ trans($textReleatedDocumentAmount) }}
</th>
@endif
<th class="total" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;"> @if (!$hideReletadAmount)
{{ trans('general.amount') }} <th class="total" style="text-align: left; text-transform: uppercase; font-family: Arial, sans-serif;">
</th> {{ trans($textReleatedAmount) }}
</th>
@endif
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td class="item" style="color:#525f7f; font-size:13px;"> @if (!$hideReletadDocumentNumber)
<a style="color:#6da252 !important;" href="{{ route('invoices.show' , $transaction->document->id) }}"> <td class="item" style="color:#525f7f; font-size:13px;">
{{ $transaction->document->document_number }} <a style="color:#6da252 !important;" href="{{ route($routeDocumentShow, $transaction->document->id) }}">
</a> {{ $transaction->document->document_number }}
</td> </a>
</td>
@endif
<td class="quantity" style="color:#525f7f; font-size:13px;"> @if (!$hideReletadContact)
{{ $transaction->document->contact_name }} <td class="quantity" style="color:#525f7f; font-size:13px;">
</td> {{ $transaction->document->contact_name }}
</td>
@endif
<td class="price" style="color:#525f7f; font-size:13px;"> @if (!$hideReletadDocumentDate)
@date($transaction->document->due_at) <td class="price" style="color:#525f7f; font-size:13px;">
</td> @date($transaction->document->due_at)
</td>
@endif
<td class="price" style="color:#525f7f; font-size:13px;"> @if (!$hideReletadDocumentAmount)
@money($transaction->document->amount, $transaction->document->currency_code, true) <td class="price" style="color:#525f7f; font-size:13px;">
</td> @money($transaction->document->amount, $transaction->document->currency_code, true)
</td>
@endif
<td class="total" style="color:#525f7f; font-size:13px;"> @if (!$hideReletadAmount)
@money($transaction->amount, $transaction->currency_code, true) <td class="total" style="color:#525f7f; font-size:13px;">
</td> @money($transaction->amount, $transaction->currency_code, true)
</td>
@endif
</tr> </tr>
</tbody> </tbody>
</table> </table>
@else
<table>
<tr>
<td style="padding-bottom:0; font-size:14px;">
<p style="margin-bottom:0; font-size:14px;">
{{ trans('invoices.overdue_revenue') }}: <strong style="font-weight: bold;">@money($transaction->amount, $transaction->currency_code, true)</strong>
</p>
</td>
</tr>
</table>
@endif @endif
@endif @endif

2
resources/views/purchases/payments/show.blade.php
View File

@ -1,6 +1,6 @@
@extends('layouts.admin') @extends('layouts.admin')
@section('title', trans('invoices.payment_made')) @section('title', trans('payments.payment_made'))
@section('new_button') @section('new_button')
<x-transactions.show.top-buttons type="expense" :transaction="$payment" hide-button-share hide-button-email /> <x-transactions.show.top-buttons type="expense" :transaction="$payment" hide-button-share hide-button-email />

2
resources/views/sales/revenues/show.blade.php
View File

@ -1,6 +1,6 @@
@extends('layouts.admin') @extends('layouts.admin')
@section('title', trans('invoices.revenue_made')) @section('title', trans('revenues.revenue_made'))
@section('new_button') @section('new_button')
<x-transactions.show.top-buttons type="income" :transaction="$revenue" /> <x-transactions.show.top-buttons type="income" :transaction="$revenue" />