From 1f2327c2d9cb2b07f3f07cf7e00d933d6e1fa350 Mon Sep 17 00:00:00 2001 From: husanjon Date: Thu, 9 Apr 2026 11:04:24 +0500 Subject: [PATCH] login va registerda sms eskizga otgkazildi --- app/Http/Controllers/AutoController.php | 23 +++++++++++++++++------ app/Http/Controllers/EstateController.php | 19 +++++++++++++++---- resources/views/auto/edit.blade.php | 6 +++--- resources/views/estate/edit.blade.php | 4 ++-- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/AutoController.php b/app/Http/Controllers/AutoController.php index 418b39d..3f54af0 100644 --- a/app/Http/Controllers/AutoController.php +++ b/app/Http/Controllers/AutoController.php @@ -6,9 +6,20 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use App\Http\Controllers\QrController; use setasign\Fpdi\Fpdi; +use Carbon\Carbon; class AutoController extends Controller { + private function parseDate(?string $date): ?string + { + if (!$date) return null; + try { + return Carbon::createFromFormat('d.m.Y', $date)->format('Y-m-d'); + } catch (\Exception $e) { + return $date; + } + } + private function ordersQuery() { return DB::table('auto_orders as o') @@ -116,18 +127,18 @@ class AutoController extends Controller 'car_category' => $request->car_category, 'car_mark' => $request->car_mark, 'color' => $request->color, - 'made_date' => $request->made_date, + 'made_date' => $this->parseDate($request->made_date), 'body' => $request->body, 'engine' => $request->engine, 'car_number' => $request->car_number, 'type' => $request->type, 'shassi' => $request->shassi, 'tech_passport' => $request->tech_passport, - 'tech_given_date' => $request->tech_given_date, + 'tech_given_date' => $this->parseDate($request->tech_given_date), 'tech_given_whom' => $request->tech_given_whom, 'cost' => (int)str_replace(',', '', $request->cost ?? 0), 'note' => $request->note, - 'created_at' => $request->created_at ?? now(), + 'created_at' => $this->parseDate($request->created_at) ?? now(), 'updated_at' => now(), ]); QrController::generateQr($id, 'auto_'); @@ -185,18 +196,18 @@ class AutoController extends Controller 'car_category' => $request->car_category, 'car_mark' => $request->car_mark, 'color' => $request->color, - 'made_date' => $request->made_date, + 'made_date' => $this->parseDate($request->made_date), 'body' => $request->body, 'engine' => $request->engine, 'car_number' => $request->car_number, 'type' => $request->type, 'shassi' => $request->shassi, 'tech_passport' => $request->tech_passport, - 'tech_given_date' => $request->tech_given_date, + 'tech_given_date' => $this->parseDate($request->tech_given_date), 'tech_given_whom' => $request->tech_given_whom, 'cost' => (int)str_replace(',', '', $request->cost ?? 0), 'note' => $request->note, - 'created_at' => $request->created_at, + 'created_at' => $this->parseDate($request->created_at) ?? now(), 'updated_at' => now(), ]); return redirect()->route('auto.show', $id); diff --git a/app/Http/Controllers/EstateController.php b/app/Http/Controllers/EstateController.php index 125b8ab..7900c44 100644 --- a/app/Http/Controllers/EstateController.php +++ b/app/Http/Controllers/EstateController.php @@ -5,9 +5,20 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use App\Http\Controllers\QrController; +use Carbon\Carbon; class EstateController extends Controller { + private function parseDate(?string $date): ?string + { + if (!$date) return null; + try { + return Carbon::createFromFormat('d.m.Y', $date)->format('Y-m-d'); + } catch (\Exception $e) { + return $date; // already in Y-m-d or null + } + } + public function index(Request $request) { $filters = $request->only(['search', 'period', 'status', 'appraiser', 'purpose_id']); @@ -93,7 +104,7 @@ class EstateController extends Controller 'owner_first_name' => $request->owner_first_name, 'owner_patronymic' => $request->owner_patronymic, 'owner_company' => $request->owner_company, - 'contract_date' => $request->contract_date, + 'contract_date' => $this->parseDate($request->contract_date), 'name_of_object' => $request->name_of_object, 'region' => $request->region, 'district' => $request->district, @@ -105,7 +116,7 @@ class EstateController extends Controller 'live_area' => $request->live_area, 'cost' => (int)str_replace(',', '', $request->cost ?? 0), 'note' => $request->note, - 'created_at' => $request->created_at ?? now(), + 'created_at' => $this->parseDate($request->created_at) ?? now(), 'updated_at' => now(), ]); QrController::generateQr($id, 'estate_'); @@ -160,7 +171,7 @@ class EstateController extends Controller 'owner_first_name' => $request->owner_first_name, 'owner_patronymic' => $request->owner_patronymic, 'owner_company' => $request->owner_company, - 'contract_date' => $request->contract_date, + 'contract_date' => $this->parseDate($request->contract_date), 'name_of_object' => $request->name_of_object, 'region' => $request->region, 'district' => $request->district, @@ -172,7 +183,7 @@ class EstateController extends Controller 'live_area' => $request->live_area, 'cost' => (int)str_replace(',', '', $request->cost ?? 0), 'note' => $request->note, - 'created_at' => $request->created_at, + 'created_at' => $this->parseDate($request->created_at) ?? now(), 'updated_at' => now(), ]); return redirect()->route('estate.show', $id); diff --git a/resources/views/auto/edit.blade.php b/resources/views/auto/edit.blade.php index 2b88738..ed88c46 100755 --- a/resources/views/auto/edit.blade.php +++ b/resources/views/auto/edit.blade.php @@ -47,7 +47,7 @@ @@ -447,7 +447,7 @@ class="form-control flatpickr-input @error('tech_given_date') is-invalid @enderror" id="auto-tech_given_date-input" name="tech_given_date" - value="{{ old('tech_given_date', $order->tech_given_date) }}" + value="{{ old('tech_given_date', $order->tech_given_date ? \Carbon\Carbon::parse($order->tech_given_date)->format('d.m.Y') : '') }}" data-provider="flatpickr" data-date-format="d.m.Y" data-default="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}" placeholder="@lang('translation.write-car-technical-passport-given-date')" diff --git a/resources/views/estate/edit.blade.php b/resources/views/estate/edit.blade.php index db4197b..1956545 100755 --- a/resources/views/estate/edit.blade.php +++ b/resources/views/estate/edit.blade.php @@ -47,7 +47,7 @@ @error('contract_date')