KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add scanmarhun, senarai terima marhun

Browse Source
This commit is contained in:
Amir
2022-09-08 09:25:36 +08:00
parent 325944368a
commit afbfce017b
8 changed files with 486 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+111 -2
View File
@@ -22,6 +22,7 @@ use App\Models\LelKarat_temp;
use App\Models\Pengesahan;
use App\Models\GadaiMarhun;
use App\Models\ScanMarhun;
use App\Models\TangguhLelong;
use Carbon\Carbon;
@@ -463,6 +464,35 @@ class MarhunController extends Controller
}
public function senarailelongscan(Request $request){
$user = Auth::user();
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->where('cawangan.caw_code', $user->kodcaw)
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
}
return view('marhun.senarailelongscan',compact('lelong', 'arrayinfo'));
}
public function semak($id, $lelong_id)
{
//$id => lelongbid_id
@@ -1134,8 +1164,87 @@ class MarhunController extends Controller
}
public function scanbarcode() {
return view('marhun.scanbarcode');
public function terimaserahmarhun() {
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
return view('marhun.terimaserahmarhun');
}
public function listScanBarcode($lelong_id)
{
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
->where('caw_id', '=', $caw->id)
->get();
$senaraiScanKeluar = ScanMarhun::where('lelong_id', '=', $lelong_id)
->where('kodcaw', '=', $caw->caw_code)
->orderBy('id', 'desc')
->get();
return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
}
public function scanKeluarMarhun(Request $request)
{
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$current = Carbon::now();
$lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
$scanKeluar = new ScanMarhun;
$scanKeluar->kodcaw = $lelongbidItem['kodcaw'];
$scanKeluar->lelong_id = $lelongbidItem['lelong_id'];
$scanKeluar->lelongbid_id = $lelongbidItem['id'];
$scanKeluar->norujukan = $lelongbidItem['norujukan'];
$scanKeluar->user_id = $user['id'];
$scanKeluar->tarikh_scankeluar = $current->toDateString();
$scanKeluar->masa_scankeluar = $current->toTimeString();
$scanKeluar->tag_scankeluar = 1;
$scanKeluar->masa_scanmasuk = $current->toTimeString(); //dummy data
$scanKeluar->tarikh_scanmasuk = $current->toDateString(); //dummy data
$scanKeluar->masa = $current->toTimeString(); //dummy data
$scanKeluar->save();
$lelong_id = $lelongbidItem['lelong_id'];
$lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
->where('caw_id', '=', $caw->id)
->get();
$senaraiScanKeluar = ScanMarhun::where('lelong_id', '=', $lelong_id)
->where('kodcaw', '=', $caw->caw_code)
->orderBy('id', 'desc')
->get();
return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
}
public function scanMasukMarhun(Request $request)
{
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$current = Carbon::now();
$lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
$scanMasuk = ScanMarhun::where('');
}
public function senaraiScanKeluar(Request $request)
{
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$senaraiScanKeluar = ScanMarhun::where('lelong_id', '=', $request->lelong_id)
->where('kodcaw', '=', $caw)
->get();
}
public function addPhotoMarhun(Request $request)
app/Models/ScanMarhun.php
+27
View File
@@ -0,0 +1,27 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class ScanMarhun extends Model
{
use HasFactory;
protected $table = 'scanmarhun';
protected $fillable = [
'kodcaw',
'lelong_id',
'lelongbid_id',
'norujukan',
'user_id',
'tarikh_scankeluar',
'tag_scankeluar',
'masa_scankeluar',
'tarikh_scanmasuk',
'tag_scanmasuk',
'masa_scanmasuk',
];
}
database/migrations/2022_03_07_061858_create_pengesahan_table.php
+22 -17
View File
@@ -34,7 +34,7 @@ class CreatePengesahanTable extends Migration
// $table->foreign('lelongbid_id')
// ->references('id')->on('lelongbid')
// ->onDelete('cascade');
// $table->foreign('lelongbidmarhun_id')
// ->references('id')->on('lelongbidmarhun')
// ->onDelete('cascade');
@@ -44,24 +44,29 @@ class CreatePengesahanTable extends Migration
Schema::create('scanmarhun', function (Blueprint $table) {
$table->id();
$table->string('kodcaw')->nullable();
$table->string('kodcaw');
$table->unsignedBigInteger('lelong_id')->unsigned();
$table->integer('fasa');
$table->string('norujukan')->nullable();
$table->decimal('nilaimarhun', $precision = 9, $scale = 2);
$table->string('drp','100')->nullable();
$table->string('kpd','20')->nullable();
$table->decimal('bulan', $precision = 3, $scale = 0);
$table->decimal('tahun', $precision = 5, $scale = 0);
$table->integer('tag');
$table->datetime('tarikh')->nullable();
$table->time('masa')->nullable();
$table->string('namateller','30')->nullable();
$table->integer('lelongbid_id');
$table->string('norujukan');
$table->string('user_id', '100');
$table->date('tarikh_scankeluar');
$table->time('masa_scankeluar');
$table->integer('tag_scankeluar');
$table->date('tarikh_scanmasuk')->nullable();
$table->time('masa_scanmasuk')->nullable();
$table->integer('tag_scanmasuk')->nullable();
$table->timestamps();
});
$table->foreign('lelong_id')
->references('id')->on('lelong')
->onDelete('cascade');
Schema::create('terimaserah_marhun', function (Blueprint $table) {
$table->id();
$table->integer('scanmarhun_id');
$table->string('user_id', '100');
$table->integer('tagterima');
$table->time('masa_terima');
$table->integer('tagserah')->nullable();
$table->time('masa_serah')->nullable();
$table->timestamps();
});
}
resources/views/includes/sidebar.blade.php
+6 -3
View File
@@ -54,17 +54,20 @@
<li class="{{ (request()->is('tangguhlelmarhun/*')) ? 'active' : '' }}">
<a href="#marhunSubmenu" data-toggle="collapse" aria-expanded="false" style="">Tangguh Lelong</a>
<ul class="list-unstyled collapse {{ (request()->is('marhun/*')) ? 'show' : '' }}" id="marhunSubmenu" >
<ul class="list-unstyled collapse {{ (request()->is('marhun/senlelmarhun')) ? 'show' : '' }}" id="marhunSubmenu" >
<li class="{{ (request()->is('marhun/senlelmarhun/*') || request()->is('marhun/senlelmarhun') ) ? 'active' : '' }}">
<a href="{{url('marhun/senlelmarhun')}}">Senarai Lelong</a>
</li>
</ul>
</li>
<li class="{{ (request()->is('marhun/scanbarcode') )}}">
<a href="{{url('marhun/scanbarcode')}}">Scan Barcode</a>
<li class="{{ (request()->is('marhun/senarailelongscan') )}}">
<a href="{{url('marhun/senarailelongscan')}}">Scan Barcode</a>
</li>
@endhasrole
@hasrole('penilai')
<li class="{{ (request()->is('marhun/terimaserahmarhun') || request()->is('marhun/terimaserahmarhun/*')) ? 'active' : '' }}">
<a href="{{url('marhun/terimaserahmarhun')}}">Terima/Serah Marhun</a>
</li>
<li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
<a href="{{url('marhun/senarailelongmarhun')}}">Semakan Marhun</a>
</li>
resources/views/marhun/scanbarcode.blade.php
+131 -2
View File
@@ -1,15 +1,144 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto p-4">
<div class="card">
<div class="card-header">Scan Barcode</div>
<div class="card-body"><table class="table"></table></div>
<div class="card-body">
@if (!empty($success))
<div class="alert mt-2 alert-success">
<p>{{ $success }}</p>
</div>
@endif
<p>Tarikh Lelong:
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lelongDetail['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp
</p>
<ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="gadaian-test-tab" data-toggle="tab" href="#gadaian-test" role="tab" aria-controls="gadaian-test" aria-selected="true">Senarai</a>
</li>
<li class="nav-item">
<a class="nav-link" id="gadaian-semasa-tab" data-toggle="tab" href="#gadaian-semasa" role="tab" aria-controls="gadaian-semasa" aria-selected="false">SAG Keluar Peti Besi</a>
</li>
<li class="nav-item">
<a class="nav-link" id="gadaian-belum-serah-tab" data-toggle="tab" href="#gadaian-belum-serah" role="tab" aria-controls="gadaian-belum-serah" aria-selected="false">SAG Masuk Peti Besi</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="gadaian-test" role="tabpanel" aria-labelledby="gadaian-test-tab">
<div style="overflow-x: auto;">
<table class='table table-bordered table-hover' id='table-senarai'>
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Marhun</th>
<th>N. Marhun</th>
<th>Berat</th>
<th>Status</th>
</tr>
</thead>
<tbody>
@foreach($lelongbid as $index)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$index->norujukan}}</td>
<td>{{$index->marhun}}</td>
<td>{{$index->nilaimarhun}}</td>
<td>{{$index->berat}}</td>
<td></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
<div class="tab-pane fade" id="gadaian-semasa" role="tabpanel" aria-labelledby="gadaian-semasa-tab">
<p>keluar</p>
<div class="row justify-content-center mb-4">
<div class="col-5">
<form action="{{ route('marhun.scankeluarmarhun') }}" method="POST">
@csrf
<div style="text-align: center;">Scan Barcode Marhun Yang Dibawa Keluar Dari Peti Besi</div>
<input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
<input type="hidden" name="lelong_id" value="{{$lelong_id}}">
<!-- <input type="submit" id="submit_button" name="submit_button" hidden> -->
</form>
</div>
</div>
<div style="overflow-x: auto;">
<table class='table table-bordered table-hover' id='table-gadaian-semasa'>
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Status</th>
<th>Tarikh</th>
<th>Masa</th>
</tr>
</thead>
<tbody>
@foreach ($senaraiScanKeluar as $index)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$index->norujukan}}</td>
<td>{{$index->tag_scankeluar}}</td>
<td>{{$index->tarikh_scankeluar}}</td>
<td>{{$index->masa_scankeluar}}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
<div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
<p>masuk</p>
<div class="row justify-content-center mb-4">
<div class="col-5">
<form action="" method="">
@csrf
<!-- <label>Scan Barcode Marhun Yang Dimasukkan Ke Peti Besi</label> -->
<input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
<!-- <input type="submit" id="submit_button" name="submit_button" hidden> -->
</form>
</div>
</div>
<div style="overflow-x: auto;">
<table class="table table-bordered table-hover" id="table-gadaian-belum-serah" style="width: 100%;">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Pembiayaan</th>
<th>N. Marhun</th>
<th>Teller</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
var tablesenarailelongonline = $('#table-senarai').DataTable({
"pageLength": 1000
});
</script>
@endsection
resources/views/marhun/senarailelongscan.blade.php
+73
View File
@@ -0,0 +1,73 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h4> Senarai Lelongan Scan</h4>
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Status Lelong</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@foreach($arrayinfo as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['info']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
<a href=" {{ route('marhun.scanbarcode', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
<script>
$(function() {
$('[data-toggle="tooltip"]').tooltip()
})
var tablesenarailelongonline = $('#senarailelongonline').DataTable({
"columnDefs": [{
"targets": 0,
"orderable": false
},
{
"targets": 3,
"orderable": false
}
],
order: [
[1, 'asc']
],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
});
</script>
@endsection
resources/views/marhun/terimaserahmarhun.blade.php
+112
View File
@@ -0,0 +1,112 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto p-4">
<div class="card">
<div class="card-header">Terima/Serah Marhun</div>
<div class="card-body">
<ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="gadaian-test-tab" data-toggle="tab" href="#gadaian-test" role="tab" aria-controls="gadaian-test" aria-selected="true">Belum Diterima</a>
</li>
<li class="nav-item">
<a class="nav-link" id="gadaian-semasa-tab" data-toggle="tab" href="#gadaian-semasa" role="tab" aria-controls="gadaian-semasa" aria-selected="false">Sedang Dinilai</a>
</li>
<li class="nav-item">
<a class="nav-link" id="gadaian-belum-serah-tab" data-toggle="tab" href="#gadaian-belum-serah" role="tab" aria-controls="gadaian-belum-serah" aria-selected="false">Sudah Serah</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="gadaian-test" role="tabpanel" aria-labelledby="gadaian-test-tab">
<div style="overflow-x: auto;">
<table class='table table-bordered table-hover' id='table-senarai'>
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Marhun</th>
<th>N. Marhun</th>
<th>Berat</th>
<th>Status</th>
</tr>
</thead>
<tbody>
<tr>
<td></td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="tab-pane fade" id="gadaian-semasa" role="tabpanel" aria-labelledby="gadaian-semasa-tab">
<p>keluar</p>
<div class="row justify-content-center mb-4">
<div class="col-5">
<form action="" method="POST">
@csrf
<div style="text-align: center;">Scan Barcode Marhun Yang Dibawa Keluar Dari Peti Besi</div>
<input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
<!-- <input type="submit" id="submit_button" name="submit_button" hidden> -->
</form>
</div>
</div>
<div style="overflow-x: auto;">
<table class='table table-bordered table-hover' id='table-gadaian-semasa'>
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Status</th>
<th>Tarikh</th>
<th>Masa</th>
</tr>
</thead>
<tbody>
<tr>
</tr>
</tbody>
</table>
</div>
</div>
<div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
<p>masuk</p>
<div class="row justify-content-center mb-4">
<div class="col-5">
<form action="" method="">
@csrf
<!-- <label>Scan Barcode Marhun Yang Dimasukkan Ke Peti Besi</label> -->
<input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
<!-- <input type="submit" id="submit_button" name="submit_button" hidden> -->
</form>
</div>
</div>
<div style="overflow-x: auto;">
<table class="table table-bordered table-hover" id="table-gadaian-belum-serah" style="width: 100%;">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Pembiayaan</th>
<th>N. Marhun</th>
<th>Teller</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
routes/web.php
+4 -1
View File
@@ -224,8 +224,11 @@ Route::group(['prefix'=>'lelong'], function () {
//Khazanah
Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () {
Route::get('/terimaserahmarhun',['as'=>'marhun.terimaserahmarhun','uses'=>'MarhunController@terimaserahmarhun']);
Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']);
Route::get('/scanbarcode',['as'=>'marhun.scanbarcode','uses'=>'MarhunController@scanbarcode']);
Route::get('/senarailelongscan',['as'=>'marhun.senarailelongscan','uses'=>'MarhunController@senarailelongscan']);
Route::get('/scanbarcode/{lelong_id}',['as'=>'marhun.scanbarcode','uses'=>'MarhunController@listScanBarcode']);
Route::post('/scankeluarmarhun',['as'=>'marhun.scankeluarmarhun','uses'=>'MarhunController@scanKeluarMarhun']);
Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']);
Route::get('/marhun/{id}/{lelong_id}',['as'=>'marhun.show','uses'=>'MarhunController@show']);
Route::post('/submitdelete',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']);