From e729e9b92ee57b77725c68e1a55b3079cda8837a Mon Sep 17 00:00:00 2001 From: Gunawan19621 Date: Tue, 31 Oct 2023 22:55:43 +0700 Subject: [PATCH] update validasi warehouse --- .../Auth/AuthenticatedSessionController.php | 25 +++- .../Auth/RedirectAuthController.php | 28 ++++- app/Http/Controllers/CustomerController.php | 26 +--- app/Http/Controllers/M_userController.php | 12 +- app/Http/Controllers/WarehouseController.php | 19 +-- app/Http/Requests/ValidasiCreateCustomer.php | 53 +++++++++ app/Http/Requests/ValidasiCreateUser.php | 78 ++++++++++++ app/Http/Requests/ValidasiCreateWarehouse.php | 45 +++++++ app/Http/Requests/ValidasiUpdateWarehouse.php | 45 +++++++ app/Models/Customer.php | 6 +- ...10_23_073314_create_m_warehouses_table.php | 2 +- .../2023_10_23_075245_create_users_table.php | 22 ++-- ...23_10_28_080457_create_customers_table.php | 14 +-- database/seeders/Customer.php | 28 ++--- database/seeders/RoleSeeder.php | 6 +- database/seeders/UserSeeder.php | 26 ++-- resources/views/auth/login.blade.php | 20 +++- .../Master_Data/Customer/create.blade.php | 34 +----- .../Master_Data/Customer/edit.blade.php | 35 +----- .../Master_Data/Customer/index.blade.php | 7 +- .../Master_Data/Customer/show.blade.php | 29 +---- .../Master_Data/User/create.blade.php | 5 + .../Master_Data/User/index.blade.php | 1 + .../Master_Data/Warehouse/index.blade.php | 111 +++++++++--------- .../layouts/components/alert-prompt.blade.php | 26 ++++ resources/views/layouts/main.blade.php | 4 +- 26 files changed, 439 insertions(+), 268 deletions(-) create mode 100644 app/Http/Requests/ValidasiCreateCustomer.php create mode 100644 app/Http/Requests/ValidasiCreateUser.php create mode 100644 app/Http/Requests/ValidasiCreateWarehouse.php create mode 100644 app/Http/Requests/ValidasiUpdateWarehouse.php create mode 100644 resources/views/layouts/components/alert-prompt.blade.php diff --git a/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/app/Http/Controllers/Auth/AuthenticatedSessionController.php index 494a106..ed42c84 100644 --- a/app/Http/Controllers/Auth/AuthenticatedSessionController.php +++ b/app/Http/Controllers/Auth/AuthenticatedSessionController.php @@ -23,14 +23,29 @@ class AuthenticatedSessionController extends Controller /** * Handle an incoming authentication request. */ - public function store(LoginRequest $request): RedirectResponse + public function store(Request $request) { - $request->authenticate(); + $request->validate([ + 'email' => 'required|email', + 'password' => 'required', + ]); + + if (!Auth::attempt($request->only('email', 'password'), $request->input('remember'))) { + return back() + ->withInput($request->only('email')) + ->withErrors(['email' => 'Kombinasi email dan password tidak valid.']); + } + + return redirect(RouteServiceProvider::HOME); + } + // public function store(LoginRequest $request): RedirectResponse + // { + // $request->authenticate(); - $request->session()->regenerate(); + // $request->session()->regenerate(); - return redirect()->intended(RouteServiceProvider::HOME); - } + // return redirect()->intended(RouteServiceProvider::HOME); + // } /** * Destroy an authenticated session. diff --git a/app/Http/Controllers/Auth/RedirectAuthController.php b/app/Http/Controllers/Auth/RedirectAuthController.php index cbe2cb5..93a2b6b 100644 --- a/app/Http/Controllers/Auth/RedirectAuthController.php +++ b/app/Http/Controllers/Auth/RedirectAuthController.php @@ -10,13 +10,29 @@ class RedirectAuthController extends Controller { public function redirectAuth() { - if (Auth::check() && Auth::user()->role_id == '1') { - // Admin - return redirect()->route('dashboard.home.admin'); - } elseif (Auth::check() && Auth::user()->role_id == 'user') { - return redirect()->route('dashboard.home.user'); + if (Auth::check()) { + if (Auth::user()->role_id == '1') { + // Admin + return redirect()->route('dashboard.home.admin'); + } else { + return redirect()->route('dashboard.home.admin'); + // User (role_id selain 1) + // return redirect()->route('dashboard.home.user'); + } } else { - return redirect()->route('login'); + // Tidak ada akun atau kesalahan login + // return redirect()->route('login')->with('error', 'Kesalahan email atau password.'); + return redirect()->route('login')->with('error', 'Kesalahan email atau password.'); } + + // if (Auth::check() && Auth::user()->role_id == '1') { + // // Admin + // return redirect()->route('dashboard.home.admin'); + // } elseif (Auth::check() && Auth::user()->role_id == '2') { + // return redirect()->route('dashboard.home.admin'); + // // return redirect()->route('dashboard.home.user'); + // } else { + // return redirect()->route('login'); + // } } } diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 6682993..451aca2 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Http\Requests\ValidasiCreateCustomer; use App\Models\Customer; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -34,26 +35,13 @@ class CustomerController extends Controller /** * Store a newly created resource in storage. */ - public function store(Request $request) + public function store(ValidasiCreateCustomer $request) { - // dd('oke'); - $request->validate([ - 'name' => 'required', - 'code_customer' => 'required', - 'lot_no' => 'required', - 'nip' => '', - 'no_hp' => 'required', - 'tgl_lahir' => '', - 'jenis_kelamin' => '', - 'agama' => '', - 'address' => 'required', - ]); - try { $currentUser = Auth::user(); $validatedData = $request->except('_token'); - $validatedData['created_by'] = $currentUser->fullname; // Menggunakan nama pengguna sebagai created_by - $validatedData['updated_by'] = $currentUser->fullname; // Menggunakan nama pengguna sebagai updated_by + $validatedData['created_by'] = $currentUser->id; // Menggunakan nama pengguna sebagai created_by + $validatedData['updated_by'] = $currentUser->id; // Menggunakan nama pengguna sebagai updated_by Customer::create($validatedData); return redirect()->route('dashboard.customer.index')->with('success', 'Data customer berhasil ditambahkan'); } catch (\Throwable $th) { @@ -95,11 +83,7 @@ class CustomerController extends Controller 'name' => 'required', 'code_customer' => 'required', 'lot_no' => 'required', - 'nip' => 'required', - 'no_hp' => 'required', - 'tgl_lahir' => 'required', - 'jenis_kelamin' => 'required', - 'agama' => 'required', + 'no_tlp' => 'required', 'address' => 'required', ]); // dd($request); diff --git a/app/Http/Controllers/M_userController.php b/app/Http/Controllers/M_userController.php index f85b4cf..9d39ad3 100644 --- a/app/Http/Controllers/M_userController.php +++ b/app/Http/Controllers/M_userController.php @@ -7,6 +7,7 @@ use App\Models\m_role; use App\Models\m_warehouse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use App\Http\Requests\ValidasiCreateUser; class M_userController extends Controller { @@ -40,17 +41,8 @@ class M_userController extends Controller /** * Store a newly created resource in storage. */ - public function store(Request $request) + public function store(ValidasiCreateUser $request) { - $request->validate([ - 'username' => 'required', - 'fullname' => 'required', - 'email' => 'required|email', - 'divisi' => 'required', - 'role_id' => 'required', - 'warehouse_id' => 'required', - 'password' => 'required', - ]); try { $currentUser = Auth::user(); diff --git a/app/Http/Controllers/WarehouseController.php b/app/Http/Controllers/WarehouseController.php index fdf1aab..aaccb10 100644 --- a/app/Http/Controllers/WarehouseController.php +++ b/app/Http/Controllers/WarehouseController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Http\Requests\ValidasiCreateWarehouse; +use App\Http\Requests\ValidasiUpdateWarehouse; use App\Models\m_warehouse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -30,13 +32,9 @@ class WarehouseController extends Controller /** * Store a newly created resource in storage. */ - public function store(Request $request) + public function store(ValidasiCreateWarehouse $request) { - $request->validate([ - 'name' => 'required', - 'description' => 'required', - 'address' => 'required', - ]); + try { $currentUser = Auth::user(); $validatedData = $request->except('_token'); @@ -71,15 +69,8 @@ class WarehouseController extends Controller /** * Update the specified resource in storage. */ - public function update(Request $request, $id) + public function update(ValidasiUpdateWarehouse $request, $id) { - // dd('oke'); - $request->validate([ - 'name' => 'required', - 'description' => 'required', - 'address' => 'required', - ]); - // dd($request); try { $warehouse = m_warehouse::findOrFail($id); $warehouse->update($request->all()); diff --git a/app/Http/Requests/ValidasiCreateCustomer.php b/app/Http/Requests/ValidasiCreateCustomer.php new file mode 100644 index 0000000..17e98b4 --- /dev/null +++ b/app/Http/Requests/ValidasiCreateCustomer.php @@ -0,0 +1,53 @@ +|string> + */ + public function rules(): array + { + return [ + 'name' => 'required|string|max:50', + 'code_customer' => 'required|string|max:15|unique:customers,code_customer', + 'lot_no' => 'required|string|max:50', + 'no_tlp' => 'required|numeric|max:20', + 'address' => 'required|string', + ]; + } + + public function messages() + { + return [ + 'name.required' => 'Kolom name wajib diisi.', + 'name.string' => 'Kolom name harus berupa teks.', + 'name.max' => 'Kolom name tidak boleh lebih dari :max karakter.', + 'code_customer.required' => 'Kolom code_customer wajib diisi.', + 'code_customer.string' => 'Kolom code_customer harus berupa teks.', + 'code_customer.max' => 'Kolom code_customer tidak boleh lebih dari :max karakter.', + 'code_customer.unique' => 'Kolom code_customer sudah ada.', + 'lot_no.required' => 'Kolom lot_no wajib diisi.', + 'lot_no.string' => 'Kolom lot_no harus berupa teks.', + 'lot_no.max' => 'Kolom lot_no tidak boleh lebih dari :max karakter.', + 'no_tlp.required' => 'Kolom no_tlp wajib diisi.', + 'no_tlp.numeric' => 'Kolom no_tlp harus berisi angka.', + 'no_tlp.max' => 'Kolom no_tlp tidak boleh lebih dari :max karakter.', + 'address.required' => 'Kolom address wajib diisi.', + 'address.string' => 'Kolom address harus berupa teks.', + ]; + } +} diff --git a/app/Http/Requests/ValidasiCreateUser.php b/app/Http/Requests/ValidasiCreateUser.php new file mode 100644 index 0000000..7e47988 --- /dev/null +++ b/app/Http/Requests/ValidasiCreateUser.php @@ -0,0 +1,78 @@ +|string> + */ + public function rules(): array + { + return [ + 'username' => 'required|string|max:32', + 'fullname' => 'required|string|max:32', + 'nip' => 'nullable|numeric|max:20', + 'email' => 'required|email|string|max:45', + 'no_hp' => 'nullable|numeric|max:15', + 'divisi' => 'nullable|string|max:50', + 'foto' => 'nullable|string|max:255', + 'role_id' => 'required|exists:m_roles,id', + 'warehouse_id' => 'nullable|exists:m_warehouses,id', + 'address' => 'nullable|string', + 'email_verified_at' => 'nullable|date', + 'password' => 'required|string|min:6|max:16', + 'created_by' => 'nullable|string|max:32', + 'updated_by' => 'nullable|string|max:32', + ]; + } + + public function messages() + { + return [ + 'username.required' => 'Kolom username wajib diisi.', + 'username.string' => 'Kolom username harus berupa teks.', + 'username.max' => 'Kolom username tidak boleh lebih dari :max karakter.', + 'fullname.required' => 'Kolom fullname wajib diisi.', + 'fullname.string' => 'Kolom fullname harus berupa teks.', + 'fullname.max' => 'Kolom fullname tidak boleh lebih dari :max karakter.', + 'nip.numeric' => 'Kolom NIP harus berisi angka.', + 'nip.max' => 'Kolom NIP tidak boleh lebih dari :max karakter.', + 'email.required' => 'Kolom email wajib diisi.', + 'email.email' => 'Format email tidak valid.', + 'email.string' => 'Kolom email harus berupa teks.', + 'email.max' => 'Kolom email tidak boleh lebih dari :max karakter.', + 'no_hp.numeric' => 'Kolom no_hp harus berisi angka.', + 'no_hp.max' => 'Kolom no_hp tidak boleh lebih dari :max karakter.', + 'divisi.string' => 'Kolom divisi harus berupa teks.', + 'divisi.max' => 'Kolom divisi tidak boleh lebih dari :max karakter.', + 'foto.string' => 'Kolom foto harus berupa teks.', + 'foto.max' => 'Kolom foto tidak boleh lebih dari :max karakter.', + 'role_id.required' => 'Kolom role_id wajib diisi.', + 'role_id.exists' => 'Role yang dipilih tidak valid.', + 'warehouse_id.exists' => 'Warehouse yang dipilih tidak valid.', + 'address.string' => 'Kolom address harus berupa teks.', + 'email_verified_at.date' => 'Format tanggal email_verified_at tidak valid.', + 'password.required' => 'Kolom password wajib diisi.', + 'password.string' => 'Kolom password harus berupa teks.', + 'password.min' => 'Kolom password minimal harus :min karakter.', + 'password.max' => 'Kolom password tidak boleh lebih dari :max karakter.', + 'created_by.string' => 'Kolom created_by harus berupa teks.', + 'created_by.max' => 'Kolom created_by tidak boleh lebih dari :max karakter.', + 'updated_by.string' => 'Kolom updated_by harus berupa teks.', + 'updated_by.max' => 'Kolom updated_by tidak boleh lebih dari :max karakter.', + ]; + } +} diff --git a/app/Http/Requests/ValidasiCreateWarehouse.php b/app/Http/Requests/ValidasiCreateWarehouse.php new file mode 100644 index 0000000..148226b --- /dev/null +++ b/app/Http/Requests/ValidasiCreateWarehouse.php @@ -0,0 +1,45 @@ +|string> + */ + public function rules(): array + { + return [ + 'name' => 'required|string|max:32', + 'description' => 'required|string|max:255', + 'address' => 'required|string|max:255', + ]; + } + + public function messages() + { + return [ + 'name.required' => 'Kolom nama wajib diisi.', + 'name.string' => 'Kolom nama harus berupa teks.', + 'name.max' => 'Kolom nama tidak boleh lebih dari :max karakter.', + 'description.required' => 'Kolom deskripsi wajib diisi.', + 'description.string' => 'Kolom deskripsi harus berupa teks.', + 'description.max' => 'Kolom deskripsi tidak boleh lebih dari :max karakter.', + 'address.required' => 'Kolom alamat wajib diisi.', + 'address.string' => 'Kolom alamat harus berupa teks.', + 'address.max' => 'Kolom alamat tidak boleh lebih dari :max karakter.', + ]; + } +} diff --git a/app/Http/Requests/ValidasiUpdateWarehouse.php b/app/Http/Requests/ValidasiUpdateWarehouse.php new file mode 100644 index 0000000..995937e --- /dev/null +++ b/app/Http/Requests/ValidasiUpdateWarehouse.php @@ -0,0 +1,45 @@ +|string> + */ + public function rules(): array + { + return [ + 'name' => 'required|string|max:32', + 'description' => 'required|string|max:255', + 'address' => 'required|string|max:255', + ]; + } + + public function messages() + { + return [ + 'name.required' => 'Kolom nama wajib diisi.', + 'name.string' => 'Kolom nama harus berupa teks.', + 'name.max' => 'Kolom nama tidak boleh lebih dari :max karakter.', + 'description.required' => 'Kolom deskripsi wajib diisi.', + 'description.string' => 'Kolom deskripsi harus berupa teks.', + 'description.max' => 'Kolom deskripsi tidak boleh lebih dari :max karakter.', + 'address.required' => 'Kolom alamat wajib diisi.', + 'address.string' => 'Kolom alamat harus berupa teks.', + 'address.max' => 'Kolom alamat tidak boleh lebih dari :max karakter.', + ]; + } +} diff --git a/app/Models/Customer.php b/app/Models/Customer.php index 2e5da6f..7ef3cb5 100644 --- a/app/Models/Customer.php +++ b/app/Models/Customer.php @@ -15,11 +15,7 @@ class Customer extends Model 'name', 'code_customer', 'lot_no', - 'nip', - 'no_hp', - 'tgl_lahir', - 'jenis_kelamin', - 'agama', + 'no_tlp', 'address', 'created_by', 'updated_by', diff --git a/database/migrations/2023_10_23_073314_create_m_warehouses_table.php b/database/migrations/2023_10_23_073314_create_m_warehouses_table.php index a0170a9..50c9bae 100644 --- a/database/migrations/2023_10_23_073314_create_m_warehouses_table.php +++ b/database/migrations/2023_10_23_073314_create_m_warehouses_table.php @@ -13,7 +13,7 @@ return new class extends Migration { Schema::create('m_warehouses', function (Blueprint $table) { $table->id(); - $table->string('name', 200)->nullable(); + $table->string('name', 32)->nullable(); $table->text('description')->nullable(); $table->text('address')->nullable(); $table->timestamps(); diff --git a/database/migrations/2023_10_23_075245_create_users_table.php b/database/migrations/2023_10_23_075245_create_users_table.php index bbfbdcd..2e35b64 100644 --- a/database/migrations/2023_10_23_075245_create_users_table.php +++ b/database/migrations/2023_10_23_075245_create_users_table.php @@ -14,28 +14,28 @@ return new class extends Migration { Schema::create('users', function (Blueprint $table) { $table->id(); - $table->string('username', 50)->nullable(); - $table->string('fullname', 255)->nullable(); + + $table->string('username', 32)->nullable(); + $table->string('fullname', 50)->nullable(); $table->string('nip', 20)->nullable(); - $table->string('email', 255)->nullable(); - $table->string('no_hp', 20)->nullable(); - $table->string('divisi', 255)->nullable(); + $table->string('email', 45)->nullable(); + $table->string('no_hp', 15)->nullable(); + $table->string('divisi', 100)->nullable(); $table->date('tgl_lahir')->nullable(); - $table->string('jenis_kelamin', 30)->nullable(); - $table->string('agama', 30)->nullable(); $table->string('foto', 255)->nullable(); - // $table->bigInteger('role_id')->unsigned()->nullable(); - // $table->foreign('role_id')->references('id')->on('m_roles')->onDelete('set null'); + $table->string('jenis_kelamin', 20)->nullable(); + $table->string('agama', 15)->nullable(); $table->foreignId('role_id')->constrained('m_roles')->onDelete('cascade'); $table->bigInteger('warehouse_id')->unsigned()->nullable(); $table->foreign('warehouse_id')->references('id')->on('m_warehouses')->onDelete('set null'); $table->text('address')->nullable(); $table->timestamp('email_verified_at')->nullable(); $table->string('password', 255)->nullable(); + $table->string('created_by', 50)->nullable(); + $table->string('updated_by', 50)->nullable(); + $table->rememberToken(); $table->timestamps(); - $table->string('created_by', 200)->nullable(); - $table->string('updated_by', 200)->nullable(); $table->softDeletes(); }); } diff --git a/database/migrations/2023_10_28_080457_create_customers_table.php b/database/migrations/2023_10_28_080457_create_customers_table.php index 2625558..d65cd05 100644 --- a/database/migrations/2023_10_28_080457_create_customers_table.php +++ b/database/migrations/2023_10_28_080457_create_customers_table.php @@ -13,19 +13,15 @@ return new class extends Migration { Schema::create('customers', function (Blueprint $table) { $table->id(); - $table->string('name', 200); - $table->string('code_customer', 50); + $table->string('name', 50); + $table->string('code_customer', 15); $table->string('lot_no', 50); - $table->string('nip', 20)->nullable(); - $table->string('no_hp', 20)->nullable(); - $table->date('tgl_lahir')->nullable(); - $table->string('jenis_kelamin', 30)->nullable(); - $table->string('agama', 30)->nullable(); + $table->string('no_tlp', 20)->nullable(); $table->text('address')->nullable(); $table->timestamps(); $table->softDeletes(); - $table->string('created_by', 200)->nullable(); - $table->string('updated_by', 200)->nullable(); + $table->string('created_by', 50)->nullable(); + $table->string('updated_by', 50)->nullable(); }); } diff --git a/database/seeders/Customer.php b/database/seeders/Customer.php index 206b1b8..e776fa1 100644 --- a/database/seeders/Customer.php +++ b/database/seeders/Customer.php @@ -14,28 +14,20 @@ class Customer extends Seeder public function run(): void { DB::table('customers')->insert([ - 'name' => 'Gunawan', - 'code_customer' => 'G', - 'lot_no' => 'CWT', - 'nip' => '1234567890987654', - 'no_hp' => '085159079010', - // 'tgl_lahir' => '19-06-2001', - 'jenis_kelamin' => 'Laki-Laki', - 'agama' => 'Islam', - 'address' => 'CIwatu', + 'name' => 'DHARMA', + 'code_customer' => 'DPM', + 'lot_no' => 'JKT23', + 'no_tlp' => '02122344', + 'address' => 'Jalan Raya Ciwatu', 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); DB::table('customers')->insert([ - 'name' => 'Andra Ryandra', - 'code_customer' => 'AR', - 'lot_no' => 'KA', - 'nip' => '1234567890987', - 'no_hp' => '085159079011', - // 'tgl_lahir' => '19-06-2001', - 'jenis_kelamin' => 'Laki-Laki', - 'agama' => 'Islam', - 'address' => 'CIwatu', + 'name' => 'ADHI CHANDRA', + 'code_customer' => 'ACJ', + 'lot_no' => 'JKT23', + 'no_tlp' => '02198765', + 'address' => 'Jalan Raya Gelarmendala', 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); diff --git a/database/seeders/RoleSeeder.php b/database/seeders/RoleSeeder.php index b09ae13..19d9a3f 100644 --- a/database/seeders/RoleSeeder.php +++ b/database/seeders/RoleSeeder.php @@ -16,15 +16,15 @@ class RoleSeeder extends Seeder // Role Admin m_role::create([ 'name' => 'Admin', - 'description' => 'Peran admin sistem', + 'description' => 'admin sistem', 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); // Role User m_role::create([ - 'name' => 'User', - 'description' => 'Peran pengguna biasa', + 'name' => 'Operator', + 'description' => 'Operator sistem', 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index 0b399e0..2fda37a 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -15,10 +15,10 @@ class UserSeeder extends Seeder { User::create([ 'username' => 'admin', - 'fullname' => 'Admin User', - 'nip' => '12345', + 'fullname' => 'Admin System', + 'nip' => '1234567890123456', 'email' => 'admin@gmail.com', - 'no_hp' => '1234567890', + 'no_hp' => '085159079010', 'divisi' => 'Admin Division', 'tgl_lahir' => '1990-01-01', 'jenis_kelamin' => 'Laki-laki', @@ -26,7 +26,7 @@ class UserSeeder extends Seeder 'foto' => '', // Ganti dengan nama berkas foto jika diperlukan 'role_id' => 1, // Ganti dengan ID peran yang sesuai 'warehouse_id' => 1, // Ganti dengan ID gudang yang sesuai - 'address' => 'Alamat Admin', + 'address' => 'Jalan Ciwatu', 'email_verified_at' => now(), 'password' => bcrypt('admin'), 'created_by' => 'Seeder', @@ -35,21 +35,21 @@ class UserSeeder extends Seeder // User lainnya User::create([ - 'username' => 'user1', - 'fullname' => 'User Satu', - 'nip' => '54321', - 'email' => 'user1@gmail.com', - 'no_hp' => '9876543210', - 'divisi' => 'Divisi Satu', + 'username' => 'Operator', + 'fullname' => 'Operator System', + 'nip' => '6543210987654321', + 'email' => 'operator@gmail.com', + 'no_hp' => '087779767603', + 'divisi' => 'Operator Gudang', 'tgl_lahir' => '1985-05-15', 'jenis_kelamin' => 'Perempuan', - 'agama' => 'Kristen', + 'agama' => 'Islam', 'foto' => '', // Ganti dengan nama berkas foto jika diperlukan 'role_id' => 2, // Ganti dengan ID peran yang sesuai 'warehouse_id' => 2, // Ganti dengan ID gudang yang sesuai - 'address' => 'Alamat User Satu', + 'address' => 'Jalan Gelarmendala', 'email_verified_at' => now(), - 'password' => bcrypt('user1'), + 'password' => bcrypt('operator'), 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 49d4345..b2d436f 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -40,7 +40,7 @@
-

