- | {{ Jalalian::fromCarbon(Carbon::parse($row->entered_at))->format('m/d') ?? '-' }} |
- {{ Jalalian::fromCarbon(Carbon::parse($row->entered_at))->format('%A') ?? '-' }} |
+ {{ \App\Support\JalaliHelper::format($row->entered_at, 'm/d') }} |
+ {{ \App\Support\JalaliHelper::format($row->entered_at, '%A') }} |
{{ Carbon::parse($row->entered_at)->format('H:i') ?? '-' }} |
{{ $row->exited_at ? Carbon::parse($row->exited_at)->format('H:i') : '-' }} |
{{ $row->duration ? Carbon::parse($row->duration)->format('H:i') : '-' }} |
diff --git a/resources/views/attendance/profile.blade.php b/resources/views/attendance/profile.blade.php
index 197b3acf..efee6deb 100755
--- a/resources/views/attendance/profile.blade.php
+++ b/resources/views/attendance/profile.blade.php
@@ -39,7 +39,7 @@
diff --git a/resources/views/attendance/show.blade.php b/resources/views/attendance/show.blade.php
index 839d3cb3..776a1c37 100755
--- a/resources/views/attendance/show.blade.php
+++ b/resources/views/attendance/show.blade.php
@@ -52,8 +52,8 @@ foreach ($data as $month => $attendances) {
@foreach($records as $row)
- | {{ Jalalian::fromCarbon(Carbon::parse($row->entered_at))->format('m/d') ?? '-' }} |
- {{ Jalalian::fromCarbon(Carbon::parse($row->entered_at))->format('%A') ?? '-' }} |
+ {{ \App\Support\JalaliHelper::format($row->entered_at, 'm/d') }} |
+ {{ \App\Support\JalaliHelper::format($row->entered_at, '%A') }} |
{{ Carbon::parse($row->entered_at)->format('H:i') ?? '-' }} |
{{ $row->exited_at ? Carbon::parse($row->exited_at)->format('H:i') : '-' }} |
{{ $row->exited_at ? Carbon::parse($row->duration)->format('H:i') : '-' }} |
diff --git a/resources/views/tasks/create.blade.php b/resources/views/tasks/create.blade.php
index 6d3df76c..3fbc5a37 100755
--- a/resources/views/tasks/create.blade.php
+++ b/resources/views/tasks/create.blade.php
@@ -246,12 +246,12 @@ if (isset($task)) {
// اگر مقدار اولیه از دیتابیس آمده، فیلد مخفی میلادی را هم پر کن
@if(!empty($task?->start_date))
- $('#start_date_gregorian').val(@json(\Carbon\Carbon::parse($task->start_date)->format('Y-m-d')));
- $('#start_date').val(@json(\Morilog\Jalali\Jalalian::fromCarbon(\Carbon\Carbon::parse($task->start_date))->format('Y/m/d')));
+ $('#start_date_gregorian').val(@json(\App\Support\JalaliHelper::toGregorianDate($task->start_date)));
+ $('#start_date').val(@json(\App\Support\JalaliHelper::format($task->start_date, 'Y/m/d', '')));
@endif
@if(!empty($task?->target_date))
- $('#target_date_gregorian').val(@json(\Carbon\Carbon::parse($task->target_date)->format('Y-m-d')));
- $('#target_date').val(@json(\Morilog\Jalali\Jalalian::fromCarbon(\Carbon\Carbon::parse($task->target_date))->format('Y/m/d')));
+ $('#target_date_gregorian').val(@json(\App\Support\JalaliHelper::toGregorianDate($task->target_date)));
+ $('#target_date').val(@json(\App\Support\JalaliHelper::format($task->target_date, 'Y/m/d', '')));
@endif
$('form').on('submit', function (e) {
diff --git a/resources/views/tasks/tasks.blade.php b/resources/views/tasks/tasks.blade.php
index 6867f693..c593f083 100755
--- a/resources/views/tasks/tasks.blade.php
+++ b/resources/views/tasks/tasks.blade.php
@@ -584,10 +584,10 @@ $state = [
مهلت
- {{ $task->target_date ? Jalalian::fromCarbon(Carbon::parse($task->target_date))->format('Y/m/d') : '-' }}
+ {{ \App\Support\JalaliHelper::format($task->target_date) }}
@endif