diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 1259cfa1..07f51203 100644 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -155,9 +155,12 @@ class IndexController extends Controller if ($validator->fails()) { return Redirect::back()->withErrors($validator)->withInput(); } - $user_exist = User::where('phone', $request->phone)->first(); + $phone = trim($request->phone); + $generatedEmail = $phone . '@phone.local'; + $user_exist = User::where('phone', $phone)->first(); if ($user_exist != null) { $user_exist->name = mb_strtoupper($request->name, 'UTF-8'); + $user_exist->phone = $phone; $user_exist->address = $request->address; $user_exist->known_sis = $request->known_sis; $user_exist->job = $request->job; @@ -168,11 +171,11 @@ class IndexController extends Controller } $request_data = [ 'name' => mb_strtoupper($request->name, 'UTF-8'), - 'phone' => $request->phone, + 'phone' => $phone, 'address' => $request->address, 'known_sis' => $request->known_sis, 'job' => $request->job, - 'email' => $request->phone, + 'email' => $generatedEmail, 'password' => bcrypt('dq123'), 'status' => 1 ]; diff --git a/resources/views/backend/prizeuser/excel.blade.php b/resources/views/backend/prizeuser/excel.blade.php index 8407d2b5..f1df5925 100644 --- a/resources/views/backend/prizeuser/excel.blade.php +++ b/resources/views/backend/prizeuser/excel.blade.php @@ -17,6 +17,8 @@ $sheet->setCellValue('C1', 'SỐ ĐIỆN THOẠI'); $sheet->setCellValue('D1', 'NGHỀ NGHIỆP'); $sheet->setCellValue('E1', 'TÊN GIẢI THƯỞNG'); $sheet->setCellValue('F1', 'NGÀY QUAY SỐ'); +$sheet->setCellValue('G1', 'ĐỊA CHỈ'); +$sheet->setCellValue('H1', 'BIẾT VỀ SIS'); $row = 1;// Initialize row counter $stt = 1; // $newsheet = new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, str_replace("/", "-", $date)); @@ -43,17 +45,19 @@ foreach ($data as $item) { $sheet->setCellValue('D' . $row, $item->job ?? ''); $sheet->setCellValue('E' . $row, $item->prize_name ?? ''); $sheet->setCellValue('F' . $row, $item->created_at != '' ? date_format(date_create($item->created_at), "d/m/Y H:i") : ''); + $sheet->setCellValue('G' . $row, $item->address ?? ''); + $sheet->setCellValue('H' . $row, isset($item->known_sis) ? ($item->known_sis == 1 ? 'Có' : 'Không') : ''); $row++; $stt++; } -$sheet->getStyle('A1:F1')->applyFromArray(array( +$sheet->getStyle('A1:H1')->applyFromArray(array( 'font' => array( 'name' => 'Calibri', 'size' => 14, 'bold' => true ) )); -$sheet->getStyle('A1:F' . $row - 1)->applyFromArray(array( +$sheet->getStyle('A1:H' . ($row - 1))->applyFromArray(array( 'borders' => [ 'allBorders' => [ 'borderStyle' => Border::BORDER_THIN, @@ -61,7 +65,7 @@ $sheet->getStyle('A1:F' . $row - 1)->applyFromArray(array( ], ] )); -foreach (range('A', 'F') as $column) { +foreach (range('A', 'H') as $column) { $sheet->getColumnDimension($column)->setAutoSize(true); } $writer = new Xlsx($spreadsheet);