Compare commits

...
2 Commits
Author SHA1 Message Date
MahdiandCursor 49c9a45e82 Remove unused Jalalian import from TaskController.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 18:05:02 +03:30
MahdiandCursor 54e995dadd Fix Jalali crash when creating task with invalid target_date.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 18:04:19 +03:30
+13 -7
View File
@@ -15,7 +15,6 @@ use GuzzleHttp\Client;
use App\Models\Tasks;
use App\Models\User;
use Carbon\Carbon;
use Morilog\Jalali\Jalalian;
use Carbon\CarbonInterval;
@@ -265,12 +264,18 @@ class TaskController extends Controller
return null;
}
if (preg_match('/^(\d{4}-\d{2}-\d{2})/', $value, $m)) {
return $m[1];
}
try {
return Carbon::parse($value)->format('Y-m-d');
if (preg_match('/^(\d{4}-\d{2}-\d{2})/', $value, $m)) {
$carbon = Carbon::createFromFormat('Y-m-d', $m[1])->startOfDay();
} else {
$carbon = Carbon::parse($value);
}
if ($carbon->year < 1621 || $carbon->year > 2500) {
return null;
}
return $carbon->format('Y-m-d');
} catch (\Throwable $e) {
return null;
}
@@ -711,7 +716,8 @@ class TaskController extends Controller
$task = Tasks::create($data);
$message = "تسک جدیدی با عنوان {$data['title']} برای شما ایجاد شد.";
$deadline = !empty($data['target_date']) ? Jalalian::fromCarbon(Carbon::parse($data['target_date']))->format('Y-m-d') : null;
$deadline = \App\Support\JalaliHelper::format($data['target_date'] ?? null, 'Y/m/d', '');
$deadline = $deadline !== '' ? $deadline : null;
$app = App::find($data['app']);
$message_admin = "ایجاد تسک: «{$data['title']}»";
$message_admin .= !empty($app) ? "\nاپ {$app->name_fa}" : null;