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

Merge branch 'master' of https://github.com/brkcvn/akaunting into form-elements

Browse Source
This commit is contained in:
Burak Civan
2022-06-14 16:31:08 +03:00
parent 4ab1ce6797 209c71af93
commit 48cf229b3c
42 changed files with 2218 additions and 2138 deletions
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)

4
app/BulkActions/Sales/Invoices.php
View File

@@ -5,7 +5,7 @@ namespace App\BulkActions\Sales;
use App\Abstracts\BulkAction; use App\Abstracts\BulkAction;
use App\Events\Document\DocumentCancelled; use App\Events\Document\DocumentCancelled;
use App\Events\Document\DocumentCreated; use App\Events\Document\DocumentCreated;
use App\Events\Document\DocumentSent; use App\Events\Document\DocumentMarkedSent;
use App\Events\Document\PaymentReceived; use App\Events\Document\PaymentReceived;
use App\Exports\Sales\Invoices as Export; use App\Exports\Sales\Invoices as Export;
use App\Jobs\Document\DeleteDocument; use App\Jobs\Document\DeleteDocument;
@@ -58,7 +58,7 @@ class Invoices extends BulkAction
continue; continue;
} }
event(new DocumentSent($invoice)); event(new DocumentMarkedSent($invoice));
} }
} }

20
app/Events/Document/DocumentMarkedSent.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
namespace App\Events\Document;
use App\Abstracts\Event;
class DocumentMarkedSent extends Event
{
public $document;
/**
* Create a new event instance.
*
* @param $document
*/
public function __construct($document)
{
$this->document = $document;
}
}

2
app/Http/Controllers/Sales/Invoices.php
View File

@@ -220,7 +220,7 @@ class Invoices extends Controller
*/ */
public function markSent(Document $invoice) public function markSent(Document $invoice)
{ {
event(new \App\Events\Document\DocumentSent($invoice)); event(new \App\Events\Document\DocumentMarkedSent($invoice));
$message = trans('documents.messages.marked_sent', ['type' => trans_choice('general.invoices', 1)]); $message = trans('documents.messages.marked_sent', ['type' => trans_choice('general.invoices', 1)]);

26
app/Listeners/Document/MarkDocumentSent.php
View File

@@ -2,7 +2,8 @@
namespace App\Listeners\Document; namespace App\Listeners\Document;
use App\Events\Document\DocumentSent as Event; use App\Events\Document\DocumentMarkedSent;
use App\Events\Document\DocumentSent;
use App\Jobs\Document\CreateDocumentHistory; use App\Jobs\Document\CreateDocumentHistory;
use App\Traits\Jobs; use App\Traits\Jobs;
@@ -10,13 +11,7 @@ class MarkDocumentSent
{ {
use Jobs; use Jobs;
/** public function handle(DocumentMarkedSent|DocumentSent $event): void
* Handle the event.
*
* @param $event
* @return void
*/
public function handle(Event $event)
{ {
if ($event->document->status != 'partial') { if ($event->document->status != 'partial') {
$event->document->status = 'sent'; $event->document->status = 'sent';
@@ -24,6 +19,11 @@ class MarkDocumentSent
$event->document->save(); $event->document->save();
} }
$this->dispatch(new CreateDocumentHistory($event->document, 0, $this->getDescription($event)));
}
public function getDescription(DocumentMarkedSent|DocumentSent $event): string
{
$type_text = ''; $type_text = '';
if ($alias = config('type.document.' . $event->document->type . '.alias', '')) { if ($alias = config('type.document.' . $event->document->type . '.alias', '')) {
@@ -34,12 +34,8 @@ class MarkDocumentSent
$type = trans_choice($type_text, 1); $type = trans_choice($type_text, 1);
$this->dispatch( $message = ($event instanceof DocumentMarkedSent) ? 'marked_sent' : 'email_sent';
new CreateDocumentHistory(
$event->document, return trans('documents.messages.' . $message, ['type' => $type]);
0,
trans('documents.messages.marked_sent', ['type' => $type])
)
);
} }
} }

17
app/Models/Document/Document.php
View File

@@ -179,24 +179,29 @@ class Document extends Model
return $query->whereDate('due_at', '=', $date); return $query->whereDate('due_at', '=', $date);
} }
public function scopeStatus(Builder $query, string $status): Builder
{
return $query->where($this->qualifyColumn('status'), '=', $status);
}
public function scopeAccrued(Builder $query): Builder public function scopeAccrued(Builder $query): Builder
{ {
return $query->whereNotIn('status', ['draft', 'cancelled']); return $query->whereNotIn($this->qualifyColumn('status'), ['draft', 'cancelled']);
} }
public function scopePaid(Builder $query): Builder public function scopePaid(Builder $query): Builder
{ {
return $query->where('status', '=', 'paid'); return $query->where($this->qualifyColumn('status'), '=', 'paid');
} }
public function scopeNotPaid(Builder $query): Builder public function scopeNotPaid(Builder $query): Builder
{ {
return $query->where('status', '<>', 'paid'); return $query->where($this->qualifyColumn('status'), '<>', 'paid');
} }
public function scopeFuture(Builder $query): Builder public function scopeFuture(Builder $query): Builder
{ {
return $query->whereIn('status', $this->getDocumentStatusesForFuture()); return $query->whereIn($this->qualifyColumn('status'), $this->getDocumentStatusesForFuture());
} }
public function scopeType(Builder $query, string $type): Builder public function scopeType(Builder $query, string $type): Builder
@@ -244,14 +249,14 @@ class Document extends Model
public function getSentAtAttribute(string $value = null) public function getSentAtAttribute(string $value = null)
{ {
$sent = $this->histories()->where('status', 'sent')->first(); $sent = $this->histories()->where('document_histories.status', 'sent')->first();
return $sent->created_at ?? null; return $sent->created_at ?? null;
} }
public function getReceivedAtAttribute(string $value = null) public function getReceivedAtAttribute(string $value = null)
{ {
$received = $this->histories()->where('status', 'received')->first(); $received = $this->histories()->where('document_histories.status', 'received')->first();
return $received->created_at ?? null; return $received->created_at ?? null;
} }

3
app/Providers/Event.php
View File

@@ -57,6 +57,9 @@ class Event extends Provider
'App\Listeners\Document\CreateDocumentTransaction', 'App\Listeners\Document\CreateDocumentTransaction',
'App\Listeners\Document\SendDocumentPaymentNotification', 'App\Listeners\Document\SendDocumentPaymentNotification',
], ],
'App\Events\Document\DocumentMarkedSent' => [
'App\Listeners\Document\MarkDocumentSent',
],
'App\Events\Document\DocumentSent' => [ 'App\Events\Document\DocumentSent' => [
'App\Listeners\Document\MarkDocumentSent', 'App\Listeners\Document\MarkDocumentSent',
], ],

