sifatbaho/sifatbaho-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

login va registerda sms eskizga otgkazildi

Browse Source
This commit is contained in:
husanjon
2026-04-09 11:04:24 +05:00
parent 9d348f3e3a
commit 1f2327c2d9
4 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/AutoController.php
View File

@@ -6,9 +6,20 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use App\Http\Controllers\QrController; use App\Http\Controllers\QrController;
use setasign\Fpdi\Fpdi; use setasign\Fpdi\Fpdi;
use Carbon\Carbon;
class AutoController extends Controller 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() private function ordersQuery()
{ {
return DB::table('auto_orders as o') return DB::table('auto_orders as o')
@@ -116,18 +127,18 @@ class AutoController extends Controller
'car_category' => $request->car_category, 'car_category' => $request->car_category,
'car_mark' => $request->car_mark, 'car_mark' => $request->car_mark,
'color' => $request->color, 'color' => $request->color,
'made_date' => $request->made_date, 'made_date' => $this->parseDate($request->made_date),
'body' => $request->body, 'body' => $request->body,
'engine' => $request->engine, 'engine' => $request->engine,
'car_number' => $request->car_number, 'car_number' => $request->car_number,
'type' => $request->type, 'type' => $request->type,
'shassi' => $request->shassi, 'shassi' => $request->shassi,
'tech_passport' => $request->tech_passport, '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, 'tech_given_whom' => $request->tech_given_whom,
'cost' => (int)str_replace(',', '', $request->cost ?? 0), 'cost' => (int)str_replace(',', '', $request->cost ?? 0),
'note' => $request->note, 'note' => $request->note,
'created_at' => $request->created_at ?? now(), 'created_at' => $this->parseDate($request->created_at) ?? now(),
'updated_at' => now(), 'updated_at' => now(),
]); ]);
QrController::generateQr($id, 'auto_'); QrController::generateQr($id, 'auto_');
@@ -185,18 +196,18 @@ class AutoController extends Controller
'car_category' => $request->car_category, 'car_category' => $request->car_category,
'car_mark' => $request->car_mark, 'car_mark' => $request->car_mark,
'color' => $request->color, 'color' => $request->color,
'made_date' => $request->made_date, 'made_date' => $this->parseDate($request->made_date),
'body' => $request->body, 'body' => $request->body,
'engine' => $request->engine, 'engine' => $request->engine,
'car_number' => $request->car_number, 'car_number' => $request->car_number,
'type' => $request->type, 'type' => $request->type,
'shassi' => $request->shassi, 'shassi' => $request->shassi,
'tech_passport' => $request->tech_passport, '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, 'tech_given_whom' => $request->tech_given_whom,
'cost' => (int)str_replace(',', '', $request->cost ?? 0), 'cost' => (int)str_replace(',', '', $request->cost ?? 0),
'note' => $request->note, 'note' => $request->note,
'created_at' => $request->created_at, 'created_at' => $this->parseDate($request->created_at) ?? now(),
'updated_at' => now(), 'updated_at' => now(),
]); ]);
return redirect()->route('auto.show', $id); return redirect()->route('auto.show', $id);

19
app/Http/Controllers/EstateController.php
View File

@@ -5,9 +5,20 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use App\Http\Controllers\QrController; use App\Http\Controllers\QrController;
use Carbon\Carbon;
class EstateController extends Controller 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) public function index(Request $request)
{ {
$filters = $request->only(['search', 'period', 'status', 'appraiser', 'purpose_id']); $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_first_name' => $request->owner_first_name,
'owner_patronymic' => $request->owner_patronymic, 'owner_patronymic' => $request->owner_patronymic,
'owner_company' => $request->owner_company, 'owner_company' => $request->owner_company,
'contract_date' => $request->contract_date, 'contract_date' => $this->parseDate($request->contract_date),
'name_of_object' => $request->name_of_object, 'name_of_object' => $request->name_of_object,
'region' => $request->region, 'region' => $request->region,
'district' => $request->district, 'district' => $request->district,
@@ -105,7 +116,7 @@ class EstateController extends Controller
'live_area' => $request->live_area, 'live_area' => $request->live_area,
'cost' => (int)str_replace(',', '', $request->cost ?? 0), 'cost' => (int)str_replace(',', '', $request->cost ?? 0),
'note' => $request->note, 'note' => $request->note,
'created_at' => $request->created_at ?? now(), 'created_at' => $this->parseDate($request->created_at) ?? now(),
'updated_at' => now(), 'updated_at' => now(),
]); ]);
QrController::generateQr($id, 'estate_'); QrController::generateQr($id, 'estate_');
@@ -160,7 +171,7 @@ class EstateController extends Controller
'owner_first_name' => $request->owner_first_name, 'owner_first_name' => $request->owner_first_name,
'owner_patronymic' => $request->owner_patronymic, 'owner_patronymic' => $request->owner_patronymic,
'owner_company' => $request->owner_company, 'owner_company' => $request->owner_company,
'contract_date' => $request->contract_date, 'contract_date' => $this->parseDate($request->contract_date),
'name_of_object' => $request->name_of_object, 'name_of_object' => $request->name_of_object,
'region' => $request->region, 'region' => $request->region,
'district' => $request->district, 'district' => $request->district,
@@ -172,7 +183,7 @@ class EstateController extends Controller
'live_area' => $request->live_area, 'live_area' => $request->live_area,
'cost' => (int)str_replace(',', '', $request->cost ?? 0), 'cost' => (int)str_replace(',', '', $request->cost ?? 0),
'note' => $request->note, 'note' => $request->note,
'created_at' => $request->created_at, 'created_at' => $this->parseDate($request->created_at) ?? now(),
'updated_at' => now(), 'updated_at' => now(),
]); ]);
return redirect()->route('estate.show', $id); return redirect()->route('estate.show', $id);