Welcome Back!

+

Selamat Datang!

@csrf @@ -49,16 +49,26 @@ aria-describedby="emailHelp" name="email" value="{{ old('email') }}" required autofocus autocomplete="username" placeholder="Masukan Email anda"> + @if ($errors->has('email')) +
+ {{ $errors->first('email') }} +
+ @endif
+ @if ($errors->has('password')) +
+ {{ $errors->first('password') }} +
+ @endif
- + @@ -79,9 +89,9 @@
diff --git a/resources/views/dashboard/Master_Data/Customer/create.blade.php b/resources/views/dashboard/Master_Data/Customer/create.blade.php index 81b0656..9857721 100644 --- a/resources/views/dashboard/Master_Data/Customer/create.blade.php +++ b/resources/views/dashboard/Master_Data/Customer/create.blade.php @@ -1,5 +1,6 @@ @extends('layouts.main') @section('content') + @include('layouts.components.alert-prompt')
@@ -24,36 +25,9 @@ - - - - - - - - - - - - - - + + diff --git a/resources/views/dashboard/Master_Data/Customer/edit.blade.php b/resources/views/dashboard/Master_Data/Customer/edit.blade.php index 08b0f80..4c2be5d 100644 --- a/resources/views/dashboard/Master_Data/Customer/edit.blade.php +++ b/resources/views/dashboard/Master_Data/Customer/edit.blade.php @@ -26,38 +26,9 @@ - - - - - - - - - - - - - - + + diff --git a/resources/views/dashboard/Master_Data/Customer/index.blade.php b/resources/views/dashboard/Master_Data/Customer/index.blade.php index 6436634..f980ebd 100644 --- a/resources/views/dashboard/Master_Data/Customer/index.blade.php +++ b/resources/views/dashboard/Master_Data/Customer/index.blade.php @@ -1,10 +1,11 @@ @extends('layouts.main') @section('content') + @include('layouts.components.alert-prompt')
-
Data User
+
Data Customer
@@ -21,7 +22,7 @@ No Nama Kode Customer - No. HP + No. Telepon Alamat Action @@ -35,7 +36,7 @@ {{ $nocustomer++ }} {{ $data_customer->name }} {{ $data_customer->code_customer }} - {{ $data_customer->no_hp }} + {{ $data_customer->no_tlp }} {{ $data_customer->address }} diff --git a/resources/views/dashboard/Master_Data/Customer/show.blade.php b/resources/views/dashboard/Master_Data/Customer/show.blade.php index 12582b7..b128760 100644 --- a/resources/views/dashboard/Master_Data/Customer/show.blade.php +++ b/resources/views/dashboard/Master_Data/Customer/show.blade.php @@ -11,39 +11,20 @@
- + - + - - - - - - - - - - - - - - + + - +
Kembali diff --git a/resources/views/dashboard/Master_Data/User/create.blade.php b/resources/views/dashboard/Master_Data/User/create.blade.php index 8d8d8b6..d65bb89 100644 --- a/resources/views/dashboard/Master_Data/User/create.blade.php +++ b/resources/views/dashboard/Master_Data/User/create.blade.php @@ -9,6 +9,11 @@
+ + + @include('layouts.components.alert-prompt') + +
@csrf diff --git a/resources/views/dashboard/Master_Data/User/index.blade.php b/resources/views/dashboard/Master_Data/User/index.blade.php index 67c0976..450bc33 100644 --- a/resources/views/dashboard/Master_Data/User/index.blade.php +++ b/resources/views/dashboard/Master_Data/User/index.blade.php @@ -1,5 +1,6 @@ @extends('layouts.main') @section('content') + @include('layouts.components.alert-prompt')
diff --git a/resources/views/dashboard/Master_Data/Warehouse/index.blade.php b/resources/views/dashboard/Master_Data/Warehouse/index.blade.php index cb453f8..f271f21 100644 --- a/resources/views/dashboard/Master_Data/Warehouse/index.blade.php +++ b/resources/views/dashboard/Master_Data/Warehouse/index.blade.php @@ -1,67 +1,66 @@ @extends('layouts.main') @section('title', 'Warehouse') @section('content') -
-
-
-
-
-
Data Warehouse
-
-
- - Tambah Data Warehouse - - -
+ + @include('layouts.components.alert-prompt') + +
+
+
+
+
Data Warehouse
+
+
+ + Tambah Data Warehouse + +
-
-
- - + +
+
+
+ + + + + + + + + + + @php + $nowarehouses = 1; + @endphp + @foreach ($warehouses as $data) - - - - - + + + + + - - - @php - $nowarehouses = 1; - @endphp - @foreach ($warehouses as $data) - - - - - - - - @endforeach - -
No.Nama WarehouseDeskripsiAlamatAction
No.Nama WarehouseDeskripsiAlamatAction{{ $nowarehouses++ }}{{ $data->name }}{{ $data->description }}{{ $data->address }} + + + + + @csrf + @method('DELETE') + + +
{{ $nowarehouses++ }}{{ $data->name }}{{ $data->description }}{{ $data->address }} - - - -
- @csrf - @method('DELETE') - -
-
-
- + @endforeach + +
+
diff --git a/resources/views/layouts/components/alert-prompt.blade.php b/resources/views/layouts/components/alert-prompt.blade.php new file mode 100644 index 0000000..60e7862 --- /dev/null +++ b/resources/views/layouts/components/alert-prompt.blade.php @@ -0,0 +1,26 @@ +@if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+@endif + +@if (Session::has('success')) + +@endif + + + diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 8efa85b..605164c 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -28,7 +28,7 @@
- @if (session()->has('success')) + {{-- @if (session()->has('success'))
{{ session()->get('success') }}
@@ -36,7 +36,7 @@
X {{ session()->get('error') }}
- @endif + @endif --}} @yield('content')