13
public/akaunting-js/generalAction.js vendored
View File

@@ -278,3 +278,16 @@ function runTooltip(tooltipToggleEl) {
}); });
} }
// Tooltip elements using [data-tooltip-target], [data-tooltip-placement] // Tooltip elements using [data-tooltip-target], [data-tooltip-placement]
//Auto Height for Textarea
const tx = document.querySelectorAll('[textarea-auto-height]');
for (let i = 0; i < tx.length; i++) {
tx[i].setAttribute('style', 'height:' + (tx[i].scrollHeight) + 'px;overflow-y:hidden;');
tx[i].addEventListener('input', OnInput, false);
}
function OnInput() {
this.style.height = 'auto';
this.style.height = (this.scrollHeight) + 'px';
}
//Auto Height for Textarea

2
public/css/app.css vendored
View File

@@ -1584,7 +1584,7 @@ input[type="date"]::-webkit-inner-spin-button,
} }
.overflow-overlay { .overflow-overlay {
overflow: overlay; overflow-x: overlay;
} }
.py-top { .py-top {

52
public/css/print.css vendored
View File

@@ -59,12 +59,12 @@ th, td
margin-bottom: 8px; margin-bottom: 8px;
} }
.mt-1 .print-template .mt-1
{ {
margin-top: 8px; margin-top: 8px;
} }
.ml-1 .print-template .ml-1
{ {
margin-left: 8px; margin-left: 8px;
} }
@@ -74,67 +74,67 @@ th, td
padding-left: 18px; padding-left: 18px;
} }
.mt-0 .print-template .mt-0
{ {
margin-top: 0 !important; margin-top: 0 !important;
} }
.mt-1 .print-template .mt-1
{ {
margin-top: 8px; margin-top: 8px;
} }
.mt-2 .print-template .mt-2
{ {
margin-top: 16px; margin-top: 16px;
} }
.mt-3 .print-template .mt-3
{ {
margin-top: 24px; margin-top: 24px;
} }
.mt-4 .print-template .mt-4
{ {
margin-top: 32px; margin-top: 32px;
} }
.mt-5 .print-template .mt-5
{ {
margin-top: 40px; margin-top: 40px;
} }
.mt-6 .print-template .mt-6
{ {
margin-top: 48px; margin-top: 48px;
} }
.mt-7 .print-template .mt-7
{ {
margin-top: 56px; margin-top: 56px;
} }
.mt-8 .print-template .mt-8
{ {
margin-top: 64px; margin-top: 64px;
} }
.mt-9 .print-template .mt-9
{ {
margin-top: 72px; margin-top: 72px;
} }
.pb-0 .print-template .pb-0
{ {
padding-bottom: 0; padding-bottom: 0;
} }
.pb-1 .print-template .pb-1
{ {
padding-bottom: 8px; padding-bottom: 8px;
} }
.py-1 .print-template .py-1
{ {
padding-bottom: 3px; padding-bottom: 3px;
padding-top: 3px; padding-top: 3px;
@@ -158,47 +158,47 @@ th, td
padding: 0 10px 0 10px; padding: 0 10px 0 10px;
} }
.pt-2 .print-template .pt-2
{ {
padding-top: 16px; padding-top: 16px;
} }
.pb-2 .print-template .pb-2
{ {
padding-bottom: 16px; padding-bottom: 16px;
} }
.pl-3 .print-template .pl-3
{ {
padding-left: 24px; padding-left: 24px;
} }
.pl-4 .print-template .pl-4
{ {
padding-left: 32px; padding-left: 32px;
} }
.pl-5 .print-template .pl-5
{ {
padding-left: 40px; padding-left: 40px;
} }
.pl-6 .print-template .pl-6
{ {
padding-left: 48px; padding-left: 48px;
} }
.pl-7 .print-template .pl-7
{ {
padding-left: 56px; padding-left: 56px;
} }
.pl-8 .print-template .pl-8
{ {
padding-left: 64px; padding-left: 64px;
} }
.pl-9 .print-template .pl-9
{ {
padding-left: 72px; padding-left: 72px;
} }
@@ -383,7 +383,7 @@ html[dir='rtl'] .text-alignment-right {
.lines .lines
{ {
border-collapse: collapse; border-collapse: collapse;
table-layout: fixed; table-layout: auto;
border-bottom: 1px solid #adadad; border-bottom: 1px solid #adadad;
} }
@@ -564,7 +564,7 @@ html[dir='rtl'] .text-alignment-right {
.modern-lines .modern-lines
{ {
border-collapse: collapse; border-collapse: collapse;
table-layout: fixed; table-layout: auto;
} }
.modern-lines .item .modern-lines .item

8
resources/assets/js/components/AkauntingModal.vue
View File

@@ -125,7 +125,7 @@ export default {
if (this.show) { if (this.show) {
let documentClasses = document.body.classList; let documentClasses = document.body.classList;
documentClasses.add("overflow-hidden"); documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
} }
if (this.modalDialogClass) { if (this.modalDialogClass) {
@@ -158,7 +158,7 @@ export default {
onCancel() { onCancel() {
let documentClasses = document.body.classList; let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden"); documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
this.$emit("cancel"); this.$emit("cancel");
} }
@@ -169,9 +169,9 @@ export default {
let documentClasses = document.body.classList; let documentClasses = document.body.classList;
if (val) { if (val) {
documentClasses.add("overflow-hidden"); documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
} else { } else {
documentClasses.remove("overflow-hidden"); documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
} }
} }
} }

8
resources/assets/js/components/AkauntingModalAddNew.vue
View File

@@ -154,7 +154,7 @@ export default {
created: function () { created: function () {
let documentClasses = document.body.classList; let documentClasses = document.body.classList;
documentClasses.add("overflow-hidden"); documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
if (this.modalDialogClass) { if (this.modalDialogClass) {
let modal_size = this.modalDialogClass.replace('modal-', 'max-w-screen-'); let modal_size = this.modalDialogClass.replace('modal-', 'max-w-screen-');
@@ -311,7 +311,7 @@ export default {
onCancel() { onCancel() {
let documentClasses = document.body.classList; let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden"); documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
this.$emit("cancel"); this.$emit("cancel");
} }
@@ -322,9 +322,9 @@ export default {
let documentClasses = document.body.classList; let documentClasses = document.body.classList;
if (val) { if (val) {
documentClasses.add("overflow-hidden"); documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
} else { } else {
documentClasses.remove("overflow-hidden"); documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
} }
} }
} }

2
resources/assets/sass/app.css vendored
View File

@@ -189,7 +189,7 @@
} }
.overflow-overlay { .overflow-overlay {
overflow: overlay; overflow-x: overlay;
} }
.py-top { .py-top {

16
resources/lang/en-GB/documents.php
View File

@@ -4,24 +4,20 @@ return [
'edit_columns' => 'Edit Columns', 'edit_columns' => 'Edit Columns',
'empty_items' => 'You have not added any items.', 'empty_items' => 'You have not added any items.',
'grand_total' => 'Grand Total',
'accept_payment_online' => 'Accept Payments Online',
'transaction' => 'A payment for :amount was made using :account.',
'billing' => 'Billing',
'advanced' => 'Advanced',
'invoice_detail' => [ 'invoice_detail' => [
'marked' => '<b> You </b> marked this invoice as', 'marked' => '<b>You</b> marked this invoice as',
'services' => 'Services', 'services' => 'Services',
'another_item' => 'Another Item', 'another_item' => 'Another Item',
'another_description' => 'and another description', 'another_description' => 'and another description',
'more_item' => '+:count more item', 'more_item' => '+:count more item',
], ],
'grand_total' => 'Grand Total',
'accept_payment_online' => 'Accept Payments Online',
'transaction' => 'A payment for :amount was made using :account.',
'billing' => 'Billing',
'advanced' => 'Advanced',
'statuses' => [ 'statuses' => [
'draft' => 'Draft', 'draft' => 'Draft',
'sent' => 'Sent', 'sent' => 'Sent',

4
resources/views/banking/recurring_transactions/show.blade.php
View File

@@ -8,7 +8,7 @@
</x-slot> </x-slot>
<x-slot name="buttons"> <x-slot name="buttons">
<x-transactions.show.buttons type="{{ $recurring_transaction->type }}" :transaction="$recurring_transaction" /> <x-transactions.show.buttons type="{{ $recurring_transaction->type }}" :transaction="$recurring_transaction" hide-divider4 hide-button-delete />
</x-slot> </x-slot>
<x-slot name="moreButtons"> <x-slot name="moreButtons">
@@ -21,8 +21,8 @@
hide-button-share hide-button-share
hide-button-email hide-button-email
hide-divider-2 hide-divider-2
hide-button-delete
hide-divider-4 hide-divider-4
hide-button-delete
/> />
</x-slot> </x-slot>

7
resources/views/banking/transactions/index.blade.php
View File

@@ -162,15 +162,18 @@
<x-slot name="first"> <x-slot name="first">
{{ $item->contact->name }} {{ $item->contact->name }}
</x-slot> </x-slot>
<x-slot name="second" class="w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class"> <x-slot name="second" class="w-20 font-normal group">
@if ($item->document) @if ($item->document)
<div data-tooltip-target="tooltip-information-{{ $item->document_id }}" data-tooltip-placement="left" override="class">
<a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed"> <a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
{{ $item->document->document_number }} {{ $item->document->document_number }}
</a> </a>
<div class="w-28 absolute h-10 -ml-12 -mt-6"></div> <div class="w-28 absolute h-10 -ml-12 -mt-6">
</div>
<x-documents.index.information :document="$item->document" /> <x-documents.index.information :document="$item->document" />
</div>
@else @else
<x-empty-data /> <x-empty-data />
@endif @endif

4
resources/views/components/contacts/show/content.blade.php
View File

@@ -215,12 +215,12 @@
{{ $item->contact_name }} {{ $item->contact_name }}
</x-slot> </x-slot>
<x-slot name="second" class="relative w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class,data-tooltip-target,data-tooltip-placement"> <x-slot name="second" class="w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class,data-tooltip-target,data-tooltip-placement">
<span class="border-black border-b border-dashed"> <span class="border-black border-b border-dashed">
{{ $item->document_number }} {{ $item->document_number }}
</span> </span>
<div class="w-full absolute h-10 -left-10 -mt-6"></div> <div class="w-28 absolute h-10 -left-10 -mt-6"></div>
<x-documents.index.information :document="$item" /> <x-documents.index.information :document="$item" />
</x-slot> </x-slot>

1
resources/views/components/documents/form/note.blade.php
View File

@@ -8,5 +8,6 @@
form-label-class="lg:text-lg" form-label-class="lg:text-lg"
form-group-class="border-b pb-2 mb-3.5" form-group-class="border-b pb-2 mb-3.5"
rows="1" rows="1"
textarea-auto-height
/> />
</div> </div>

2
resources/views/components/documents/index/information.blade.php
View File

@@ -1,4 +1,4 @@
<div id="tooltip-information-{{ $document->id }}" role="tooltip" class="w-96 inline-block absolute z-10 text-sm font-medium rounded-lg border border-gray-200 shadow-sm whitespace-nowrap tooltip-content transition-visible bg-lilac-900 border-none text-black p-6 cursor-auto opacity-0 invisible"> <div id="tooltip-information-{{ $document->id }}" role="tooltip" class="w-96 inline-block absolute left-0 z-10 text-sm font-medium rounded-lg border border-gray-200 shadow-sm whitespace-nowrap tooltip-content transition-visible bg-lilac-900 border-none text-black p-6 cursor-auto opacity-0 invisible">
<div class="absolute w-2 h-2 inset-y-1/2 -right-1 before:content-[' '] before:absolute before:w-2 before:h-2 before:bg-lilac-900 before:border-gray-200 before:transform before:rotate-45 before:border before:border-t-0 before:border-l-0 data-popper-arrow"></div> <div class="absolute w-2 h-2 inset-y-1/2 -right-1 before:content-[' '] before:absolute before:w-2 before:h-2 before:bg-lilac-900 before:border-gray-200 before:transform before:rotate-45 before:border before:border-t-0 before:border-l-0 data-popper-arrow"></div>
<ul> <ul>

2
resources/views/components/documents/show/more-buttons.blade.php
View File

@@ -130,8 +130,6 @@
<x-dropdown.link href="{{ route($endRoute, $document->id) }}"> <x-dropdown.link href="{{ route($endRoute, $document->id) }}">
{{ trans('recurring.end') }} {{ trans('recurring.end') }}
</x-dropdown.link> </x-dropdown.link>
<x-dropdown.divider />
@endif @endif
@stack('end_button_end') @stack('end_button_end')

2
resources/views/components/documents/show/template.blade.php
View File

@@ -1,4 +1,4 @@
<div class="p-7 shadow-2xl rounded-2xl print-template"> <div class="p-7 shadow-2xl rounded-2xl">
@if ($documentTemplate) @if ($documentTemplate)
@switch($documentTemplate) @switch($documentTemplate)
@case('classic') @case('classic')

30
resources/views/components/documents/template/classic.blade.php
View File

@@ -1,4 +1,5 @@
<div class="row"> <div class="print-template">
<div class="row">
<div class="col-100"> <div class="col-100">
<div class="text text-dark"> <div class="text text-dark">
<h3> <h3>
@@ -6,9 +7,9 @@
</h3> </h3>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-58"> <div class="col-58">
<div class="text"> <div class="text">
@stack('company_logo_start') @stack('company_logo_start')
@@ -72,9 +73,9 @@
@stack('company_details_end') @stack('company_details_end')
</div> </div>
</div> </div>
</div> </div>
<div class="row mt-2"> <div class="row mt-2">
<div class="col-33"> <div class="col-33">
<div class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};"></div> <div class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};"></div>
<div class="invoice-classic-line" style="background-color:{{ $backgroundColor }};"></div> <div class="invoice-classic-line" style="background-color:{{ $backgroundColor }};"></div>
@@ -104,9 +105,9 @@
<div class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};"></div> <div class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};"></div>
<div class="invoice-classic-line" style="background-color:{{ $backgroundColor }};"></div> <div class="invoice-classic-line" style="background-color:{{ $backgroundColor }};"></div>
</div> </div>
</div> </div>
<div class="row top-spacing"> <div class="row top-spacing">
<div class="col-60"> <div class="col-60">
<div class="text p-index-left"> <div class="text p-index-left">
@if (! $hideContactInfo) @if (! $hideContactInfo)
@@ -227,9 +228,9 @@
@endforeach @endforeach
</div> </div>
</div> </div>
</div> </div>
@if (! $hideItems) @if (! $hideItems)
<div class="row"> <div class="row">
<div class="col-100"> <div class="col-100">
<div class="text extra-spacing"> <div class="text extra-spacing">
@@ -308,9 +309,9 @@
</div> </div>
</div> </div>
</div> </div>
@endif @endif
<div class="row mt-4 clearfix"> <div class="row mt-4 clearfix">
<div class="col-60"> <div class="col-60">
<div class="text p-index-right"> <div class="text p-index-right">
@stack('notes_input_start') @stack('notes_input_start')
@@ -370,9 +371,9 @@
@endif @endif
@endforeach @endforeach
</div> </div>
</div> </div>
@if (! $hideFooter) @if (! $hideFooter)
@if ($document->footer) @if ($document->footer)
<div class="row mt-1"> <div class="row mt-1">
<div class="col-100"> <div class="col-100">
@@ -384,4 +385,5 @@
</div> </div>
</div> </div>
@endif @endif
@endif @endif
</div>

26
resources/views/components/documents/template/default.blade.php
View File

@@ -1,4 +1,5 @@
<div class="row"> <div class="print-template">
<div class="row">
<div class="col-100"> <div class="col-100">
<div class="text text-dark"> <div class="text text-dark">
<h3> <h3>
@@ -6,9 +7,9 @@
</h3> </h3>
</div> </div>
</div> </div>
</div> </div>
<div class="row border-bottom-1"> <div class="row border-bottom-1">
<div class="col-58"> <div class="col-58">
<div class="text"> <div class="text">
@stack('company_logo_start') @stack('company_logo_start')
@@ -69,9 +70,9 @@
@stack('company_details_end') @stack('company_details_end')
</div> </div>
</div> </div>
</div> </div>
<div class="row top-spacing"> <div class="row top-spacing">
<div class="col-60"> <div class="col-60">
<div class="text p-index-left"> <div class="text p-index-left">
@if (! $hideContactInfo) @if (! $hideContactInfo)
@@ -188,9 +189,9 @@
@stack('due_at_input_end') @stack('due_at_input_end')
</div> </div>
</div> </div>
</div> </div>
@if (! $hideItems) @if (! $hideItems)
<div class="row"> <div class="row">
<div class="col-100"> <div class="col-100">
<div class="text extra-spacing"> <div class="text extra-spacing">
@@ -269,9 +270,9 @@
</div> </div>
</div> </div>
</div> </div>
@endif @endif
<div class="row mt-9 clearfix"> <div class="row mt-9 clearfix">
<div class="col-60"> <div class="col-60">
<div class="text p-index-left"> <div class="text p-index-left">
@stack('notes_input_start') @stack('notes_input_start')
@@ -329,9 +330,9 @@
@endif @endif
@endforeach @endforeach
</div> </div>
</div> </div>
@if (! $hideFooter) @if (! $hideFooter)
@if ($document->footer) @if ($document->footer)
<div class="row mt-4"> <div class="row mt-4">
<div class="col-100 text-left"> <div class="col-100 text-left">
@@ -343,4 +344,5 @@
</div> </div>
</div> </div>
@endif @endif
@endif @endif
</div>

26
resources/views/components/documents/template/modern.blade.php
View File

@@ -1,4 +1,5 @@
<div class="row"> <div class="print-template">
<div class="row">
<div class="col-100"> <div class="col-100">
<div class="text text-dark"> <div class="text text-dark">
<h3> <h3>
@@ -6,9 +7,9 @@
</h3> </h3>
</div> </div>
</div> </div>
</div> </div>
<div class="row modern-head pt-2 pb-2 mt-1 bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;"> <div class="row modern-head pt-2 pb-2 mt-1 bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<div class="col-58"> <div class="col-58">
<div class="text p-modern"> <div class="text p-modern">
@stack('company_logo_start') @stack('company_logo_start')
@@ -75,9 +76,9 @@
@stack('company_details_end') @stack('company_details_end')
</div> </div>
</div> </div>
</div> </div>
<div class="row top-spacing"> <div class="row top-spacing">
<div class="col-50"> <div class="col-50">
<div class="text p-modern"> <div class="text p-modern">
@if (! $hideContactInfo) @if (! $hideContactInfo)
@@ -199,9 +200,9 @@
@stack('due_at_input_end') @stack('due_at_input_end')
</div> </div>
</div> </div>
</div> </div>
@if (! $hideItems) @if (! $hideItems)
<div class="row"> <div class="row">
<div class="col-100"> <div class="col-100">
<div class="text extra-spacing"> <div class="text extra-spacing">
@@ -280,9 +281,9 @@
</div> </div>
</div> </div>
</div> </div>
@endif @endif
<div class="row mt-7 clearfix"> <div class="row mt-7 clearfix">
<div class="col-60"> <div class="col-60">
<div class="text p-index-right p-modern"> <div class="text p-index-right p-modern">
@stack('notes_input_start') @stack('notes_input_start')
@@ -340,9 +341,9 @@
@endif @endif
@endforeach @endforeach
</div> </div>
</div> </div>
@if (! $hideFooter) @if (! $hideFooter)
@if ($document->footer) @if ($document->footer)
<div class="row mt-7"> <div class="row mt-7">
<div class="col-100 py-top p-modern bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;"> <div class="col-100 py-top p-modern bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
@@ -354,4 +355,5 @@
</div> </div>
</div> </div>
@endif @endif
@endif @endif
</div>

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>

4
resources/views/components/layouts/admin.blade.php
View File

@@ -13,9 +13,9 @@
</x-layouts.admin.head> </x-layouts.admin.head>
@mobile @mobile
<body class="g-sidenav-hidden bg-body overflow-overlay"> <body class="g-sidenav-hidden bg-body">
@elsemobile @elsemobile
<body class="g-sidenav-show bg-body overflow-overlay"> <body class="g-sidenav-show bg-body">
@endmobile @endmobile
@stack('body_start') @stack('body_start')

4
resources/views/components/layouts/auth.blade.php
View File

@@ -7,9 +7,9 @@
</x-layouts.auth.head> </x-layouts.auth.head>
@mobile @mobile
<body class="g-sidenav-hidden bg-body overflow-overlay"> <body class="g-sidenav-hidden bg-body">
@elsemobile @elsemobile
<body class="g-sidenav-show bg-body overflow-overlay"> <body class="g-sidenav-show bg-body">
@endmobile @endmobile
@stack('body_start') @stack('body_start')

4
resources/views/components/layouts/error.blade.php
View File

@@ -7,9 +7,9 @@
</x-layouts.admin.head> </x-layouts.admin.head>
@mobile @mobile
<body class="g-sidenav-hidden bg-body overflow-overlay"> <body class="g-sidenav-hidden bg-body">
@elsemobile @elsemobile
<body class="g-sidenav-show bg-body overflow-overlay"> <body class="g-sidenav-show bg-body">
@endmobile @endmobile
@stack('body_start') @stack('body_start')

4
resources/views/components/layouts/modules.blade.php
View File

@@ -7,9 +7,9 @@
</x-layouts.modules.head> </x-layouts.modules.head>
@mobile @mobile
<body class="g-sidenav-hidden bg-body overflow-overlay"> <body class="g-sidenav-hidden bg-body">
@elsemobile @elsemobile
<body class="g-sidenav-show bg-body overflow-overlay"> <body class="g-sidenav-show bg-body">
@endmobile @endmobile
@stack('body_start') @stack('body_start')

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>

4
resources/views/components/layouts/portal.blade.php
View File

@@ -7,9 +7,9 @@
</x-layouts.portal.head> </x-layouts.portal.head>
@mobile @mobile
<body class="g-sidenav-hidden bg-body overflow-overlay"> <body class="g-sidenav-hidden bg-body">
@elsemobile @elsemobile
<body class="g-sidenav-show bg-body overflow-overlay"> <body class="g-sidenav-show bg-body">
@endmobile @endmobile
@stack('body_start') @stack('body_start')

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

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

@@ -1,4 +1,4 @@
<div class="p-7 shadow-2xl rounded-2xl print-template"> <div class="p-7 shadow-2xl rounded-2xl">
@if ($transactionTemplate) @if ($transactionTemplate)
@switch($transactionTemplate) @switch($transactionTemplate)
@case('classic') @case('classic')

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

@@ -1,8 +1,9 @@
@stack('company_start') <div class="print-template">
@if (!$hideCompany) @stack('company_start')
<table class="border-bottom-1"> @if (! $hideCompany)
<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))
@@ -14,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') }}
@@ -35,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') }}
@@ -43,18 +44,18 @@
@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')
</td> </td>
@endif @endif
</tr> </tr>
</table> </table>
@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;">
@@ -64,11 +65,11 @@
</td> </td>
</tr> </tr>
</table> </table>
@endif @endif
<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) }}:
@@ -82,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) }}:
@@ -96,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) }}:
@@ -110,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) }}:
@@ -124,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) }}:
@@ -138,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) }}:
@@ -152,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) }}:
@@ -166,9 +167,9 @@
</tr> </tr>
@endif @endif
@stack('description_input_end') @stack('description_input_end')
</table> </table>
<table class="border-top-1" style="margin-top:15px;"> <table class="border-top-1" style="margin-top:15px;">
<tr> <tr>
<td style="width: 60%; padding: 15px 0 15px 0;"> <td style="width: 60%; padding: 15px 0 15px 0;">
<h2 style="font-size: 12px; font-weight:600;"> <h2 style="font-size: 12px; font-weight:600;">
@@ -176,11 +177,10 @@
</h2> </h2>
</td> </td>
</tr> </tr>
</table> </table>
<table class="border-bottom-1" style="padding-bottom:15px;">
@if (!$hideContact)
<table class="border-bottom-1" style="padding-bottom:15px;">
@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;">
@@ -190,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>
@@ -203,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>
@@ -216,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 }}
@@ -231,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 }}
@@ -246,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>
@@ -258,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>
@@ -277,72 +285,84 @@
<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>
</tbody> </tbody>
</table> </table>
@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;">
@@ -351,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>
@@ -359,4 +380,5 @@
</td> </td>
</tr> </tr>
</table> </table>
@endif @endif
</div>

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

