Merge branch 'master' of https://github.com/brkcvn/akaunting into page-title

This commit is contained in:
Burak Civan
2022-08-08 09:41:09 +03:00
66 changed files with 1184 additions and 355759 deletions

View File

@ -116,15 +116,27 @@
<x-show.summary.right>
@stack('summary_incoming_start')
<x-slot name="first" amount="{{ $summary_amounts['incoming_for_humans'] }}" title="{{ trans('accounts.incoming') }}" tooltip="{{ $summary_amounts['incoming_exact'] }}"></x-slot>
<x-slot name="first"
amount="{{ $summary_amounts['incoming_for_humans'] }}"
title="{{ trans('accounts.incoming') }}"
tooltip="{{ $summary_amounts['incoming_exact'] }}"
></x-slot>
@stack('summary_incoming_end')
@stack('summary_outgoing_start')
<x-slot name="second" amount="{{ $summary_amounts['outgoing_for_humans'] }}" title="{{ trans('accounts.outgoing') }}" tooltip="{{ $summary_amounts['outgoing_exact'] }}"></x-slot>
<x-slot name="second"
amount="{{ $summary_amounts['outgoing_for_humans'] }}"
title="{{ trans('accounts.outgoing') }}"
tooltip="{{ $summary_amounts['outgoing_exact'] }}"
></x-slot>
@stack('summary_outgoing_end')
@stack('summary_current_start')
<x-slot name="third" amount="{{ $summary_amounts['current_for_humans'] }}" title="{{ trans('accounts.current_balance') }}" tooltip="{{ $summary_amounts['current_exact'] }}"></x-slot>
<x-slot name="third"
amount="{{ $summary_amounts['current_for_humans'] }}"
title="{{ trans('accounts.current_balance') }}"
tooltip="{{ $summary_amounts['current_exact'] }}"
></x-slot>
@stack('summary_current_end')
</x-show.summary.right>
</x-show.summary>

View File

@ -20,14 +20,16 @@
<x-index.summary>
<x-slot name="first"
href="{{ route('reconciliations.index', ['search' => 'reconciled:1']) }}"
amount="{{ money($reconciliations->where('reconciled', 1)->sum('closing_balance'), setting('default.currency'), true) }}"
amount="{{ $summary_amounts['amount_for_humans'] }}"
title="{{ trans('reconciliations.reconciled_amount') }}"
tooltip="{{ $summary_amounts['amount_exact'] }}"
></x-slot>
<x-slot name="second"
href="{{ route('reconciliations.index', ['search' => 'reconciled:0']) }}"
amount="{{ money($reconciliations->where('reconciled', 0)->sum('closing_balance'), setting('default.currency'), true) }}"
amount="{{ $summary_amounts['in_progress_for_humans'] }}"
title="{{ trans('reconciliations.in_progress') }}"
tooltip="{{ $summary_amounts['in_progress_exact'] }}"
></x-slot>
</x-index.summary>

View File

@ -44,21 +44,24 @@
<x-index.summary>
<x-slot name="first"
href="{{ route('transactions.index', ['search' => 'type:income']) }}"
amount="{{ money($totals['income'], setting('default.currency'), true) }}"
amount="{{ $summary_amounts['incoming_for_humans'] }}"
title="{{ trans_choice('general.incomes', 1) }}"
tooltip="{{ $summary_amounts['incoming_exact'] }}"
divider="remove"
></x-slot>
<x-slot name="second"
href="{{ route('transactions.index', ['search' => 'type:expense']) }}"
amount="{{ money($totals['expense'], setting('default.currency'), true) }}"
amount="{{ $summary_amounts['expense_for_humans'] }}"
title="{{ trans_choice('general.expenses', 2) }}"
tooltip="{{ $summary_amounts['expense_exact'] }}"
divider="drag_handle"
></x-slot>
<x-slot name="third"
amount="{{ money($totals['profit'], setting('default.currency'), true) }}"
amount="{{ $summary_amounts['profit_for_humans'] }}"
title="{{ trans_choice('general.profits', 1) }}"
tooltip="{{ $summary_amounts['profit_exact'] }}"
class="cursor-default"
></x-slot>
</x-index.summary>

