diff --git a/app/Http/Controllers/AutoController.php b/app/Http/Controllers/AutoController.php
index 37a3bf0..6efd962 100644
--- a/app/Http/Controllers/AutoController.php
+++ b/app/Http/Controllers/AutoController.php
@@ -78,6 +78,27 @@ class AutoController extends Controller
 
     public function store(Request $request)
     {
+        // Sanitize cost before validation
+        if ($request->has('cost')) {
+            $request->merge([
+                'cost' => str_replace(',', '', $request->cost)
+            ]);
+        }
+
+        $request->validate([
+            'number'                 => 'required',
+            'purpose_id'             => 'required',
+            'ordered_customer'       => 'required',
+            'ordered_customer_phone' => 'required',
+            'customer_type'          => 'required|in:physical,juridical',
+            'owner_type'             => 'required|in:physical,juridical',
+            'car_category'           => 'required',
+            'car_mark'               => 'required',
+            'car_number'             => 'required',
+            'tech_passport'          => 'required',
+            'cost'                   => 'required|numeric',
+        ]);
+
         $id = DB::table('auto_orders')->insertGetId([
             'number'                 => $request->number,
             'status'                 => $request->status ?? 'draft',
@@ -129,6 +150,27 @@ class AutoController extends Controller
 
     public function update(Request $request, $id)
     {
+        // Sanitize cost before validation
+        if ($request->has('cost')) {
+            $request->merge([
+                'cost' => str_replace(',', '', $request->cost)
+            ]);
+        }
+
+        $request->validate([
+            'number'                 => 'required',
+            'purpose_id'             => 'required',
+            'ordered_customer'       => 'required',
+            'ordered_customer_phone' => 'required',
+            'customer_type'          => 'required|in:physical,juridical',
+            'owner_type'             => 'required|in:physical,juridical',
+            'car_category'           => 'required',
+            'car_mark'               => 'required',
+            'car_number'             => 'required',
+            'tech_passport'          => 'required',
+            'cost'                   => 'required|numeric',
+        ]);
+
         DB::table('auto_orders')->where('id', $id)->update([
             'number'                 => $request->number,
             'status'                 => $request->status,
diff --git a/app/Http/Controllers/ConclusionController.php b/app/Http/Controllers/ConclusionController.php
index 2721e7b..5a7187e 100644
--- a/app/Http/Controllers/ConclusionController.php
+++ b/app/Http/Controllers/ConclusionController.php
@@ -96,8 +96,34 @@ class ConclusionController extends Controller
                         $size2 = $pdf->getTemplateSize($tpl);
                         $pdf->AddPage($size2['orientation'], [$size2['width'], $size2['height']]);
                         $pdf->useTemplate($tpl);
-                        // Add QR to bottom-right corner
-                        $pdf->Image($qrPath, $size2['width'] - 35, $size2['height'] - 35, 30, 30);
+                        // Add QR to top-right corner
+                        $pdf->Image($qrPath, $size2['width'] - 45, 15, 30, 30);
+                    }
+
+                    // Append certificates from the database
+                    $certificates = DB::table('certificates')->orderBy('sort')->get();
+                    foreach ($certificates as $certificate) {
+                        $certPath = storage_path('app/' . $certificate->path);
+                        if (file_exists($certPath)) {
+                            // Support both PDF and Image certificates
+                            $extCert = strtolower(pathinfo($certPath, PATHINFO_EXTENSION));
+                            if ($extCert === 'pdf') {
+                                $certPageCount = $pdf->setSourceFile($certPath);
+                                for ($j = 1; $j <= $certPageCount; $j++) {
+                                    $tplCert   = $pdf->importPage($j);
+                                    $sizeCert  = $pdf->getTemplateSize($tplCert);
+                                    $pdf->AddPage($sizeCert['orientation'], [$sizeCert['width'], $sizeCert['height']]);
+                                    $pdf->useTemplate($tplCert);
+                                    // Add watermark to certificate page too
+                                    $pdf->Image($qrPath, $sizeCert['width'] - 45, 15, 30, 30);
+                                }
+                            } elseif (in_array($extCert, ['jpg', 'jpeg', 'png'])) {
+                                $pdf->AddPage('P', 'A4');
+                                $pdf->Image($certPath, 0, 0, 210, 297);
+                                // Add watermark
+                                $pdf->Image($qrPath, 210 - 45, 15, 30, 30);
+                            }
+                        }
                     }
 
                     $pdf->Output('F', $outputPath);
diff --git a/app/Http/Controllers/EstateController.php b/app/Http/Controllers/EstateController.php
index 1f1b57c..89b8f4d 100644
--- a/app/Http/Controllers/EstateController.php
+++ b/app/Http/Controllers/EstateController.php
@@ -59,6 +59,28 @@ class EstateController extends Controller
 
     public function store(Request $request)
     {
+        // Sanitize cost before validation
+        if ($request->has('cost')) {
+            $request->merge([
+                'cost' => str_replace(',', '', $request->cost)
+            ]);
+        }
+
+        $request->validate([
+            'number'                 => 'required',
+            'purpose_id'             => 'required',
+            'ordered_customer'       => 'required',
+            'ordered_customer_phone' => 'required',
+            'customer_type'          => 'required|in:physical,juridical',
+            'owner_type'             => 'required|in:physical,juridical',
+            'name_of_object'         => 'required',
+            'region'                 => 'required',
+            'district'               => 'required',
+            'address'                => 'required',
+            'tech_passport'          => 'required',
+            'cost'                   => 'required|numeric',
+        ]);
+
         $id = DB::table('estate_orders')->insertGetId([
             'number'                 => $request->number,
             'status'                 => $request->status ?? 'draft',
@@ -112,6 +134,28 @@ class EstateController extends Controller
 
     public function update(Request $request, $id)
     {
+        // Sanitize cost before validation
+        if ($request->has('cost')) {
+            $request->merge([
+                'cost' => str_replace(',', '', $request->cost)
+            ]);
+        }
+
+        $request->validate([
+            'number'                 => 'required',
+            'purpose_id'             => 'required',
+            'ordered_customer'       => 'required',
+            'ordered_customer_phone' => 'required',
+            'customer_type'          => 'required|in:physical,juridical',
+            'owner_type'             => 'required|in:physical,juridical',
+            'name_of_object'         => 'required',
+            'region'                 => 'required',
+            'district'               => 'required',
+            'address'                => 'required',
+            'tech_passport'          => 'required',
+            'cost'                   => 'required|numeric',
+        ]);
+
         DB::table('estate_orders')->where('id', $id)->update([
             'number'                 => $request->number,
             'status'                 => $request->status,
diff --git a/resources/views/auto/edit.blade.php b/resources/views/auto/edit.blade.php
index d82e89b..2b88738 100755
--- a/resources/views/auto/edit.blade.php
+++ b/resources/views/auto/edit.blade.php
@@ -33,7 +33,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('number') is-invalid @enderror"
                                        name="number" placeholder="@lang('translation.write-number')"
-                                       id="order-number-input" value="{{ $order->number }}"
+                                       id="order-number-input" value="{{ old('number', $order->number) }}"
                                        tabindex="1">
                                 @error('number')
                                 <span class="invalid-feedback" role="alert">
@@ -47,7 +47,7 @@
                                 <input type="text"
                                        class="form-control flatpickr-input  @error('created_at') is-invalid @enderror"
                                        id="auto-created_date-input"
-                                       name="created_at" value="{{ $order->created_at }}"
+                                       name="created_at" value="{{ old('created_at', $order->created_at) }}"
                                        data-provider="flatpickr" data-date-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') }}"
@@ -92,7 +92,7 @@
                             <!-- Inline Checkbox -->
                             <div class="form-check form-check-inline mb-2">
                                 <input class="form-check-input" type="radio"
-                                       @if($order->customer_type=='physical') checked @endif
+                                       @if(old('customer_type', $order->customer_type)=='physical') checked @endif
                                        name="customer_type"
                                        onclick="handleCustomerClick(this.value);" value="physical"
                                        id="flexRadioDefault2">
@@ -102,7 +102,7 @@
                             </div>
                             <div class="form-check form-check-inline mb-2">
                                 <input class="form-check-input is " type="radio"
-                                       @if($order->customer_type=='juridical') checked
+                                       @if(old('customer_type', $order->customer_type)=='juridical') checked
                                        @endif  name="customer_type"
                                        onclick="handleCustomerClick(this.value);" value="juridical"
                                        id="flexRadioDefault1">
@@ -111,7 +111,7 @@
                                 </label>
                             </div>
                         </div>
-                        <div class="row gy-4 @if($order->customer_type=='juridical') d-none @endif" id="customer-block">
+                        <div class="row gy-4 @if(old('customer_type', $order->customer_type)=='juridical') d-none @endif" id="customer-block">
 
                             <div class="mb-3 col-xxl-4 col-md-6">
                                 <label class="form-label" for="order-customer_last_name-input">
@@ -120,7 +120,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('customer_last_name') is-invalid @enderror"
                                        name="customer_last_name" id="order-customer_last_name-input"
-                                       value="{{ $order->customer_last_name }}"
+                                       value="{{ old('customer_last_name', $order->customer_last_name) }}"
                                        placeholder="@lang('translation.write-customer-last-name')" tabindex="4">
                                 @error('customer_last_name')
                                 <span class="invalid-feedback" role="alert">
@@ -135,7 +135,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('customer_first_name') is-invalid @enderror"
                                        name="customer_first_name" id="order-customer_first_name-input"
-                                       value="{{ $order->customer_first_name }}"
+                                       value="{{ old('customer_first_name', $order->customer_first_name) }}"
                                        placeholder="@lang('translation.write-customer-first-name')" tabindex="5">
                                 @error('customer_first_name')
                                 <span class="invalid-feedback" role="alert">
@@ -150,7 +150,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('customer_patronymic') is-invalid @enderror"
                                        name="customer_patronymic" id="order-customer_patronymic-input"
-                                       value="{{ $order->customer_patronymic }}"
+                                       value="{{ old('customer_patronymic', $order->customer_patronymic) }}"
                                        placeholder="@lang('translation.write-customer-patronymic')" tabindex="6">
                                 @error('customer_patronymic')
                                 <span class="invalid-feedback" role="alert">
@@ -159,14 +159,14 @@
                                 @enderror
                             </div>
                         </div>
-                        <div class="row gy-4 @if($order->customer_type=='physical') d-none @endif"
+                        <div class="row gy-4 @if(old('customer_type', $order->customer_type)=='physical') d-none @endif"
                              id="customer-company-block">
                             <div class="mb-3">
                                 <label class="form-label" for="order-customer_company-input">
                                     @lang('translation.customer-juridical-name')
                                 </label>
-                                <input type="text" class="form-control text-uppercase" name="customer_company"
-                                       id="order-customer_company-input" value="{{ $order->customer_company }}"
+                                <input type="text" class="form-control text-uppercase @error('customer_company') is-invalid @enderror" name="customer_company"
+                                       id="order-customer_company-input" value="{{ old('customer_company', $order->customer_company) }}"
                                        placeholder="@lang('translation.write-customer-juridical-name')" tabindex="3">
                                 @error('customer_company')
                                 <span class="invalid-feedback" role="alert">
@@ -188,7 +188,7 @@
                         <div class="mb-3">
                             <!-- Inline Checkbox -->
                             <div class="form-check form-check-inline mb-2">
-                                <input class="form-check-input" type="radio" @if($order->owner_type=='physical') checked
+                                <input class="form-check-input" type="radio" @if(old('owner_type', $order->owner_type)=='physical') checked
                                        @endif  name="owner_type"
                                        onclick="handleOwnerClick(this.value);" value="physical"
                                        id="flexRadioDefault3">
@@ -198,7 +198,7 @@
                             </div>
                             <div class="form-check form-check-inline mb-2">
                                 <input class="form-check-input is " type="radio"
-                                       @if($order->owner_type=='juridical') checked
+                                       @if(old('owner_type', $order->owner_type)=='juridical') checked
                                        @endif  name="owner_type"
                                        onclick="handleOwnerClick(this.value);" value="juridical"
                                        id="flexRadioDefault4">
@@ -207,13 +207,13 @@
                                 </label>
                             </div>
                         </div>
-                        <div class="row gy-4  @if($order->owner_type=='juridical')d-none @endif" id="owner-block">
+                        <div class="row gy-4  @if(old('owner_type', $order->owner_type)=='juridical')d-none @endif" id="owner-block">
 
                             <div class="mb-3 col-xxl-4 col-md-6">
                                 <label class="form-label" for="order-owner_last_name-input">
                                     @lang('translation.owner-last-name')
                                 </label>
-                                <input type="text" value="{{ $order->owner_last_name }}"
+                                <input type="text" value="{{ old('owner_last_name', $order->owner_last_name) }}"
                                        class="form-control text-uppercase @error('owner_last_name') is-invalid @enderror"
                                        name="owner_last_name" id="order-owner_last_name-input"
                                        placeholder="@lang('translation.write-owner-last-name')" tabindex="7">
@@ -229,7 +229,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('owner_first_name') is-invalid @enderror"
-                                       name="owner_first_name" value="{{ $order->owner_first_name }}"
+                                       name="owner_first_name" value="{{ old('owner_first_name', $order->owner_first_name) }}"
                                        id="order-owner_first_name-input"
                                        placeholder="@lang('translation.write-owner-first-name')" tabindex="8">
                                 @error('owner_first_name')
@@ -242,7 +242,7 @@
                                 <label class="form-label" for="order-owner_patronymic-input">
                                     @lang('translation.owner-patronymic')
                                 </label>
-                                <input type="text" value="{{ $order->owner_patronymic }}"
+                                <input type="text" value="{{ old('owner_patronymic', $order->owner_patronymic) }}"
                                        class="form-control text-uppercase @error('owner_patronymic') is-invalid @enderror"
                                        name="owner_patronymic" id="order-owner_patronymic-input"
                                        placeholder="@lang('translation.write-owner-patronymic')" tabindex="9">
@@ -253,7 +253,7 @@
                                 @enderror
                             </div>
                         </div>
-                        <div class="row gy-4 @if($order->owner_type=='physical')d-none @endif"
+                        <div class="row gy-4 @if(old('owner_type', $order->owner_type)=='physical')d-none @endif"
                              id="owner-company-block">
                             <div class="mb-3">
                                 <label class="form-label" for="order-owner_company-input">
@@ -261,7 +261,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('owner_company') is-invalid @enderror"
-                                       name="owner_company" value="{{ $order->owner_company }}"
+                                       name="owner_company" value="{{ old('owner_company', $order->owner_company) }}"
                                        id="order-owner_company-input"
                                        placeholder="@lang('translation.write-owner-juridical-name')" tabindex="">
                                 @error('owner_company')
@@ -307,7 +307,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('car_mark') is-invalid @enderror"
-                                       id="auto-car_mark-input" name="car_mark" value="{{ $order->car_mark }}"
+                                       id="auto-car_mark-input" name="car_mark" value="{{ old('car_mark', $order->car_mark) }}"
                                        placeholder="@lang('translation.write-car-mark')" tabindex="12">
                                 @error('car_mark')
                                 <span class="invalid-feedback" role="alert">
@@ -321,7 +321,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('color') is-invalid @enderror"
-                                       id="auto-color-input" name="color" value="{{ $order->color }}"
+                                       id="auto-color-input" name="color" value="{{ old('color', $order->color) }}"
                                        placeholder="@lang('translation.write-car-color')" tabindex="22">
                                 @error('color')
                                 <span class="invalid-feedback" role="alert">
@@ -339,7 +339,7 @@
                                        class="form-control text-uppercase @error('made_date') is-invalid @enderror"
                                        id="auto-made_date-input" name="made_date"
                                        data-provider="flatpickr" data-date-format="d.m.Y"
-                                       value="{{ $order->made_date }}"
+                                       value="{{ old('made_date', $order->made_date) }}"
                                        data-deafult-date="{{ Carbon\Carbon::now('Asia/Tashkent')->format('d.m.Y') }}"
                                        placeholder="@lang('translation.write-car-made-date')"
                                        tabindex="13">
@@ -355,7 +355,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('body') is-invalid @enderror"
-                                       id="auto-body-input" name="body" value="{{ $order->body }}"
+                                       id="auto-body-input" name="body" value="{{ old('body', $order->body) }}"
                                        placeholder="@lang('translation.write-car-body')" tabindex="14">
                                 @error('body')
                                 <span class="invalid-feedback" role="alert">
@@ -369,7 +369,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('engine') is-invalid @enderror"
-                                       id="auto-engine-input" name="engine" value="{{ $order->engine }}"
+                                       id="auto-engine-input" name="engine" value="{{ old('engine', $order->engine) }}"
                                        placeholder="@lang('translation.write-car-engine')" tabindex="15">
                                 @error('engine')
                                 <span class="invalid-feedback" role="alert">
@@ -385,7 +385,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('car_number') is-invalid @enderror"
-                                       id="auto-car_number-input" name="car_number" value="{{ $order->car_number }}"
+                                       id="auto-car_number-input" name="car_number" value="{{ old('car_number', $order->car_number) }}"
                                        placeholder="@lang('translation.write-car-number')" tabindex="16">
                                 @error('car_number')
                                 <span class="invalid-feedback" role="alert">
@@ -399,7 +399,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('type') is-invalid @enderror"
-                                       id="auto-type-input" name="type" value="{{ $order->type }}"
+                                       id="auto-type-input" name="type" value="{{ old('type', $order->type) }}"
                                        placeholder="@lang('translation.write-car-type')" tabindex="17">
                                 @error('type')
                                 <span class="invalid-feedback" role="alert">
@@ -413,7 +413,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('shassi') is-invalid @enderror"
-                                       id="auto-shassi-input" name="shassi" value="{{ $order->shassi }}"
+                                       id="auto-shassi-input" name="shassi" value="{{ old('shassi', $order->shassi) }}"
                                        placeholder="@lang('translation.write-car-shassi')" tabindex="18">
                                 @error('shassi')
                                 <span class="invalid-feedback" role="alert">
@@ -430,7 +430,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('tech_passport') is-invalid @enderror"
                                        id="auto-tech_passport-input"
-                                       name="tech_passport" value="{{ $order->tech_passport }}"
+                                       name="tech_passport" value="{{ old('tech_passport', $order->tech_passport) }}"
                                        placeholder="@lang('translation.write-car-technical-passport')" tabindex="19">
                                 @error('tech_passport')
                                 <span class="invalid-feedback" role="alert">
@@ -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="{{ $order->tech_given_date }}"
+                                       value="{{ old('tech_given_date', $order->tech_given_date) }}"
                                        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')"
@@ -466,7 +466,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('tech_given_whom') is-invalid @enderror"
                                        id="auto-tech_given_whom-input"
-                                       name="tech_given_whom" value="{{ $order->tech_given_whom }}"
+                                       name="tech_given_whom" value="{{ old('tech_given_whom', $order->tech_given_whom) }}"
                                        placeholder="@lang('translation.write-technical-passport-given-by-whom')"
                                        tabindex="21">
                                 @error('tech_given_whom')
@@ -509,7 +509,7 @@
                                 </option>
                             @endforeach
                         </select>
-                        @error('diller')
+                        @error('diller_id')
                         <span class="invalid-feedback" role="alert">
                                     <strong>@lang($message,['attribute'=>trans('translation.diller')])</strong>
                                 </span>
@@ -531,7 +531,7 @@
                         <input type="text"
                                class="form-control text-uppercase @error('ordered_customer') is-invalid @enderror"
                                id="auto-ordered_customer-input"
-                               name="ordered_customer" value="{{ $order->ordered_customer }}"
+                               name="ordered_customer" value="{{ old('ordered_customer', $order->ordered_customer) }}"
                                placeholder="@lang('translation.write-car-ordered-customer')" tabindex="24">
                         @error('ordered_customer')
                         <span class="invalid-feedback" role="alert">
@@ -546,7 +546,7 @@
                         <input type="text"
                                class="form-control text-uppercase @error('ordered_customer_phone') is-invalid @enderror"
                                name="ordered_customer_phone" id="cleave-phone-init"
-                               value="{{ $order->ordered_customer_phone }}"
+                               value="{{ old('ordered_customer_phone', $order->ordered_customer_phone) }}"
                                placeholder="@lang('translation.write-car-ordered-customer-phone')" tabindex="25">
                         @error('ordered_customer_phone')
                         <span class="invalid-feedback" role="alert">
@@ -573,7 +573,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('cost') is-invalid @enderror"
                                        name="cost"
-                                       id="cleave-numeral" value="{{ $order->cost }}"
+                                       id="cleave-numeral" value="{{ old('cost', $order->cost) }}"
                                        placeholder="123,450" aria-label="Price"
                                        aria-describedby="product-price-addon"
                                        tabindex="26">
@@ -600,7 +600,7 @@
                         <textarea class="form-control text-uppercase @error('note') is-invalid @enderror" name="note"
                                   id="auto-note-input"
                                   placeholder="@lang('translation.write-cost-note')"
-                                  rows="3" tabindex="27">{{ $order->note }}</textarea>
+                                  rows="3" tabindex="27">{{ old('note', $order->note) }}</textarea>
                         @error('note')
                         <span class="invalid-feedback" role="alert">
                                     <strong>@lang($message,['attribute'=>trans('translation.note')])</strong>
diff --git a/resources/views/estate/edit.blade.php b/resources/views/estate/edit.blade.php
index c5a65a3..db4197b 100755
--- a/resources/views/estate/edit.blade.php
+++ b/resources/views/estate/edit.blade.php
@@ -33,7 +33,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('number') is-invalid @enderror"
                                        name="number" placeholder="@lang('translation.write-number')"
-                                       id="order-number-input" value="{{ $order->number }}"
+                                       id="order-number-input" value="{{ old('number', $order->number) }}"
                                        tabindex="1">
                                 @error('number')
                                 <span class="invalid-feedback" role="alert">
@@ -47,7 +47,7 @@
                                 <input type="text"
                                        class="form-control flatpickr-input  @error('created_at') is-invalid @enderror"
                                        id="auto-created_date-input"
-                                       name="created_at" value="{{ $order->created_at }}"
+                                       name="created_at" value="{{ old('created_at', $order->created_at) }}"
                                        data-provider="flatpickr" data-date-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') }}"
@@ -67,7 +67,7 @@
                                         id="choices-purpose-input" tabindex="3">
                                     @foreach($purposeCases as $purposeItem)
                                         <option value="{{ $purposeItem->id }}"
-                                                @if(old('purpose_id') == $purposeItem->id)selected @endif>
+                                                @if(old('purpose_id', $order->purpose_id) == $purposeItem->id)selected @endif>
                                             {{ $purposeItem->{str_replace('_', '-', app()->getLocale())} }}
                                         </option>
                                     @endforeach
@@ -92,7 +92,7 @@
                             <!-- Inline Checkbox -->
                             <div class="form-check form-check-inline mb-2">
                                 <input class="form-check-input" type="radio"
-                                       @if($order->customer_type=='physical') checked @endif
+                                       @if(old('customer_type', $order->customer_type)=='physical') checked @endif
                                        name="customer_type"
                                        onclick="handleCustomerClick(this.value);" value="physical"
                                        id="flexRadioDefault2">
@@ -102,7 +102,7 @@
                             </div>
                             <div class="form-check form-check-inline mb-2">
                                 <input class="form-check-input is " type="radio"
-                                       @if($order->customer_type=='juridical') checked
+                                       @if(old('customer_type', $order->customer_type)=='juridical') checked
                                        @endif  name="customer_type"
                                        onclick="handleCustomerClick(this.value);" value="juridical"
                                        id="flexRadioDefault1">
@@ -120,7 +120,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('customer_last_name') is-invalid @enderror"
                                        name="customer_last_name" id="order-customer_last_name-input"
-                                       value="{{ $order->customer_last_name }}"
+                                       value="{{ old('customer_last_name', $order->customer_last_name) }}"
                                        placeholder="@lang('translation.write-customer-last-name')" tabindex="4">
                                 @error('customer_last_name')
                                 <span class="invalid-feedback" role="alert">
@@ -135,7 +135,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('customer_first_name') is-invalid @enderror"
                                        name="customer_first_name" id="order-customer_first_name-input"
-                                       value="{{ $order->customer_first_name }}"
+                                       value="{{ old('customer_first_name', $order->customer_first_name) }}"
                                        placeholder="@lang('translation.write-customer-first-name')" tabindex="5">
                                 @error('customer_first_name')
                                 <span class="invalid-feedback" role="alert">
@@ -150,7 +150,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('customer_patronymic') is-invalid @enderror"
                                        name="customer_patronymic" id="order-customer_patronymic-input"
-                                       value="{{ $order->customer_patronymic }}"
+                                       value="{{ old('customer_patronymic', $order->customer_patronymic) }}"
                                        placeholder="@lang('translation.write-customer-patronymic')" tabindex="6">
                                 @error('customer_patronymic')
                                 <span class="invalid-feedback" role="alert">
@@ -166,7 +166,7 @@
                                     @lang('translation.customer-juridical-name')
                                 </label>
                                 <input type="text" class="form-control text-uppercase" name="customer_company"
-                                       id="order-customer_company-input" value="{{ $order->customer_company }}"
+                                       id="order-customer_company-input" value="{{ old('customer_company', $order->customer_company) }}"
                                        placeholder="@lang('translation.write-customer-juridical-name')" tabindex="3">
                                 @error('customer_company')
                                 <span class="invalid-feedback" role="alert">
@@ -188,7 +188,7 @@
                         <div class="mb-3">
                             <!-- Inline Checkbox -->
                             <div class="form-check form-check-inline mb-2">
-                                <input class="form-check-input" type="radio" @if($order->owner_type=='physical') checked
+                                <input class="form-check-input" type="radio" @if(old('owner_type', $order->owner_type)=='physical') checked
                                        @endif  name="owner_type"
                                        onclick="handleOwnerClick(this.value);" value="physical"
                                        id="flexRadioDefault3">
@@ -198,7 +198,7 @@
                             </div>
                             <div class="form-check form-check-inline mb-2">
                                 <input class="form-check-input is " type="radio"
-                                       @if($order->owner_type=='juridical') checked
+                                       @if(old('owner_type', $order->owner_type)=='juridical') checked
                                        @endif  name="owner_type"
                                        onclick="handleOwnerClick(this.value);" value="juridical"
                                        id="flexRadioDefault4">
@@ -213,7 +213,7 @@
                                 <label class="form-label" for="order-owner_last_name-input">
                                     @lang('translation.owner-last-name')
                                 </label>
-                                <input type="text" value="{{ $order->owner_last_name }}"
+                                <input type="text" value="{{ old('owner_last_name', $order->owner_last_name) }}"
                                        class="form-control text-uppercase @error('owner_last_name') is-invalid @enderror"
                                        name="owner_last_name" id="order-owner_last_name-input"
                                        placeholder="@lang('translation.write-owner-last-name')" tabindex="7">
@@ -229,7 +229,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('owner_first_name') is-invalid @enderror"
-                                       name="owner_first_name" value="{{ $order->owner_first_name }}"
+                                       name="owner_first_name" value="{{ old('owner_first_name', $order->owner_first_name) }}"
                                        id="order-owner_first_name-input"
                                        placeholder="@lang('translation.write-owner-first-name')" tabindex="8">
                                 @error('owner_first_name')
@@ -242,7 +242,7 @@
                                 <label class="form-label" for="order-owner_patronymic-input">
                                     @lang('translation.owner-patronymic')
                                 </label>
-                                <input type="text" value="{{ $order->owner_patronymic }}"
+                                <input type="text" value="{{ old('owner_patronymic', $order->owner_patronymic) }}"
                                        class="form-control text-uppercase @error('owner_patronymic') is-invalid @enderror"
                                        name="owner_patronymic" id="order-owner_patronymic-input"
                                        placeholder="@lang('translation.write-owner-patronymic')" tabindex="9">
@@ -261,7 +261,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('owner_company') is-invalid @enderror"
-                                       name="owner_company" value="{{ $order->owner_company }}"
+                                       name="owner_company" value="{{ old('owner_company', $order->owner_company) }}"
                                        id="order-owner_company-input"
                                        placeholder="@lang('translation.write-owner-juridical-name')" tabindex="">
                                 @error('owner_company')
@@ -290,7 +290,7 @@
                                        class="form-control text-uppercase @error('contract_date') is-invalid @enderror"
                                        id="estate-contract-date-input" name="contract_date"
                                        data-provider="flatpickr" data-date-format="d.m.Y"
-                                       value="{{ $order->contract_date }}"
+                                       value="{{ old('contract_date', $order->contract_date) }}"
                                        placeholder="@lang('translation.write-estate-contract-date')"
                                        tabindex="13">
                                 @error('contract_date')
@@ -307,7 +307,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('name_of_object') is-invalid @enderror"
                                        id="estate-name-of-object-input" name="name_of_object"
-                                       value="{{ $order->name_of_object }}"
+                                       value="{{ old('name_of_object', $order->name_of_object) }}"
                                        placeholder="@lang('translation.write-estate-name-of-object')" tabindex="14">
                                 @error('name_of_object')
                                 <span class="invalid-feedback" role="alert">
@@ -325,7 +325,7 @@
                                         id="choices-region-input" tabindex="3">
                                     @foreach($regions as $region)
                                         <option value="{{ $region->id }}"
-                                                @if($order->region == $region->id)selected @endif>
+                                                @if(old('region', $order->region) == $region->id)selected @endif>
                                             {{ $region->{str_replace('_', '-', app()->getLocale())} }}
                                         </option>
                                     @endforeach
@@ -348,7 +348,7 @@
                                         id="choices-district-input" tabindex="3">
                                     @foreach($districts as $district)
                                         <option value="{{ $district->id }}"
-                                                @if($order->district == $district->id)selected @endif>
+                                                @if(old('district', $order->district) == $district->id)selected @endif>
                                             {{ $district->{str_replace('_', '-', app()->getLocale())} }}
                                         </option>
                                     @endforeach
@@ -366,7 +366,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('address') is-invalid @enderror"
                                        id="estate-address-input" name="address"
-                                       value="{{ $order->address }}"
+                                       value="{{ old('address', $order->address) }}"
                                        placeholder="@lang('translation.select-estate-address')" tabindex="11">
                                 @error('address')
                                 <span class="invalid-feedback" role="alert">
@@ -380,7 +380,7 @@
                                 </label>
                                 <input type="text"
                                        class="form-control text-uppercase @error('home') is-invalid @enderror"
-                                       id="estate-home-input" name="home" value="{{ $order->home }}"
+                                       id="estate-home-input" name="home" value="{{ old('home', $order->home) }}"
                                        placeholder="@lang('translation.write-home')" tabindex="12">
                                 @error('home')
                                 <span class="invalid-feedback" role="alert">
@@ -395,7 +395,7 @@
                                     @lang('translation.area')
                                 </label>
                                 <input type="text" class="form-control text-uppercase @error('area') is-invalid @enderror"
-                                       id="estate-area-input" name="area" value="{{ $order->area }}"
+                                       id="estate-area-input" name="area" value="{{ old('area', $order->area) }}"
                                        placeholder="@lang('translation.write-estate-area')" tabindex="16">
                                 @error('area')
                                 <span class="invalid-feedback" role="alert">
@@ -408,7 +408,7 @@
                                     @lang('translation.overall-area')
                                 </label>
                                 <input type="text" class="form-control text-uppercase @error('overall_area') is-invalid @enderror"
-                                       id="estate-overall-area-input" name="overall_area" value="{{ $order->overall_area }}"
+                                       id="estate-overall-area-input" name="overall_area" value="{{ old('overall_area', $order->overall_area) }}"
                                        placeholder="@lang('translation.write-overall-area')" tabindex="17">
                                 @error('overall_area')
                                 <span class="invalid-feedback" role="alert">
@@ -421,7 +421,7 @@
                                     @lang('translation.usefull-area')
                                 </label>
                                 <input type="text" class="form-control text-uppercase @error('usefull_area') is-invalid @enderror"
-                                       id="estate-usefull-area-input" name="usefull_area" value="{{ $order->usefull_area }}"
+                                       id="estate-usefull-area-input" name="usefull_area" value="{{ old('usefull_area', $order->usefull_area) }}"
                                        placeholder="@lang('translation.write-estate-usefull-area')" tabindex="18">
                                 @error('usefull_area')
                                 <span class="invalid-feedback" role="alert">
@@ -434,7 +434,7 @@
                                     @lang('translation.live-area')
                                 </label>
                                 <input type="text" class="form-control text-uppercase @error('live_area') is-invalid @enderror"
-                                       id="estate-live-area-input" name="live_area" value="{{ $order->live_area }}"
+                                       id="estate-live_area-input" name="live_area" value="{{ old('live_area', $order->live_area) }}"
                                        placeholder="@lang('translation.write-estate-live-area')" tabindex="18">
                                 @error('live_area')
                                 <span class="invalid-feedback" role="alert">
@@ -443,57 +443,6 @@
                                 @enderror
                             </div>
                         </div>
-                        {{--<div class="row gy-4">
-                            <div class="mb-3 col-xxl-4 col-md-6">
-                                <label class="form-label" for="estate-tech-passport-input">
-                                    @lang('translation.estate-technical-passport')
-                                </label>
-                                <input type="text" class="form-control text-uppercase @error('tech_passport') is-invalid @enderror"
-                                       id="estate-tech-passport-input"
-                                       name="tech_passport" value="{{ $order->tech_passport }}"
-                                       placeholder="@lang('translation.write-estate-technical-passport')" tabindex="19">
-                                @error('tech_passport')
-                                <span class="invalid-feedback" role="alert">
-                                    <strong>@lang($message,['attribute'=>trans('translation.estate-technical-passport')])</strong>
-                                </span>
-                                @enderror
-                            </div>
-                            <div class="mb-3 col-xxl-4 col-md-6">
-                                <label class="form-label"
-                                       for="estate-tech-given-date-input">
-                                    @lang('translation.estate-technical-passport-given-date')
-                                </label>
-                                <input type="text"
-                                       class="form-control flatpickr-input text-uppercase @error('tech_given_date') is-invalid @enderror"
-                                       id="estate-tech-given-date-input"
-                                       name="tech_given_date"
-                                       value="{{ $order->tech_given_date }}"
-                                       data-provider="flatpickr" data-date-format="d.m.Y"
-                                       placeholder="@lang('translation.write-car-technical-passport-given-date')"
-                                       tabindex="20">
-                                @error('tech_given_date')
-                                <span class="invalid-feedback" role="alert">
-                                    <strong>@lang($message,['attribute'=>trans('translation.technical-passport-given-date')])</strong>
-                                </span>
-                                @enderror
-                            </div>
-                            <div class="mb-3 col-xxl-4 col-md-6">
-                                <label class="form-label"
-                                       for="estate-given-by-whom-input">
-                                    @lang('translation.technical-passport-given-by-whom')
-                                </label>
-                                <input type="text" class="form-control text-uppercase @error('tech_given_whom') is-invalid @enderror"
-                                       id="estate-given-by-whom-input"
-                                       name="tech_given_whom" value="{{ $order->tech_given_whom }}"
-                                       placeholder="@lang('translation.write-technical-passport-given-by-whom')"
-                                       tabindex="21">
-                                @error('tech_given_whom')
-                                <span class="invalid-feedback" role="alert">
-                                    <strong>@lang($message,['attribute'=>trans('translation.technical-passport-given-by-whom')])</strong>
-                                </span>
-                                @enderror
-                            </div>
-                        </div>--}}
                     </div>
                 </div>
                 <!-- end card -->
@@ -517,11 +466,11 @@
                             @lang('translation.select-diller')
                         </label>
                         <select data-choices data-choices-search-false data-choices-multiple-groups="false"
-                                name="diller" class="form-select @error('diller') is-invalid @enderror"
+                                name="diller_id" class="form-select @error('diller_id') is-invalid @enderror"
                                 id="choices-diller-input"
                                 tabindex="23">
                             @foreach($dillers as $diller)
-                                <option value="{{ $diller->id}}" @if($order->diller== $diller->id) selected @endif>
+                                <option value="{{ $diller->id}}" @if(old('diller_id', $order->diller_id)== $diller->id) selected @endif>
                                     {{ $diller->name }}
                                 </option>
                             @endforeach
@@ -548,7 +497,7 @@
                         <input type="text"
                                class="form-control text-uppercase @error('ordered_customer') is-invalid @enderror"
                                id="auto-ordered_customer-input"
-                               name="ordered_customer" value="{{ $order->ordered_customer }}"
+                               name="ordered_customer" value="{{ old('ordered_customer', $order->ordered_customer) }}"
                                placeholder="@lang('translation.write-car-ordered-customer')" tabindex="24">
                         @error('ordered_customer')
                         <span class="invalid-feedback" role="alert">
@@ -563,7 +512,7 @@
                         <input type="text"
                                class="form-control text-uppercase @error('ordered_customer_phone') is-invalid @enderror"
                                name="ordered_customer_phone" id="cleave-phone-init"
-                               value="{{ $order->ordered_customer_phone }}"
+                               value="{{ old('ordered_customer_phone', $order->ordered_customer_phone) }}"
                                placeholder="@lang('translation.write-car-ordered-customer-phone')" tabindex="25">
                         @error('ordered_customer_phone')
                         <span class="invalid-feedback" role="alert">
@@ -590,7 +539,7 @@
                                 <input type="text"
                                        class="form-control text-uppercase @error('cost') is-invalid @enderror"
                                        name="cost"
-                                       id="cleave-numeral" value="{{ $order->cost }}"
+                                       id="cleave-numeral" value="{{ old('cost', $order->cost) }}"
                                        placeholder="123,450" aria-label="Price"
                                        aria-describedby="product-price-addon"
                                        tabindex="26">
@@ -617,7 +566,7 @@
                         <textarea class="form-control text-uppercase @error('note') is-invalid @enderror" name="note"
                                   id="auto-note-input"
                                   placeholder="@lang('translation.write-cost-note')"
-                                  rows="3" tabindex="27">{{ $order->note }}</textarea>
+                                  rows="3" tabindex="27">{{ old('note', $order->note) }}</textarea>
                         @error('note')
                         <span class="invalid-feedback" role="alert">
                                     <strong>@lang($message,['attribute'=>trans('translation.note')])</strong>