diff --git a/app/Exports/StokOpNameExport.php b/app/Exports/StokOpNameExport.php index 8c98351..51201d4 100644 --- a/app/Exports/StokOpNameExport.php +++ b/app/Exports/StokOpNameExport.php @@ -12,12 +12,14 @@ class StokOpNameExport implements FromCollection, WithHeadings protected $stokOpnames; protected $todayStokOpnames; protected $yesterdayStokOpnames; + protected $gudangStokOpnames; - public function __construct($stokOpnames, $todayStokOpnames, $yesterdayStokOpnames) + public function __construct($stokOpnames, $todayStokOpnames, $yesterdayStokOpnames, $gudangStokOpnames) { $this->stokOpnames = $stokOpnames; $this->todayStokOpnames = $todayStokOpnames; $this->yesterdayStokOpnames = $yesterdayStokOpnames; + $this->gudangStokOpnames = $gudangStokOpnames; } public function collection() @@ -36,6 +38,11 @@ class StokOpNameExport implements FromCollection, WithHeadings ->where('tipe_peti_id', $data_StokOpname->tipe_peti_id) ->first(); + $gudangData = $this->gudangStokOpnames + ->where('customer_id', $data_StokOpname->customer_id) + ->where('tipe_peti_id', $data_StokOpname->tipe_peti_id) + ->keyBy('warehouse_id'); + $data->push([ 'No' => $nomor++, 'Customer' => $data_StokOpname->customer->name, @@ -44,11 +51,10 @@ class StokOpNameExport implements FromCollection, WithHeadings 'Bagging Stok' => $yesterdayStokOpname ? $yesterdayStokOpname->total_petis : '-', 'Add' => $todayStokOpname ? $todayStokOpname->total_petis : '0', 'Total' => $data_StokOpname->total_petis ?? '0', - 'DI ISTW' => 'Belum', - 'Gudang A' => 'Belum', - 'Gudang B' => 'Belum', - 'Gudang C' => 'Belum', - 'Stok Opname' => 'Belum', + 'Jakarta' => $gudangData->get(1)->total_petis ?? '0', + 'Bekasi' => $gudangData->get(2)->total_petis ?? '0', + 'Semarang' => $gudangData->get(3)->total_petis ?? '0', + 'Surabaya' => $gudangData->get(4)->total_petis ?? '0', 'Total Stok' => $data_StokOpname->total_petis ?? '0', ]); } @@ -66,11 +72,10 @@ class StokOpNameExport implements FromCollection, WithHeadings 'Bagging Stok', 'Add', 'Total', - 'DI ISTW', - 'Gudang A', - 'Gudang B', - 'Gudang C', - 'Stok Opname', + 'Jakarta', + 'Bekasi', + 'Semarang', + 'Surabaya', 'Total Stok', ]; } diff --git a/app/Http/Controllers/Auth/RedirectAuthController.php b/app/Http/Controllers/Auth/RedirectAuthController.php index fa5d439..6cec6ab 100644 --- a/app/Http/Controllers/Auth/RedirectAuthController.php +++ b/app/Http/Controllers/Auth/RedirectAuthController.php @@ -11,12 +11,13 @@ class RedirectAuthController extends Controller public function redirectAuth() { if (Auth::check()) { - if (Auth::user()->role_id == 1) { - // Admin - return redirect()->route('dashboard.home.admin'); - } else { - return redirect()->route('dashboard.home.user'); - } + return redirect()->route('dashboard.home.admin'); + // if (Auth::user()->role_id == 1) { + // // Admin + // return redirect()->route('dashboard.home.admin'); + // } else { + // return redirect()->route('dashboard.home.user'); + // } } else { // Tidak ada akun atau kesalahan login return redirect()->route('login')->with('error', 'Kesalahan email atau password.'); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 3a378d5..f8bba8e 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Auth; class HomeController extends Controller { - + //halaman Admin public function index() { $data = [ @@ -20,6 +20,21 @@ class HomeController extends Controller return view('dashboard.index', $data); } + + //halaman User + // public function indexUser() + // { + // $data = [ + // 'reminder' => \App\Models\asset_status::whereNull('enter_at')->count(), + // 'jumlahPeti' => \App\Models\Peti::count(), + // 'jumlahPeminjaman' => \App\Models\asset_status::count(), + // 'jumlahPengembalian' => \App\Models\asset_status::whereNotNull('enter_at')->count(), + // 'active' => 'menu-admin', + // ]; + + // return view('pages.user.index', $data); + // } + public function notification() { $data = [ @@ -32,17 +47,6 @@ class HomeController extends Controller return view('layouts.navbar_list', $data); } - public function indexUser() - { - $data = [ - 'reminder' => \App\Models\asset_status::whereNull('enter_at')->count(), - 'jumlahPeminjaman' => \App\Models\asset_status::count(), - 'jumlahPengembalian' => \App\Models\asset_status::whereNotNull('enter_at')->count(), - 'active' => 'menu-user', - ]; - - return view('pages.user.index', $data); - } //data pertahun untuk bar chart public function generateChartData() diff --git a/app/Http/Controllers/PeminjamanController.php b/app/Http/Controllers/PeminjamanController.php index 8c8d1d5..3ef1879 100644 --- a/app/Http/Controllers/PeminjamanController.php +++ b/app/Http/Controllers/PeminjamanController.php @@ -39,18 +39,12 @@ class PeminjamanController extends Controller $subquery->where('status', '!=', 0); })->orWhereDoesntHave('assetStatuses'); })->where('status', 'aktif')->get(); - // $petiTransfer = Peti::where('id', $PetiId) - // ->leftJoin('category', 'product.category', '=', 'category.id') - // ->select('product.id','category.name')->first(); $data = [ // 'peti' => Peti::all(), 'peminjaman' => asset_status::get(), 'warehouse' => m_warehouse::get(), 'peti_block' => $petiWithStatusNotZeroOrEmptyAndActive, - // 'peti_block' => Peti::whereNotIn('id', asset_status::where('status', 0)->pluck('peti_id')->toArray()) - // ->where('status', 'AKTIF') // Sesuaikan dengan nama kolom yang benar - // ->get(), 'customer' => Customer::get(), 'existingPeti' => asset_status::pluck('peti_id')->toArray(), 'active' => 'menu-peminjaman', diff --git a/app/Http/Controllers/StokOpNameController.php b/app/Http/Controllers/StokOpNameController.php index 7b87176..65eb5af 100644 --- a/app/Http/Controllers/StokOpNameController.php +++ b/app/Http/Controllers/StokOpNameController.php @@ -71,6 +71,12 @@ class StokOpNameController extends Controller ->groupBy('customer_id', 'tipe_peti_id') ->get(); - return Excel::download(new StokOpNameExport($stokOpnames, $todayStokOpnames, $yesterdayStokOpnames), 'stok_opname.xlsx'); + // Total Peti Berdasarkan Gudang + $gudangStokOpnames = Peti::with('customer', 'tipe_peti', 'warehouse') + ->select('customer_id', 'tipe_peti_id', 'warehouse_id', DB::raw('COUNT(*) as total_petis')) + ->groupBy('customer_id', 'tipe_peti_id', 'warehouse_id') + ->get(); + + return Excel::download(new StokOpNameExport($stokOpnames, $todayStokOpnames, $yesterdayStokOpnames, $gudangStokOpnames), 'stok_opname.xlsx'); } } diff --git a/resources/views/dashboard/Disposal/index.blade.php b/resources/views/dashboard/Disposal/index.blade.php index 29478d4..6dc3865 100644 --- a/resources/views/dashboard/Disposal/index.blade.php +++ b/resources/views/dashboard/Disposal/index.blade.php @@ -10,69 +10,73 @@ } @include('layouts.components.alert-prompt') -
No | -Kode Peti | -Nama Customer | -Tanggal Disposal | -Alasan Disposal | -Status Peti | -Action | -
---|
{{ $nodisposal++ }} | -{{ $data_disposal->peti->fix_lot }} | -{{ $data_disposal->customer->name }} | -{{ \Carbon\Carbon::parse($data_disposal->date_disposal)->format('d/m/Y') }} | -{{ $data_disposal->description }} | -{{ $data_disposal->status_disposal }} | -- - - - - | +No | +Kode Peti | +Nama Customer | +Tanggal Disposal | +Alasan Disposal | +Status Peti | +Action |
---|
Data Kosong
+ @endforelse + +No | +Kode Peti | +Nama Customer | +Kode | +Tgl Peminjaman | +PJ Peminjaman | +WH Peminjam | +|||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
No | -Kode Peti | -Nama Customer | -Kode | -Tgl Peminjaman | -PJ Peminjaman | -WH Peminjam | +{{ $no_peminjaman++ }} | +{{ $data_peminjaman->peti->fix_lot }} | +{{ $data_peminjaman->peti->customer->name }} | +{{ $data_peminjaman->peti->customer->code_customer }} - + {{ $data_peminjaman->peti->tipe_peti->type }} | +{{ \Carbon\Carbon::parse($data_peminjaman->exit_at)->format('d/m/Y') }} | +{{ $data_peminjaman->exit_pic }} | +{{ $data_peminjaman->warehouse->name }} |
{{ $no_peminjaman++ }} | -{{ $data_peminjaman->peti->fix_lot }} | -{{ $data_peminjaman->peti->customer->name }} | -{{ $data_peminjaman->peti->customer->code_customer }} - - {{ $data_peminjaman->peti->tipe_peti->type }} | -{{ \Carbon\Carbon::parse($data_peminjaman->exit_at)->format('d/m/Y') }} | -{{ $data_peminjaman->exit_pic }} | -{{ $data_peminjaman->warehouse->name }} | -
Data Kosong
+ @endforelse + +No | -Kode Peti | -Customer | -Tgl Peinjaman | -Estimasi Pengembalian | -PJ Peminjaman | -Asal WH Peminjaman | -Tgl Pengembalian | -PJ Pengembalian | -Tujuan WH Pengembalian | -Kondisi Peti | -Status | -
---|---|---|---|---|---|---|---|---|---|---|---|
{{ $no_peminjaman++ }} | -{{ $data->peti->fix_lot }} | -{{ $data->peti->customer->name }} | -{{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }} | -{{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }} | -{{ $data->exit_pic }} | -
- @if ($data->exit_warehouse)
- {{ $data->warehouse->name }}
- @else
- - - @endif - |
-
- @if ($data->enter_at)
- {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }}
- @else
- - - @endif - |
-
- @if ($data->enter_pic)
- {{ $data->enter_pic }}
- @else
- - - @endif - |
-
- @if ($data->enter_warehouse)
- {{ $data->warehouseEnter->name }}
- @else
- - - @endif - |
-
- @if ($data->kondisi_peti)
- {{ $data->kondisi_peti->nama_kondisi }}
- @else
- - - @endif - |
- - @if ($data->enter_warehouse === null) - Not Return - @else - Return - @endif - | -
No | +Kode Peti | +Customer | +Tgl Peinjaman | +Estimasi Pengembalian | +PJ Peminjaman | +Asal WH Peminjaman | +Tgl Pengembalian | +PJ Pengembalian | +Tujuan WH Pengembalian | +Kondisi Peti | +Status | +
---|---|---|---|---|---|---|---|---|---|---|---|
{{ $no_peminjaman++ }} | +{{ $data->peti->fix_lot }} | +{{ $data->peti->customer->name }} | +{{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }} | +{{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }} | +{{ $data->exit_pic }} | +
+ @if ($data->exit_warehouse)
+ {{ $data->warehouse->name }}
+ @else
+ - + @endif + |
+
+ @if ($data->enter_at)
+ {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }}
+ @else
+ - + @endif + |
+
+ @if ($data->enter_pic)
+ {{ $data->enter_pic }}
+ @else
+ - + @endif + |
+
+ @if ($data->enter_warehouse)
+ {{ $data->warehouseEnter->name }}
+ @else
+ - + @endif + |
+
+ @if ($data->kondisi_peti)
+ {{ $data->kondisi_peti->nama_kondisi }}
+ @else
+ - + @endif + |
+ + @if ($data->enter_warehouse === null) + Not Return + @else + Return + @endif + | +
No | -Kondisi Peti | -Deskripsi | -Action | -
---|
{{ $nokondisi++ }} | -{{ $data_kondisiPeti->nama_kondisi }} | -{{ $data_kondisiPeti->deskripsi_kondisi }} | -- - - - - | +No | +Kondisi Peti | +Deskripsi | +Action |
---|
Data Kosong
+ @endforelse + +Data Kosong
diff --git a/resources/views/dashboard/Master_Data/Report/Stok_opname/index.blade.php b/resources/views/dashboard/Master_Data/Report/Stok_opname/index.blade.php index 26ce130..e57f546 100644 --- a/resources/views/dashboard/Master_Data/Report/Stok_opname/index.blade.php +++ b/resources/views/dashboard/Master_Data/Report/Stok_opname/index.blade.php @@ -9,7 +9,6 @@ white-space: nowrap; } - {{--Halaman Stop Op Name
--}}No | -Kode Peti | -Nama Customer | -Kode | -Tgl Peminjaman | -PJ Peminjaman | -Tujuan WH Peminjam | -Action | -
---|---|---|---|---|---|---|---|
{{ $no_peminjaman++ }} | -{{ $data_peminjaman->peti->fix_lot }} | -{{ $data_peminjaman->peti->customer->name }} | -{{ $data_peminjaman->peti->customer->code_customer }} - - {{ $data_peminjaman->peti->tipe_peti->type }} | -{{ \Carbon\Carbon::parse($data_peminjaman->exit_at)->format('d/m/Y') }} | -{{ $data_peminjaman->exit_pic }} | -{{ $data_peminjaman->warehouse->name }} | -- - - - - - - - | -
No | +Kode Peti | +Nama Customer | +Kode | +Tgl Peminjaman | +PJ Peminjaman | +Tujuan WH Peminjam | +Action | +
---|---|---|---|---|---|---|---|
{{ $no_peminjaman++ }} | +{{ $data_peminjaman->peti->fix_lot }} | +{{ $data_peminjaman->peti->customer->name }} | +{{ $data_peminjaman->peti->customer->code_customer }} - + {{ $data_peminjaman->peti->tipe_peti->type }} | +{{ \Carbon\Carbon::parse($data_peminjaman->exit_at)->format('d/m/Y') }} | +{{ $data_peminjaman->exit_pic }} | +{{ $data_peminjaman->warehouse->name }} | ++ + + + + + + + | +
No | -Kode Peti | -Customer | -Tgl Peinjaman | -Estimasi Pengembalian | -PJ Peminjaman | -WH Peminjam | -Tgl Pengembalian | -PJ Pengembalian | -WH Pengembalian | -Kondisi Peti | -Status | -Action | -
---|---|---|---|---|---|---|---|---|---|---|---|---|
{{ $no_peminjaman++ }} | -{{ $data->peti->fix_lot }} | -{{ $data->peti->customer->name }} | -{{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }} | -{{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }} | -{{ $data->exit_pic }} | -
- @if ($data->exit_warehouse)
- {{ $data->warehouse->name }}
- @else
- - - @endif - |
-
- @if ($data->enter_at)
- {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }}
- @else
- - - @endif - |
-
- @if ($data->enter_pic)
- {{ $data->enter_pic }}
- @else
- - - @endif - |
-
- @if ($data->enter_warehouse)
- {{ $data->warehouseEnter->name }}
- @else
- - - @endif - |
-
- @if ($data->kondisi_peti)
- {{ $data->kondisi_peti->nama_kondisi }}
- @else
- - - @endif - |
- - @if ($data->enter_warehouse === null) - Not Return - @else - Return - @endif - | -- - - - | -
No | +Kode Peti | +Customer | +Tgl Peinjaman | +Estimasi Pengembalian | +PJ Peminjaman | +WH Peminjam | +Tgl Pengembalian | +PJ Pengembalian | +WH Pengembalian | +Kondisi Peti | +Status | +Action | +
---|---|---|---|---|---|---|---|---|---|---|---|---|
{{ $no_peminjaman++ }} | +{{ $data->peti->fix_lot }} | +{{ $data->peti->customer->name }} | +{{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }} | +{{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }} | +{{ $data->exit_pic }} | +
+ @if ($data->exit_warehouse)
+ {{ $data->warehouse->name }}
+ @else
+ - + @endif + |
+
+ @if ($data->enter_at)
+ {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }}
+ @else
+ - + @endif + |
+
+ @if ($data->enter_pic)
+ {{ $data->enter_pic }}
+ @else
+ - + @endif + |
+
+ @if ($data->enter_warehouse)
+ {{ $data->warehouseEnter->name }}
+ @else
+ - + @endif + |
+
+ @if ($data->kondisi_peti)
+ {{ $data->kondisi_peti->nama_kondisi }}
+ @else
+ - + @endif + |
+ + @if ($data->enter_warehouse === null) + Not Return + @else + Return + @endif + | ++ + + + | +
Data Kosong
diff --git a/resources/views/pages/user/Master_Data/Manajemen_Peti/Peti/index.blade.php b/resources/views/pages/user/Master_Data/Manajemen_Peti/Peti/index.blade.php index 63f991c..56d33dd 100644 --- a/resources/views/pages/user/Master_Data/Manajemen_Peti/Peti/index.blade.php +++ b/resources/views/pages/user/Master_Data/Manajemen_Peti/Peti/index.blade.php @@ -1,14 +1,9 @@Data Kosong
diff --git a/resources/views/pages/user/Master_Data/Manajemen_Peti/Type_peti/index.blade.php b/resources/views/pages/user/Master_Data/Manajemen_Peti/Type_peti/index.blade.php deleted file mode 100644 index 932082b..0000000 --- a/resources/views/pages/user/Master_Data/Manajemen_Peti/Type_peti/index.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -No | -Tipe Peti | -Ukuran Peti | -Deskripsi Peti | -Action | -
---|---|---|---|---|
{{ $notype++ }} | -{{ $data_typepeti->type }} | -{{ $data_typepeti->size_peti }} | -{{ $data_typepeti->description }} | -- - - - - - - - | -
No | -Nama Role | +No | +Kondisi Peti | Deskripsi | |
---|---|---|---|---|---|
{{ $norole++ }} | -{{ $data_role->name }} | -{{ $data_role->description }} | +{{ $nokondisi++ }} | +{{ $data_kondisiPeti->nama_kondisi }} | +{{ $data_kondisiPeti->deskripsi_kondisi }} |
No | +Tipe Peti | +Ukuran Peti | +Deskripsi Peti | +
---|---|---|---|
{{ $notype++ }} | +{{ $data_typepeti->type }} | +{{ $data_typepeti->size_peti }} | +{{ $data_typepeti->description }} | +
No | -Nama | -No. HP | -Alamat | -Ditugaskan | -Action | -|
---|---|---|---|---|---|---|
No | -Nama | -No. HP | -Alamat | -Ditugaskan | -Action | -|
{{ $noUser++ }} | -{{ $data->fullname }} | -{{ $data->email }} | -{{ isset($data->no_hp) ? $data->no_hp : '-' }} | -{{ isset($data->address) ? $data->address : '-' }} | -{{ $data->warehouse->name }} | -- - - - | -
No | -Kode Peti | -Nama Customer | -Tgl Peminjaman | -PJ Peminjaman | -Asal Gudang | -Action | -
---|---|---|---|---|---|---|
{{ $no_peminjaman++ }} | -{{ $data_peminjaman->peti->customer->code_customer }} - - {{ $data_peminjaman->peti->tipe_peti->type }} | -{{ $data_peminjaman->peti->customer->name }} | -{{ \Carbon\Carbon::parse($data_peminjaman->exit_at)->format('d/m/Y') }} | -{{ $data_peminjaman->exit_pic }} | -{{ $data_peminjaman->warehouse->name }} | -- - - - - | -
No | -Kode Peti | -Tgl Peinjaman | -Estimasi Pengembalian | -PJ Peminjaman | -Asal WH Peminjaman | -Tgl Pengembalian | -PJ Pengembalian | -Tujuan WH Pengembalian | -Kondisi Peti | -Status | -Action | -
---|---|---|---|---|---|---|---|---|---|---|---|
{{ $no_peminjaman++ }} | -{{ $data->peti->customer->code_customer }} - - {{ $data->peti->tipe_peti->type }} | -{{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }} | -{{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }} | -{{ $data->exit_pic }} | -{{ $data->warehouse->name }} | -
- @if ($data->enter_at)
- {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }}
- @else
- - - @endif - |
-
- @if ($data->enter_pic)
- {{ $data->enter_pic }}
- @else
- - - @endif - |
-
- @if ($data->enter_warehouse)
- {{ $data->warehouse->name }}
- @else
- - - @endif - |
-
- @if ($data->kondisi_peti)
- {{ $data->kondisi_peti }}
- @else
- - - @endif - |
- - @if ($data->enter_warehouse === null) - Not Return - @else - Return - @endif - | -- - - - | -
No | +Kode Peti | +Nama Customer | +Tanggal Disposal | +Alasan Disposal | +Status Peti | +
---|---|---|---|---|---|
{{ $nodisposal++ }} | +{{ $data_disposal->peti->fix_lot }} | +{{ $data_disposal->customer->name }} | +{{ \Carbon\Carbon::parse($data_disposal->date_disposal)->format('d/m/Y') }} | +{{ $data_disposal->description }} | +{{ $data_disposal->status_disposal }} | +