View File

@ -64,7 +64,7 @@
@endif
@if (! $hideLogo)
<x-form.group.file name="logo" label="{{ trans_choice('general.pictures', 1) }}" not-required />
<x-form.group.file name="logo" label="{{ trans_choice('general.pictures', 1) }}" :value="! empty($contact) ? $contact->logo : false" not-required />
@endif
</div>
</x-slot>

View File

@ -136,15 +136,15 @@
@stack('name_td_start')
@if (! $hideName)
<x-slot name="first" class="flex items-center font-medium">
@if ($showPicture)
@if (is_object($item->picture))
<img src="{{ Storage::url($item->picture->id) }}" class="absolute w-6 h-6 bottom-6 rounded-full mr-2 hidden lg:block" alt="{{ $item->name }}" title="{{ $item->name }}">
@if ($showLogo)
@if (is_object($item->logo))
<img src="{{ Storage::url($item->logo->id) }}" class="absolute w-6 h-6 bottom-6 rounded-full mr-2 hidden lg:block" alt="{{ $item->name }}" title="{{ $item->name }}">
@else
<img src="{{ asset('public/img/user.svg') }}" class="absolute w-6 h-6 bottom-6 rounded-full mr-2 hidden lg:block" alt="{{ $item->name }}"/>
@endif
@endif
<div class="truncate {{ $showPicture ? ' ltr:pl-8 rtl:pr-8' : '' }}">
<div class="truncate {{ $showLogo ? ' ltr:pl-8 rtl:pr-8' : '' }}">
{{ $item->name }}
</div>
@ -157,7 +157,7 @@
@stack('tax_number_td_start')
@if (! $hideTaxNumber)
<x-slot name="second" class="w-32 font-normal truncate {{ $showPicture ? ' ltr:pl-8 rtl:pr-8' : '' }}">
<x-slot name="second" class="w-32 font-normal truncate {{ $showLogo ? ' ltr:pl-8 rtl:pr-8' : '' }}">
{{ $item->tax_number }}
</x-slot>
@endif

View File

@ -30,19 +30,31 @@
<x-show.summary.right>
@stack('summary_overdue_start')
@if (! $hideOverdue)
<x-slot name="first" amount="{{ money($totals['overdue'], setting('default.currency'), true) }}" title="{{ trans('general.overdue') }}"></x-slot>
<x-slot name="first"
amount="{{ $summary_amounts['overdue_for_humans'] }}"
title="{{ trans('general.overdue') }}"
tooltip="{{ $summary_amounts['overdue_exact'] }}"
></x-slot>
@endif
@stack('summary_overdue_end')
@stack('summary_open_start')
@if (! $hideOpen)
<x-slot name="second" amount="{{ money($totals['open'], setting('default.currency'), true) }}" title="{{ trans('general.open') }}"></x-slot>
<x-slot name="second"
amount="{{ $summary_amounts['open_for_humans'] }}"
title="{{ trans('general.open') }}"
tooltip="{{ $summary_amounts['open_exact'] }}"
></x-slot>
@endif
@stack('summary_open_end')
@stack('summary_paid_start')
@if (! $hidePaid)
<x-slot name="third" amount="{{ money($totals['paid'], setting('default.currency'), true) }}" title="{{ trans('general.paid') }}"></x-slot>
<x-slot name="third"
amount="{{ $summary_amounts['paid_for_humans'] }}"
title="{{ trans('general.paid') }}"
tooltip="{{ $summary_amounts['paid_exact'] }}"
></x-slot>
@endif
@stack('summary_paid_end')
</x-show.summary.right>

View File