@@ -6,7 +6,7 @@
</div> </div>
<div class="w-full lg:w-7/12"> <div class="w-full lg:w-7/12">
<div class="p-7 shadow-2xl rounded-2xl print-template"> <div class="p-7 shadow-2xl rounded-2xl">
<x-transfers.show.template :model="$transfer" /> <x-transfers.show.template :model="$transfer" />
</div> </div>
</div> </div>

22
resources/views/components/transfers/template/default.blade.php
View File

@@ -1,4 +1,5 @@
<table class="border-bottom-1" style="width: 100%;"> <div class="print-template">
<table class="border-bottom-1" style="width: 100%;">
<tbody> <tbody>
<tr> <tr>
<td style="width: 60%; padding: 0 0 15px 0;"> <td style="width: 60%; padding: 0 0 15px 0;">
@@ -68,9 +69,9 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="border-bottom-1" style="width: 100%; margin-top:15px;"> <table class="border-bottom-1" style="width: 100%; margin-top:15px;">
<tbody> <tbody>
<tr> <tr>
<td style="width: 60%; padding: 0 0 15px 0;"> <td style="width: 60%; padding: 0 0 15px 0;">
@@ -140,9 +141,9 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table style="width: 100%; margin-top:15px;"> <table style="width: 100%; margin-top:15px;">
<tr> <tr>
<td style="padding:0 0 15px 0;"> <td style="padding:0 0 15px 0;">
<h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;"> <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
@@ -150,9 +151,9 @@
</h2> </h2>
</td> </td>
</tr> </tr>
</table> </table>
<table> <table>
<tr> <tr>
<td valign="top" style="width: 30%; margin: 0px; padding: 0 4px 8px 0; font-size: 12px; font-weight:600;"> <td valign="top" style="width: 30%; margin: 0px; padding: 0 4px 8px 0; font-size: 12px; font-weight:600;">
{{ trans('general.date') }}: {{ trans('general.date') }}:
@@ -196,9 +197,9 @@
{{ $transfer->expense_transaction->description }} {{ $transfer->expense_transaction->description }}
</td> </td>
</tr> </tr>
</table> </table>
<table style="text-align: right;"> <table style="text-align: right;">
<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;">
<table> <table>
@@ -214,4 +215,5 @@
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
</div>

