From e678e5e543c66ee904c13b7a9ddd1417b3f43266 Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:24:22 +0100 Subject: [PATCH 01/15] Update create.blade.php Add company date-format --- resources/views/banking/reconciliations/create.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php index 1e170db8f..7b148a1ff 100644 --- a/resources/views/banking/reconciliations/create.blade.php +++ b/resources/views/banking/reconciliations/create.blade.php @@ -16,9 +16,9 @@
- {{ Form::dateGroup('started_at', trans('reconciliations.start_date'), 'calendar', ['id' => 'started_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('started_at', Date::now()->firstOfMonth()->toDateString()), 'col-xl-3') }} + {{ Form::dateGroup('started_at', trans('reconciliations.start_date'), 'calendar', ['id' => 'started_at', 'class' => 'form-control datepicker', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('started_at', Date::now()->firstOfMonth()->toDateString()), 'col-xl-3') }} - {{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at', Date::now()->endOfMonth()->toDateString()), 'col-xl-3') }} + {{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at', Date::now()->endOfMonth()->toDateString()), 'col-xl-3') }} {{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency', 'input' => 'onCalculate'], request('closing_balance', 0.00), 'col-xl-2') }} From b49a92541c302b0f1b22bf01fe34f281488b9ea9 Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:26:24 +0100 Subject: [PATCH 02/15] Update create.blade.php Add company date-format --- resources/views/banking/transfers/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php index 3a01d0f3c..bee9f75b2 100644 --- a/resources/views/banking/transfers/create.blade.php +++ b/resources/views/banking/transfers/create.blade.php @@ -23,7 +23,7 @@ {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0) }} - {{ Form::dateGroup('transferred_at', trans('general.date'), 'calendar', ['id' => 'transferred_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }} + {{ Form::dateGroup('transferred_at', trans('general.date'), 'calendar', ['id' => 'transferred_at', 'class' => 'form-control datepicker', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }} {{ Form::textareaGroup('description', trans('general.description')) }} From 3fa69e5ef6abb64977dda084fef2c5c5c2851a7a Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:26:54 +0100 Subject: [PATCH 03/15] Update edit.blade.php Add company date-format --- resources/views/banking/transfers/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php index 722f762a1..96250b9a4 100644 --- a/resources/views/banking/transfers/edit.blade.php +++ b/resources/views/banking/transfers/edit.blade.php @@ -24,7 +24,7 @@ {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], $transfer->amount) }} - {{ Form::dateGroup('transferred_at', trans('general.date'), 'calendar', ['id' => 'transferred_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($transfer->transferred_at)->toDateString()) }} + {{ Form::dateGroup('transferred_at', trans('general.date'), 'calendar', ['id' => 'transferred_at', 'class' => 'form-control datepicker', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($transfer->transferred_at)->toDateString()) }} {{ Form::textareaGroup('description', trans('general.description')) }} From 790b9277dbe080f8897ccb3d48b95fb7a58118dc Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:27:50 +0100 Subject: [PATCH 04/15] Update create.blade.php Add company daate-format --- resources/views/sales/revenues/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php index 59c839319..4952d8e39 100644 --- a/resources/views/sales/revenues/create.blade.php +++ b/resources/views/sales/revenues/create.blade.php @@ -17,7 +17,7 @@
- {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request()->get('paid_at', Date::now()->toDateString())) }} + {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request()->get('paid_at', Date::now()->toDateString())) }} {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', '1', ['id' => 'currency_rate']) !!} From aab139b15a8e136549a7f358fc98f80b698995bb Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:28:15 +0100 Subject: [PATCH 05/15] Update edit.blade.php Add company date-format --- resources/views/sales/revenues/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/sales/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php index 02f5c2ec9..7d3fcee21 100644 --- a/resources/views/sales/revenues/edit.blade.php +++ b/resources/views/sales/revenues/edit.blade.php @@ -36,7 +36,7 @@
- {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($revenue->paid_at)->toDateString()) }} + {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($revenue->paid_at)->toDateString()) }} {!! Form::hidden('currency_code', $revenue->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!} From e08e8b9b606c0a76be353fabdbecf8352e6293a6 Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:28:53 +0100 Subject: [PATCH 06/15] Update create.blade.php Add company date-format --- resources/views/purchases/payments/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php index 7744147f4..bf4c7e78a 100644 --- a/resources/views/purchases/payments/create.blade.php +++ b/resources/views/purchases/payments/create.blade.php @@ -17,7 +17,7 @@
- {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request()->get('paid_at', Date::now()->toDateString())) }} + {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request()->get('paid_at', Date::now()->toDateString())) }} {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', '1', ['id' => 'currency_rate']) !!} From 92bf17ace1871f20f4757ced4a9373cb63045acd Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:29:21 +0100 Subject: [PATCH 07/15] Update edit.blade.php Add company date-format --- resources/views/purchases/payments/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/purchases/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php index b4b3fca8e..a8ffbe9d2 100644 --- a/resources/views/purchases/payments/edit.blade.php +++ b/resources/views/purchases/payments/edit.blade.php @@ -36,7 +36,7 @@
- {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($payment->paid_at)->toDateString()) }} + {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($payment->paid_at)->toDateString()) }} {!! Form::hidden('currency_code', $payment->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!} From df4bbfa056cb2f02f87cd5012ea2cd75b12af40c Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:31:44 +0100 Subject: [PATCH 08/15] Update helpers.php Add company date-format --- app/Utilities/helpers.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/Utilities/helpers.php b/app/Utilities/helpers.php index 9656aacea..3cbf6a166 100644 --- a/app/Utilities/helpers.php +++ b/app/Utilities/helpers.php @@ -23,6 +23,22 @@ if (!function_exists('user')) { } } +if (!function_exists('company_date_format')) { + /** + * Format the given date based on company settings. + * + * @return string + */ + function company_date_format() + { + $date_time = new class() { + use DateTime; + }; + + return $date_time->getCompanyDateFormat(); + } +} + if (!function_exists('company_date')) { /** * Format the given date based on company settings. From 711df9fe6a7e06ceaa1f2c654a4efe298f53b7e7 Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:33:19 +0100 Subject: [PATCH 09/15] Update metadata.blade.php Add company date-format --- resources/views/components/documents/form/metadata.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/components/documents/form/metadata.blade.php b/resources/views/components/documents/form/metadata.blade.php index be7e1a753..b8f548fb1 100644 --- a/resources/views/components/documents/form/metadata.blade.php +++ b/resources/views/components/documents/form/metadata.blade.php @@ -22,7 +22,7 @@
@if (!$hideIssuedAt) - {{ Form::dateGroup('issued_at', trans($textIssuedAt), 'calendar', ['id' => 'issued_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $issuedAt) }} + {{ Form::dateGroup('issued_at', trans($textIssuedAt), 'calendar', ['id' => 'issued_at', 'class' => 'form-control datepicker', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $issuedAt) }} @endif @if (!$hideDocumentNumber) @@ -30,7 +30,7 @@ @endif @if (!$hideDueAt) - {{ Form::dateGroup('due_at', trans($textDueAt), 'calendar', ['id' => 'due_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $dueAt) }} + {{ Form::dateGroup('due_at', trans($textDueAt), 'calendar', ['id' => 'due_at', 'class' => 'form-control datepicker', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $dueAt) }} @else {{ Form::hidden('due_at', old('issued_at', $issuedAt), ['id' => 'due_at', 'v-model' => 'form.issued_at']) }} @endif From 2021a6a5e25d6d3da468c96cf31f9dde358504c2 Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 17:51:06 +0100 Subject: [PATCH 10/15] Update search-string.blade.php Add company date-format --- resources/views/components/search-string.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/components/search-string.blade.php b/resources/views/components/search-string.blade.php index 026e0b003..b5399955c 100644 --- a/resources/views/components/search-string.blade.php +++ b/resources/views/components/search-string.blade.php @@ -10,8 +10,8 @@ :date-config="{ allowInput: true, altInput: true, - altFormat: 'Y-m-d', - dateFormat: 'Y-m-d', + altFormat: '{{ company_date_format() }}', + dateFormat: '{{ company_date_format() }}', @if (!empty($attributes['min-date'])) minDate: {{ $attributes['min-date'] }} @endif From 489e954d84f85da763a4587c83adccba99435afa Mon Sep 17 00:00:00 2001 From: Steven Brauer Date: Sun, 31 Jan 2021 19:56:17 +0100 Subject: [PATCH 11/15] Update AkauntingDate.vue add parameters locale, default = en / German = de --- resources/assets/js/components/AkauntingDate.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue index d7d94e1ef..54e779e85 100644 --- a/resources/assets/js/components/AkauntingDate.vue +++ b/resources/assets/js/components/AkauntingDate.vue @@ -27,6 +27,8 @@