Merge branch 'amir_dev' into 'main'
merge request amir_dev See merge request online-sistem1/lelong!183
This commit is contained in:
Nur Izzati Zulkifli
@@ -1115,5 +1115,9 @@ class MarhunController extends Controller
|
||||
|
||||
}
|
||||
|
||||
public function scanbarcode() {
|
||||
return view('marhun.scanbarcode');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1014,7 +1014,7 @@ class LelongMobileController extends Controller
|
||||
$lelong[$index]['status'] = $status;
|
||||
}
|
||||
|
||||
if ($lelong) {
|
||||
if (empty($lelong)) {
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'lelong' => $lelong,
|
||||
|
||||
@@ -156,6 +156,7 @@ class RolesSeeder extends Seeder
|
||||
$role4 = Role::create(['name' => 'pengurus-cawangan']);
|
||||
$role4->givePermissionTo('pendaftaranpembida');
|
||||
$role4->givePermissionTo('jananotis');
|
||||
$role4->givePermissionTo('pengesahan');
|
||||
$role4->givePermissionTo('pengesahanbayarancash');
|
||||
$role4->givePermissionTo('serahan');
|
||||
$role4->givePermissionTo('tangguhlelong');
|
||||
|
||||
@@ -29,8 +29,9 @@
|
||||
</div>
|
||||
</div>
|
||||
@endhasrole
|
||||
@hasrole('teller')
|
||||
I am a teller!
|
||||
@hasrole('penilai')
|
||||
I am a penilai!
|
||||
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
|
||||
@endhasrole
|
||||
@hasrole('pengurus-cawangan')
|
||||
I am a pengurus-cawangan!
|
||||
|
||||
@@ -48,9 +48,9 @@
|
||||
|
||||
@endhasrole
|
||||
@hasrole('khazanah')
|
||||
<li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
|
||||
<!-- <li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
|
||||
<a href="{{url('marhun/senarailelongmarhun')}}">Semakan Marhun</a>
|
||||
</li>
|
||||
</li> -->
|
||||
|
||||
<li class="{{ (request()->is('tangguhlelmarhun/*')) ? 'active' : '' }}">
|
||||
<a href="#marhunSubmenu" data-toggle="collapse" aria-expanded="false" style="">Tangguh Lelong</a>
|
||||
@@ -60,6 +60,9 @@
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="{{ (request()->is('marhun/scanbarcode') )}}">
|
||||
<a href="{{url('marhun/scanbarcode')}}">Scan Barcode</a>
|
||||
</li>
|
||||
@endhasrole
|
||||
@hasrole('penilai')
|
||||
<li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
|
||||
@@ -95,6 +98,14 @@
|
||||
</li>
|
||||
</ul> --}}
|
||||
</li>
|
||||
<li class="{{ (request()->is('Pengesahan/*')) ? 'active' : '' }}">
|
||||
<a href="#pengesahanSubmenu" data-toggle="collapse" aria-expanded="false" style="">Kelulusan</a>
|
||||
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
|
||||
<li class="{{ (request()->is('pengesahan/senarailelongubahmutu/*') || request()->is('pengesahan/senarailelongubahmutu') ) ? 'active' : '' }}">
|
||||
<a href="{{url('pengesahan/senarailelongubahmutu')}}">Kemaskini Marhun</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="{{ ( request()->is('tangguhlelong/*')) ? 'active' : '' }}">
|
||||
<a href="{{url('tangguhlelong/senleluntuktangguh')}}">Tangguh Lelong</a>
|
||||
</li>
|
||||
|
||||
@@ -28,13 +28,14 @@
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-6">
|
||||
<div class="card">
|
||||
<div class="card-header">Thumbnail marhun</div>
|
||||
<div class="card-body">
|
||||
-Tiada Data-
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
|
||||
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modaluploadgambar">
|
||||
Muat Naik Gambar Marhun
|
||||
butiran marhun
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -45,6 +46,7 @@
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th class="text-center">Barang</th>
|
||||
<th>Gambar</th>
|
||||
<th>Marhun</th>
|
||||
<th>Karat</th>
|
||||
<th>Berat</th>
|
||||
@@ -60,6 +62,7 @@
|
||||
@foreach ($marhun as $item)
|
||||
<tr>
|
||||
<td class="text-center"> {{ $loop->iteration }} </td>
|
||||
<td class="p-2 m-2" style="border: 1px solid black; width: 100px; height: 130px"><button data-toggle="modal" data-target="#modaluploadgambar">butiran marhun</button></td>
|
||||
<td>{{ $item->marhun }}</td>
|
||||
<td>
|
||||
@if($item->karat != null)
|
||||
@@ -246,7 +249,7 @@
|
||||
<div class="modal-dialog modal-dialog-centered modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Muat Naik Gambar Marhun</h5>
|
||||
<h5 class="modal-title">thumbnail marhun</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
@@ -257,7 +260,11 @@
|
||||
<img id="blah" style="max-width: 400px; max-height: 400px;" src="#" alt="gambar marhun" />
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<input type='file' accept="image/*;capture=camera" id="imgInp" />
|
||||
<input type='file' accept="image/*;capture=camera" id="imgInp" /><br>
|
||||
</div>
|
||||
<div class="row mt-5 justify-content-center">
|
||||
<button type='file' accept="image/*;capture=camera" class="btn m-2 btn-warning">tukar gambar</button>
|
||||
<button class="btn m-2 btn-danger">padam gambar</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@endsection
|
||||
@@ -70,7 +70,7 @@
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<button type="button" class="btn btn-primary" onclick="kemaskini(this)" data-lelong="{{$bid->lelong_id}}" data-all="{{$bid}}" data-surat="{{$bid->id}}" data-marhun="{{ json_encode($bid->marhun) }}" data-toggle="modal" data-target="#noRujukanModal"><i class="far fa-edit"></i></button>
|
||||
<!-- <button type="button" class="btn btn-primary" onclick="kemaskini(this)" data-lelong="{{$bid->lelong_id}}" data-all="{{$bid}}" data-surat="{{$bid->id}}" data-marhun="{{ json_encode($bid->marhun) }}" data-toggle="modal" data-target="#noRujukanModal"><i class="far fa-edit"></i></button> -->
|
||||
<a type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="top" title="Lihat Butiran" href="{{ route('marhun.show', [$bid->id, $bid->lelong_id]) }}"><i class="far fa-edit"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -3,65 +3,70 @@
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row ">
|
||||
<div class="col-md-11 mx-auto card p-4">
|
||||
|
||||
@if ($message = Session::get('success'))
|
||||
<div class="alert alert-success">
|
||||
<p>{{ $message }}</p>
|
||||
<div class="col-md-11 mx-auto p-4">
|
||||
<div class="card">
|
||||
<div class="card-header">Kelulusan Kemaskini Marhun</div>
|
||||
<div class="card-body">
|
||||
|
||||
@if ($message = Session::get('success'))
|
||||
<div class="alert alert-success">
|
||||
<p>{{ $message }}</p>
|
||||
</div>
|
||||
@endif
|
||||
<form id="exportform" action="" method="POST">
|
||||
<input type="hidden" name="type" value="User">
|
||||
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th>No</th>
|
||||
<th>ID Lelong</th>
|
||||
<th>Cawangan</th>
|
||||
<th>Tarikh Lelong</th>
|
||||
<th>Harga Emas Asas</th>
|
||||
<th>Tempoh</th>
|
||||
<th>Caj Lelong</th>
|
||||
<th>Status Lelong</th>
|
||||
<th class="text-center">Pengesahan</th>
|
||||
<th class="text-center">Telah Sah</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($arrayinfo as $lel)
|
||||
<tr>
|
||||
<td>{{$loop->iteration}}</td>
|
||||
<td>{{ $lel['info']['lelong_id'] }}</td>
|
||||
<td align = 'left'>
|
||||
@foreach($lel['detailsinfo'] as $details)
|
||||
<span class="m-2">{{$details['caw_name']}}</span><br>
|
||||
@endforeach
|
||||
</td>
|
||||
<td> @php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']);
|
||||
$datez = $myDateTime->format('d-m-Y');
|
||||
echo($datez);
|
||||
|
||||
@endphp</td>
|
||||
<td>{{ number_format($lel['info']['harga_emas_asas'], 2, '.', ',')}}</td>
|
||||
<td>{{ $lel['info']['jbg'] }}</td>
|
||||
<td>{{ $lel['info']['cajlelong'] }}</td>
|
||||
<td>
|
||||
@if($lel['info']['sts_lelong'] == 0)
|
||||
<button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ route('pengesahan.perubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ route('pengesahan.listperubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-user"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
</div>
|
||||
@endif
|
||||
<form id="exportform" action="" method="POST">
|
||||
<input type="hidden" name="type" value="User">
|
||||
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th>No</th>
|
||||
<th>ID Lelong</th>
|
||||
<th>Cawangan</th>
|
||||
<th>Tarikh Lelong</th>
|
||||
<th>Harga Emas Asas</th>
|
||||
<th>Tempoh</th>
|
||||
<th>Caj Lelong</th>
|
||||
<th>Status Lelong</th>
|
||||
<th class="text-center">Pengesahan</th>
|
||||
<th class="text-center">Telah Sah</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($arrayinfo as $lel)
|
||||
<tr>
|
||||
<td>{{$loop->iteration}}</td>
|
||||
<td>{{ $lel['info']['lelong_id'] }}</td>
|
||||
<td align = 'left'>
|
||||
@foreach($lel['detailsinfo'] as $details)
|
||||
<span class="m-2">{{$details['caw_name']}}</span><br>
|
||||
@endforeach
|
||||
</td>
|
||||
<td> @php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']);
|
||||
$datez = $myDateTime->format('d-m-Y');
|
||||
echo($datez);
|
||||
|
||||
@endphp</td>
|
||||
<td>{{ number_format($lel['info']['harga_emas_asas'], 2, '.', ',')}}</td>
|
||||
<td>{{ $lel['info']['jbg'] }}</td>
|
||||
<td>{{ $lel['info']['cajlelong'] }}</td>
|
||||
<td>
|
||||
@if($lel['info']['sts_lelong'] == 0)
|
||||
<button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ route('pengesahan.perubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ route('pengesahan.listperubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-user"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -225,6 +225,7 @@ Route::group(['prefix'=>'lelong'], function () {
|
||||
//Khazanah
|
||||
Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () {
|
||||
Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']);
|
||||
Route::get('/scanbarcode',['as'=>'marhun.scanbarcode','uses'=>'MarhunController@scanbarcode']);
|
||||
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']);
|
||||
|
||||
Reference in New Issue
Block a user