22
resources/views/components/transfers/template/second.blade.php
View File

@@ -1,4 +1,5 @@
<table style="width: 100%;"> <div class="print-template">
<table style="width: 100%;">
<tr> <tr>
<td style="padding:0 0 15px 0;"> <td style="padding:0 0 15px 0;">
<h2 class="text-left" style="font-size: 14px; font-weight:600;"> <h2 class="text-left" style="font-size: 14px; font-weight:600;">
@@ -6,9 +7,9 @@
</h2> </h2>
</td> </td>
</tr> </tr>
</table> </table>
<table> <table>
<tr> <tr>
<td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;"> <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
{{ trans('general.date') }}: {{ trans('general.date') }}:
@@ -52,9 +53,9 @@
{{ $transfer->expense_transaction->description }} {{ $transfer->expense_transaction->description }}
</td> </td>
</tr> </tr>
</table> </table>
<table style="width: 100%; margin-top:35px;"> <table style="width: 100%; margin-top:35px;">
<tbody> <tbody>
<tr> <tr>
<td class="border-bottom-1 border-top-1" style="width: 60%; padding: 15px 0 15px 0;"> <td class="border-bottom-1 border-top-1" style="width: 60%; padding: 15px 0 15px 0;">
@@ -124,9 +125,9 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table style="width: 100%; margin-top:15px;"> <table style="width: 100%; margin-top:15px;">
<tbody> <tbody>
<tr> <tr>
<td style="width: 60%; padding: 0 0 15px 0;"> <td style="width: 60%; padding: 0 0 15px 0;">
@@ -196,9 +197,9 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table style="text-align: right;"> <table style="text-align: right;">
<tr> <tr>
<td valign="center" style="width:80%; display:block; float:right;"> <td valign="center" style="width:80%; display:block; float:right;">
<table> <table>
@@ -214,4 +215,5 @@
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
</div>