@ -86,7 +86,7 @@
<div class="invoice-classic-inline-frame text-center" style="border: 1px solid {{ $backgroundColor }}">
@stack('invoice_number_input_start')
@if (! $hideDocumentNumber)
<div class="text small-text text-semibold mt-classic">
<div class="text small-text font-semibold mt-classic">
<span>
{{ trans($textDocumentNumber) }}:
</span>
@ -111,7 +111,7 @@
<div class="col-60">
<div class="text p-index-left">
@if (! $hideContactInfo)
<p class="text-semibold mb-0">
<p class="font-semibold mb-0">
{{ trans($textContactInfo) }}
</p>
@endif
@ -173,7 +173,7 @@
@if (! $hideOrderNumber)
@if ($document->order_number)
<p class="mb-0">
<span class="text-semibold spacing">
<span class="font-semibold spacing">
{{ trans($textOrderNumber) }}:
</span>
@ -188,7 +188,7 @@
@stack('issued_at_input_start')
@if (! $hideIssuedAt)
<p class="mb-0">
<span class="text-semibold spacing">
<span class="font-semibold spacing">
{{ trans($textIssuedAt) }}:
</span>
@ -202,7 +202,7 @@
@stack('due_at_input_start')
@if (! $hideDueAt)
<p class="mb-0">
<span class="text-semibold spacing">
<span class="font-semibold spacing">
{{ trans($textDueAt) }}:
</span>
@ -216,7 +216,7 @@
@foreach ($document->totals_sorted as $total)
@if ($total->code == 'total')
<p class="mb-0">
<span class="text-semibold spacing">
<span class="font-semibold spacing">
{{ trans($total->name) }}:
</span>
@ -239,7 +239,7 @@
<tr>
@stack('name_th_start')
@if (! $hideItems || (! $hideName && ! $hideDescription))
<th class="item text text-semibold text-alignment-left text-left">
<th class="item text font-semibold text-alignment-left text-left">
{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
</th>
@endif
@ -247,7 +247,7 @@
@stack('quantity_th_start')
@if (! $hideQuantity)
<th class="quantity text text-semibold text-alignment-right text-right">
<th class="quantity text font-semibold text-alignment-right text-right">
{{ trans($textQuantity) }}
</th>
@endif
@ -255,7 +255,7 @@
@stack('price_th_start')
@if (! $hidePrice)
<th class="price text text-semibold text-alignment-right text-right">
<th class="price text font-semibold text-alignment-right text-right">
{{ trans($textPrice) }}
</th>
@endif
@ -264,7 +264,7 @@
@if (! $hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-alignment-right text-right">
<th class="discount text font-semibold text-alignment-right text-right">
{{ trans('invoices.discount') }}
</th>
@stack('discount_td_end')
@ -273,7 +273,7 @@
@stack('total_th_start')
@if (! $hideAmount)
<th class="total text text-semibold text-alignment-right text-right">
<th class="total text font-semibold text-alignment-right text-right">
{{ trans($textAmount) }}
</th>
@endif
@ -333,7 +333,7 @@
@if ($total->code != 'total')
@stack($total->code . '_total_tr_start')
<div class="text border-bottom-dashed py-1">
<strong class="float-left text-semibold">
<strong class="float-left font-semibold">
{{ trans($total->title) }}:
</strong>
@ -346,7 +346,7 @@
@if ($document->paid)
@stack('paid_total_tr_start')
<div class="text border-bottom-dashed py-1">
<span class="float-left text-semibold">
<span class="float-left font-semibold">
{{ trans('invoices.paid') }}:
</span>
@ -359,7 +359,7 @@
@stack('grand_total_tr_start')
<div class="text border-bottom-dashed py-1">
<span class="float-left text-semibold">
<span class="float-left font-semibold">
{{ trans($total->name) }}:
</span>

View File

@ -76,7 +76,7 @@
<div class="col-60">
<div class="text p-index-left">
@if (! $hideContactInfo)
<p class="text-semibold mb-0">{{ trans($textContactInfo) }}</p>
<p class="font-semibold mb-0">{{ trans($textContactInfo) }}</p>
@endif
@stack('name_input_start')
@ -200,7 +200,7 @@
<tr>
@stack('name_th_start')
@if (! $hideItems || (! $hideName && ! $hideDescription))
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">
<th class="item text font-semibold text-alignment-left text-left text-white border-radius-first">
{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
</th>
@endif
@ -208,7 +208,7 @@
@stack('quantity_th_start')
@if (! $hideQuantity)
<th class="quantity text text-semibold text-alignment-right text-right text-white">
<th class="quantity text font-semibold text-alignment-right text-right text-white">
{{ trans($textQuantity) }}
</th>
@endif
@ -216,7 +216,7 @@
@stack('price_th_start')
@if (! $hidePrice)
<th class="price text text-semibold text-alignment-right text-right text-white">
<th class="price text font-semibold text-alignment-right text-right text-white">
{{ trans($textPrice) }}
</th>
@endif
@ -225,7 +225,7 @@
@if (! $hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-alignment-right text-right text-white">
<th class="discount text font-semibold text-alignment-right text-right text-white">
{{ trans('invoices.discount') }}
</th>
@stack('discount_td_end')
@ -234,7 +234,7 @@
@stack('total_th_start')
@if (! $hideAmount)
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">
<th class="total text font-semibold text-white text-alignment-right text-right border-radius-last">
{{ trans($textAmount) }}
</th>
@endif
@ -277,7 +277,7 @@
<div class="text p-index-left">
@stack('notes_input_start')
@if ($document->notes)
<p class="text-semibold">
<p class="font-semibold">
{{ trans_choice('general.notes', 2) }}
</p>
@ -292,7 +292,7 @@
@if ($total->code != 'total')
@stack($total->code . '_total_tr_start')
<div class="text border-bottom-1 py-1">
<span class="float-left text-semibold">
<span class="float-left font-semibold">
{{ trans($total->title) }}:
</span>
@ -305,7 +305,7 @@
@if ($document->paid)
@stack('paid_total_tr_start')
<div class="text border-bottom-1 py-1">
<span class="float-left text-semibold">
<span class="float-left font-semibold">
{{ trans('invoices.paid') }}:
</span>
@ -318,7 +318,7 @@
@stack('grand_total_tr_start')
<div class="text border-bottom-1 py-1">
<span class="float-left text-semibold">
<span class="float-left font-semibold">
{{ trans($total->name) }}:
</span>

View File

@ -9,7 +9,7 @@
@if (! $hideDescription)
@if (! empty($item->description))
<span class="small-text">
{!! \Illuminate\Support\Str::limit($item->description, 500) !!}
{!! \Illuminate\Support\Str::limit(nl2br($item->description), 500) !!}
</span>
@endif
@endif

View File

@ -82,7 +82,7 @@
<div class="col-50">
<div class="text p-modern">
@if (! $hideContactInfo)
<p class="text-semibold mb-0">
<p class="font-semibold mb-0">
{{ trans($textContactInfo) }}
</p>
@endif
@ -145,7 +145,7 @@
@if (! $hideOrderNumber)
@if ($document->order_number)
<p class="mb-0">
<span class="text-semibold spacing">
<span class="font-semibold spacing">
{{ trans($textOrderNumber) }}:
</span>
@ -160,7 +160,7 @@
@stack('invoice_number_input_start')
@if (! $hideDocumentNumber)
<p class="mb-0">
<span class="text-semibold spacing">
<span class="font-semibold spacing">
{{ trans($textDocumentNumber) }}:
</span>
@ -174,7 +174,7 @@
@stack('issued_at_input_start')
@if (! $hideIssuedAt)
<p class="mb-0">
<span class="text-semibold spacing">
<span class="font-semibold spacing">
{{ trans($textIssuedAt) }}:
</span>
@ -188,7 +188,7 @@
@stack('due_at_input_start')
@if (! $hideDueAt)
<p class="mb-0">
<span class="text-semibold spacing">
<span class="font-semibold spacing">
{{ trans($textDueAt) }}:
</span>
@ -211,7 +211,7 @@
<tr>
@stack('name_th_start')
@if (! $hideItems || (! $hideName && ! $hideDescription))
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">
<th class="item text font-semibold text-alignment-left text-left text-white border-radius-first">
{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
</th>
@endif
@ -219,7 +219,7 @@
@stack('quantity_th_start')
@if (! $hideQuantity)
<th class="quantity text text-semibold text-white text-alignment-right text-right">
<th class="quantity text font-semibold text-white text-alignment-right text-right">
{{ trans($textQuantity) }}
</th>
@endif
@ -227,7 +227,7 @@
@stack('price_th_start')
@if (! $hidePrice)
<th class="price text text-semibold text-white text-alignment-right text-right">
<th class="price text font-semibold text-white text-alignment-right text-right">
{{ trans($textPrice) }}
</th>
@endif
@ -236,7 +236,7 @@
@if (! $hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<th class="discount text text-semibold text-white text-alignment-right text-right">
<th class="discount text font-semibold text-white text-alignment-right text-right">
{{ trans('invoices.discount') }}
</th>
@stack('discount_td_end')
@ -245,7 +245,7 @@
@stack('total_th_start')
@if (! $hideAmount)
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">
<th class="total text font-semibold text-white text-alignment-right text-right border-radius-last">
{{ trans($textAmount) }}
</th>
@endif
@ -288,7 +288,7 @@
<div class="text p-index-right p-modern">
@stack('notes_input_start')
@if ($document->notes)
<p class="text-semibold">
<p class="font-semibold">
{{ trans_choice('general.notes', 2) }}
</p>
@ -303,7 +303,7 @@
@if ($total->code != 'total')
@stack($total->code . '_total_tr_start')
<div class="text">
<span class="float-left text-semibold">
<span class="float-left font-semibold">
{{ trans($total->title) }}:
</span>
@ -316,7 +316,7 @@
@if ($document->paid)
@stack('paid_total_tr_start')
<div class="text">
<span class="float-left text-semibold">
<span class="float-left font-semibold">
{{ trans('invoices.paid') }}:
</span>
@ -329,7 +329,7 @@
@stack('grand_total_tr_start')
<div class="text">
<span class="float-left text-semibold">
<span class="float-left font-semibold">
{{ trans($total->name) }}:
</span>

View File

@ -4,7 +4,7 @@
</h2>
@if (! empty($description))
<span class="text-sm font-light text-black">
<span class="text-sm font-light text-black flex gap-x-1 mt-1">
{!! $description !!}
</span>
@endif

View File

@ -0,0 +1,81 @@
@if ((! $attributes->has('withoutRemote') && ! $attributes->has('without-remote')) && (! $attributes->has('withoutAddNew') && ! $attributes->has('without-add-new')))
<x-form.group.select
remote
remote_action="{{ $remoteAction }}"
add-new
path="{{ $path }}"
name="{{ $name }}"
label="{!! trans_choice('general.taxes', 1) !!}"
:options="$taxes"
:selected="$selected"
sort-options="false"
:multiple="$multiple"
:group="$group"
form-group-class="{{ $formGroupClass }}"
:required="$required"
:readonly="$readonly"
:disabled="$disabled"
{{ $attributes }}
/>
@elseif (($attributes->has('withoutRemote') && $attributes->has('without-remote')) && (! $attributes->has('withoutAddNew') && ! $attributes->has('without-add-new')))
<x-form.group.select
add-new
path="{{ $path }}"
name="{{ $name }}"
label="{!! trans_choice('general.taxes', 1) !!}"
:options="$taxes"
:selected="$selected"
sort-options="false"
:multiple="$multiple"
:group="$group"
form-group-class="{{ $formGroupClass }}"
:required="$required"
:readonly="$readonly"
:disabled="$disabled"
{{ $attributes }}
/>
@elseif ((! $attributes->has('withoutRemote') && ! $attributes->has('without-remote')) && ($attributes->has('withoutAddNew') && $attributes->has('without-add-new')))
<x-form.group.select
remote
remote_action="{{ $remoteAction }}"
name="{{ $name }}"
label="{!! trans_choice('general.taxes', 1) !!}"
:options="$taxes"
:selected="$selected"
sort-options="false"
:multiple="$multiple"
:group="$group"
form-group-class="{{ $formGroupClass }}"
:required="$required"
:readonly="$readonly"
:disabled="$disabled"
{{ $attributes }}
/>
@else
<x-form.group.select
name="{{ $name }}"
label="{!! trans_choice('general.taxes', 1) !!}"
:options="$taxes"
:selected="$selected"
sort-options="false"
:multiple="$multiple"
:group="$group"
form-group-class="{{ $formGroupClass }}"
:required="$required"
:readonly="$readonly"
:disabled="$disabled"
{{ $attributes }}
/>
@endif

View File

@ -4,7 +4,7 @@
</h2>
@if (!empty($description))
<span class="text-sm font-light text-black">
<span class="text-sm font-light text-black flex gap-x-1 mt-1">
{!! $description !!}
</span>
@endif

View File

@ -5,7 +5,7 @@
@foreach ($items as $item)
<div @class(['w-1/2 sm:w-1/3 text-center'])>
@if (! empty($item['tooltip']))
<x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
<x-tooltip id="tooltip-summary-{{ $loop->index }}" placement="top" message="{!! $item['tooltip'] !!}">
<a href="{{ $item['href'] }}" class="group">
@php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>

View File

@ -3,7 +3,7 @@
<div class="w-full lg:w-6/12 lg:ltr:pl-24 lg:rtl:pr-24">
<div class="relative mb-10" x-data="{ toggle: 'donut' }">
<div class="flex border-b pb-2">
<div class="w-full lg:w-11/12 text-xl text-left text-black-400">
<div class="w-full lg:w-11/12 ltr:text-xl rtl:text-right text-left text-black-400">
<h2 x-show="toggle === 'donut'">{{ trans('general.timeline') }}</h2>
<h2 x-show="toggle === 'bar'">{{ trans('general.distribution') }}</h2>
</div>

View File

@ -6,7 +6,7 @@
</h2>
@if (! empty($description))
<span class="text-sm font-light text-black">
<span class="text-sm font-light text-black flex gap-x-1 mt-1">
{!! $description !!}
</span>
@endif

View File

@ -5,7 +5,7 @@
@foreach ($items as $item)
<div @class(['w-1/2 sm:w-1/3 text-center'])>
@if (! empty($item['tooltip']))
<x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
<x-tooltip id="tooltip-summary-{{ $loop->index }}" placement="top" message="{!! $item['tooltip'] !!}">
<a href="{{ $item['href'] }}" class="group">
@php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>

View File

@ -11,7 +11,7 @@
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
{{ trans('transactions.slider.attachments') }}
</div>

View File

@ -8,7 +8,7 @@
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
{!! trans('transactions.slider.children', ['count' => $transaction->children()->count()]) !!}
</div>

View File

@ -10,7 +10,7 @@
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
@if ($transaction->isRecurringTransaction())
{!! trans('transactions.slider.create_recurring', ['user' => $transaction->owner->name, 'date' => $created_date]) !!}
@else

View File

@ -13,7 +13,7 @@
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
{!! trans('transactions.slider.schedule', ['frequency' => $frequency, 'interval' => $transaction->recurring->interval, 'date' => $started_date]) !!}
</div>

View File

@ -18,7 +18,7 @@
</span>
@if ($transfer)
<div class="text-black-400 text-sm">
<div class="text-black-400 text-sm flex gap-x-1 mt-1">
{!! trans('transactions.slider.transfer_headline', ['from_account' => $from_account, 'to_account' => $to_account]) !!}
</div>
@endif

View File

@ -19,9 +19,9 @@
<td class="text" style="width: 80%; padding: 0 0 15px 0;">
@stack('company_details_start')
@if (! $hideCompanyName)
<h2 class="text-semibold text">
<span class="font-semibold text">
{{ setting('company.name') }}
</h2>
</span>
@endif
@if (! $hideCompanyAddress)
@ -368,11 +368,8 @@
<td valign="center" style="width:80%; display:block; float:right; background-color: #55588B; -webkit-print-color-adjust: exact; color:#ffffff; border-radius: 5px;">
<table>
<tr>
<td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
{{ trans($textAmount) }}
</td>
<td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
<td valign="center" style="font-size: 14px; color: #ffffff; padding: 0;">
<span class="ml-2" style="font-weight: 600;">{{ trans($textAmount) }}</span>
@money($transaction->amount, $transaction->currency_code, true)
</td>
</tr>

View File

@ -16,7 +16,7 @@
</x-slot>
<x-slot name="content">
<x-contacts.index.content type="vendor" :contacts="$vendors" show-picture />
<x-contacts.index.content type="vendor" :contacts="$vendors" show-logo />
</x-slot>
<x-contacts.script type="vendor" />