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

Browse Source
This commit is contained in:
Burak Civan 2022-11-22 16:45:55 +03:00
commit 2ef1112a9e
10 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exceptions/Trackers/Bugsnag.php
View File

@ -13,7 +13,7 @@ class Bugsnag
{ {
app('bugsnag')->setAppVersion(version('short')); app('bugsnag')->setAppVersion(version('short'));
$tags = self::getTrackerTags(); $tags = static::getTrackerTags();
app('bugsnag')->registerCallback(function ($report) use($tags) { app('bugsnag')->registerCallback(function ($report) use($tags) {
$report->setMetaData([ $report->setMetaData([

2
app/Exceptions/Trackers/Sentry.php
View File

@ -16,7 +16,7 @@ class Sentry
{ {
$event->setRelease(version('short')); $event->setRelease(version('short'));
$tags = self::getTrackerTags(); $tags = static::getTrackerTags();
$event->setTags($tags); $event->setTags($tags);

2
app/Traits/Trackers.php
View File

@ -6,7 +6,7 @@ use Illuminate\Support\Str;
trait Trackers trait Trackers
{ {
public function getTrackerTags(): array public static function getTrackerTags(): array
{ {
return [ return [
'company_id' => (string) company_id(), 'company_id' => (string) company_id(),

4
app/View/Components/Script/Exceptions/Trackers.php
View File

@ -87,7 +87,7 @@ class Trackers extends Component
return $tags; return $tags;
} }
return $this->getTrackerTags(); return static::getTrackerTags();
} }
public function getParams($params) public function getParams($params)
@ -105,7 +105,7 @@ class Trackers extends Component
case 'sentry': case 'sentry':
$params = [ $params = [
'release' => version('short'), 'release' => version('short'),
'traces_sample_rate' => $this->sentryTracesSampleRate(), 'traces_sample_rate' => static::sentryTracesSampleRate(),
]; ];
break; break;
} }

4
resources/views/components/form/group/invoice_text.blade.php
View File

@ -156,8 +156,8 @@
@if (! empty($remote)) @if (! empty($remote))
remote-action="{{ $attributes['remote_action'] }}" remote-action="{{ $attributes['remote_action'] }}"
@if (! empty($attributes['currecny_code'])) @if (! empty($attributes['currency_code']))
currency-code="{{ $attributes['currecny_code'] }}" currency-code="{{ $attributes['currency_code'] }}"
@endif @endif
@endif @endif

4
resources/views/components/form/group/select.blade.php
View File

@ -174,8 +174,8 @@
@if (! empty($remote)) @if (! empty($remote))
remote-action="{{ $attributes['remote_action'] }}" remote-action="{{ $attributes['remote_action'] }}"
@if (! empty($attributes['currecny_code'])) @if (! empty($attributes['currency_code']))
currency-code="{{ $attributes['currecny_code'] }}" currency-code="{{ $attributes['currency_code'] }}"
@endif @endif
@endif @endif

4
resources/views/components/form/input/select.blade.php
View File

@ -160,8 +160,8 @@
@if (! empty($remote)) @if (! empty($remote))
remote-action="{{ $attributes['remote_action'] }}" remote-action="{{ $attributes['remote_action'] }}"
@if (! empty($attributes['currecny_code'])) @if (! empty($attributes['currency_code']))
currency-code="{{ $attributes['currecny_code'] }}" currency-code="{{ $attributes['currency_code'] }}"
@endif @endif
@endif @endif

6
resources/views/portal/invoices/preview.blade.php
View File

@ -20,7 +20,7 @@
</x-slot> </x-slot>
<x-slot name="content"> <x-slot name="content">
<div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0"> <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-4 lg:space-y-0">
<div class="w-full lg:w-5/12"> <div class="w-full lg:w-5/12">
@if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled'])) @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
<div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@ -80,7 +80,7 @@
not-required not-required
form-group-class="invisible" form-group-class="invisible"
placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}" placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')" change="onChangePaymentMethodSigned"
/> />
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" /> <x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
@ -128,7 +128,7 @@
@endif @endif
</div> </div>
<div class="hidden lg:block w-7/12"> <div class="w-full lg:w-7/12">
<x-documents.show.template <x-documents.show.template
type="invoice" type="invoice"
:document="$invoice" :document="$invoice"

8
resources/views/portal/invoices/show.blade.php
View File

@ -18,7 +18,7 @@
</x-slot> </x-slot>
<x-slot name="content"> <x-slot name="content">
<div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0"> <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-4 lg:space-y-0">
<div class="w-full lg:w-5/12"> <div class="w-full lg:w-5/12">
@if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled'])) @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
<div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@ -31,7 +31,7 @@
@stack('invoice_{{ $key }}_tab_start') @stack('invoice_{{ $key }}_tab_start')
<div <div
x-on:click="active = '{{ $name }}'" x-on:click="active = '{{ $name }}'"
@click="onChangePaymentMethodSigned('{{ $key }}')" @click="onChangePaymentMethod('{{ $key }}')"
id="tabs-payment-method-{{ $key }}-tab" id="tabs-payment-method-{{ $key }}-tab"
x-bind:class="active != '{{ $name }}' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'" x-bind:class="active != '{{ $name }}' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link {{ count($payment_methods) > 3 ? 'swiper-slide': '' }}" class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link {{ count($payment_methods) > 3 ? 'swiper-slide': '' }}"
@ -78,7 +78,7 @@
not-required not-required
form-group-class="invisible" form-group-class="invisible"
placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}" placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')" change="onChangePaymentMethod"
/> />
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" /> <x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
@ -126,7 +126,7 @@
@endif @endif
</div> </div>
<div class="hidden lg:block w-7/12"> <div class="w-full lg:w-7/12">
<x-documents.show.template <x-documents.show.template
type="invoice" type="invoice"
:document="$invoice" :document="$invoice"

6
resources/views/portal/invoices/signed.blade.php
View File

@ -27,7 +27,7 @@
</x-slot> </x-slot>
<x-slot name="content"> <x-slot name="content">
<div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0"> <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-4 lg:space-y-0">
<div class="w-full lg:w-5/12"> <div class="w-full lg:w-5/12">
@if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled'])) @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
<div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@ -87,7 +87,7 @@
not-required not-required
form-group-class="invisible" form-group-class="invisible"
placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}" placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')" change="onChangePaymentMethodSigned"
/> />
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" /> <x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
@ -135,7 +135,7 @@
@endif @endif
</div> </div>
<div class="hidden lg:block w-7/12"> <div class="w-full lg:w-7/12">
<x-documents.show.template <x-documents.show.template
type="invoice" type="invoice"
:document="$invoice" :document="$invoice"