18
resources/views/components/transfers/template/third.blade.php
View File

@@ -1,4 +1,5 @@
<table class="border-bottom-1" style="width: 100%;"> <div class="print-template">
<table class="border-bottom-1" style="width: 100%;">
<tbody> <tbody>
<tr> <tr>
<td style="width: 50%; padding: 0 15px 15px 0;" valign="top"> <td style="width: 50%; padding: 0 15px 15px 0;" valign="top">
@@ -150,9 +151,9 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table style="width: 100%; margin-top:15px;"> <table style="width: 100%; margin-top:15px;">
<tr> <tr>
<td style="padding:0 0 15px 0;"> <td style="padding:0 0 15px 0;">
<h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;"> <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
@@ -160,9 +161,9 @@
</h2> </h2>
</td> </td>
</tr> </tr>
</table> </table>
<table> <table>
<tr> <tr>
<td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;"> <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
{{ trans('general.date') }}: {{ trans('general.date') }}:
@@ -206,9 +207,9 @@
{{ $transfer->expense_transaction->description }} {{ $transfer->expense_transaction->description }}
</td> </td>
</tr> </tr>
</table> </table>
<table style="text-align: right;"> <table style="text-align: right;">
<tr> <tr>
<td valign="center" style="width:80%; display:block; float:right;"> <td valign="center" style="width:80%; display:block; float:right;">
<table> <table>
@@ -224,4 +225,5 @@
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
</div>