6
resources/views/auto/edit.blade.php
View File

@@ -47,7 +47,7 @@
<input type="text" <input type="text"
class="form-control flatpickr-input @error('created_at') is-invalid @enderror" class="form-control flatpickr-input @error('created_at') is-invalid @enderror"
id="auto-created_date-input" id="auto-created_date-input"
name="created_at" value="{{ old('created_at', $order->created_at) }}" name="created_at" value="{{ old('created_at', $order->created_at ? \Carbon\Carbon::parse($order->created_at)->format('d.m.Y') : '') }}"
data-provider="flatpickr" data-date-format="d.m.Y" data-provider="flatpickr" data-date-format="d.m.Y"
data-maxDate="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}" data-maxDate="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}"
data-deafult-date="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}" data-deafult-date="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}"
@@ -339,7 +339,7 @@
class="form-control text-uppercase @error('made_date') is-invalid @enderror" class="form-control text-uppercase @error('made_date') is-invalid @enderror"
id="auto-made_date-input" name="made_date" id="auto-made_date-input" name="made_date"
data-provider="flatpickr" data-date-format="d.m.Y" data-provider="flatpickr" data-date-format="d.m.Y"
value="{{ old('made_date', $order->made_date) }}" value="{{ old('made_date', $order->made_date ? \Carbon\Carbon::parse($order->made_date)->format('d.m.Y') : '') }}"
data-deafult-date="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}" data-deafult-date="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}"
placeholder="@lang('translation.write-car-made-date')" placeholder="@lang('translation.write-car-made-date')"
tabindex="13"> tabindex="13">
@@ -447,7 +447,7 @@
class="form-control flatpickr-input @error('tech_given_date') is-invalid @enderror" class="form-control flatpickr-input @error('tech_given_date') is-invalid @enderror"
id="auto-tech_given_date-input" id="auto-tech_given_date-input"
name="tech_given_date" 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-provider="flatpickr" data-date-format="d.m.Y"
data-default="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}" data-default="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}"
placeholder="@lang('translation.write-car-technical-passport-given-date')" placeholder="@lang('translation.write-car-technical-passport-given-date')"

4
resources/views/estate/edit.blade.php
View File

@@ -47,7 +47,7 @@
<input type="text" <input type="text"
class="form-control flatpickr-input @error('created_at') is-invalid @enderror" class="form-control flatpickr-input @error('created_at') is-invalid @enderror"
id="auto-created_date-input" id="auto-created_date-input"
name="created_at" value="{{ old('created_at', $order->created_at) }}" name="created_at" value="{{ old('created_at', $order->created_at ? \Carbon\Carbon::parse($order->created_at)->format('d.m.Y') : '') }}"
data-provider="flatpickr" data-date-format="d.m.Y" data-provider="flatpickr" data-date-format="d.m.Y"
data-maxDate="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}" data-maxDate="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}"
data-deafult-date="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}" data-deafult-date="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}"
@@ -290,7 +290,7 @@
class="form-control text-uppercase @error('contract_date') is-invalid @enderror" class="form-control text-uppercase @error('contract_date') is-invalid @enderror"
id="estate-contract-date-input" name="contract_date" id="estate-contract-date-input" name="contract_date"
data-provider="flatpickr" data-date-format="d.m.Y" data-provider="flatpickr" data-date-format="d.m.Y"
value="{{ old('contract_date', $order->contract_date) }}" value="{{ old('contract_date', $order->contract_date ? \Carbon\Carbon::parse($order->contract_date)->format('d.m.Y') : '') }}"
placeholder="@lang('translation.write-estate-contract-date')" placeholder="@lang('translation.write-estate-contract-date')"
tabindex="13"> tabindex="13">
@error('contract_date') @error('contract_date')