uppercese category qoshildi
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user