2
resources/views/portal/invoices/index.blade.php
View File

@@ -117,7 +117,7 @@
<x-table.td class="w-3/12 sm:table-cell"> <x-table.td class="w-3/12 sm:table-cell">
@stack('document_number_td_inside_start') @stack('document_number_td_inside_start')
<x-slot name="first" class="relative w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class,data-tooltip-target,data-tooltip-placement"> <x-slot name="first" class="w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class,data-tooltip-target,data-tooltip-placement">
<span class="border-black border-b border-dashed"> <span class="border-black border-b border-dashed">
{{ $item->document_number }} {{ $item->document_number }}
</span> </span>

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

@@ -17,7 +17,6 @@
:document="$recurring_bill" :document="$recurring_bill"
hide-divider1 hide-divider1
hide-divider2 hide-divider2
hide-divider3
hide-divider4 hide-divider4
hide-email hide-email
hide-share hide-share
@@ -25,6 +24,7 @@
hide-print hide-print
hide-pdf hide-pdf
hide-cancel hide-cancel
hide-delete
/> />
</x-slot> </x-slot>

3
resources/views/sales/recurring_invoices/show.blade.php
View File

@@ -17,13 +17,14 @@
:document="$recurring_invoice" :document="$recurring_invoice"
hide-divider1 hide-divider1
hide-divider2 hide-divider2
hide-divider3 hide-divider4
hide-email hide-email
hide-share hide-share
hide-customize hide-customize
hide-print hide-print
hide-pdf hide-pdf
hide-cancel hide-cancel
hide-delete
/> />
</x-slot> </x-slot>