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

Merge branch 'main' into amir_dev_2

Browse Source
This commit is contained in:
Amir
2022-11-23 13:44:03 +08:00
parent 7b95770f86 0aa619493d
commit 477448fced
109 changed files with 1229 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+1
View File
@@ -620,6 +620,7 @@ class LelongController extends Controller
$lelongbidmarhun->bil = $simbidmarhun->bil;
$lelongbidmarhun->marhun = $simbidmarhun->marhun;
$lelongbidmarhun->nota = $simbidmarhun->nota;
$lelongbidmarhun->old_marhun = $simbidmarhun->marhun;
$lelongbidmarhun->old_karat = $simbidmarhun->karat;
$lelongbidmarhun->old_berat = $simbidmarhun->berat;
$lelongbidmarhun->old_harga = $simbidmarhun->harga;
app/Http/Controllers/MarhunController.php
+21 -4
View File
@@ -1730,10 +1730,11 @@ class MarhunController extends Controller
$user = Auth::user();
$cawangan = Pengesahan::join('users', 'pengesahan.diminta_oleh', 'users.id')
->where('pengesahan.lelong_id', $id)
$cawangan = Pengesahan::where('pengesahan.lelong_id', $id)
->where('pengesahan.status', 1)
->whereNotNull('pengesahan.disahkan_oleh')
->select('pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id', 'users.id as user_id', 'users.name', 'users.username', 'users.kodcaw')
->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
->orderBy('pengesahan.lelongbid_id')
->distinct()
->get();
// dd($cawangan);
@@ -1741,6 +1742,7 @@ class MarhunController extends Controller
foreach($cawangan as $index1=>$caw)
{
// dd($caw);
$getpengesahan = Cawangan::where('caw_code', $caw['kodcaw'])->first();
// dd($getpengesahan);
@@ -1748,9 +1750,22 @@ class MarhunController extends Controller
$getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first();
// dd($getdisahkanoleh);
$cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
// dd(/$caw['lelongbid_id']);
$status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
->get();
// dump($status);
// $marhun= LelongBidMarhun::where('lelongbid_id','=',$caw['lelongbid_id'])
// ->get();
$marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id'])
->get()->toArray();
// dd($marhuns);
// $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
$cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name'];
$cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name'];
$cawangan[$index1]['detailmarhun']=$status;
$cawangan[$index1]['detail']=$marhuns;
}
return view('pengesahan.listperubahanmutumarhun', compact('cawangan', 'id'));
@@ -2386,5 +2401,7 @@ class MarhunController extends Controller
}
}
app/Http/Controllers/NotisController.php
+2 -2
View File
@@ -183,7 +183,7 @@ class NotisController extends Controller
$pdf = PDF::loadView('pdf.jananotis',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag'))
->setPaper('a4', 'potrait');
return $pdf->download('Penjanaan Notis Fasa 1: ID Lelong '.$lelong_id.'.pdf');
return $pdf->download('Penjanaan Notis Fasa 1:Batch Lelong '.$lelong_id.'.pdf');
}
@@ -386,7 +386,7 @@ class NotisController extends Controller
$pdf = PDF::loadView('pdf.jananotisfasa2',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag'))
->setPaper('a4', 'potrait');
return $pdf->download('Penjanaan Notis Fasa 2: ID Lelong '.$lelong_id.'.pdf');
return $pdf->download('Penjanaan Notis Fasa 2:Batch Lelong '.$lelong_id.'.pdf');
}
app/Http/Controllers/PenggunaController.php
+39 -28
View File
@@ -72,40 +72,51 @@ class PenggunaController extends Controller
'username' => 'required|string|unique:users'
]);
if ($validator->fails()) {
$errors = [
'success' => "error",
'message' => $validator->errors()
// if ($validator->fails()) {
// $errors = [
// 'success' => "error",
// 'message' => $validator->errors()
];
// ];
return redirect()->route('pengguna.index')
->with('message', 'Sila Masukkan Email Yang Sah'); }
// return redirect()->route('pengguna.index')
// ->with('message', 'Sila Masukkan Email Yang Sah'); }
$user = new User;
$user->name = $request->name;
$user->username = $request->username;
$user->kodcaw = $request->caw;
$user->status = 'active';
$user->t_daftar = $currentdate;
$user->email = $request->email;
$user->email_verified_at = $currentdate;
$user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password
$user->user_type = 1;
$user->save();
//check if user already existed
$check = User::where('username',$request->username)
->orWhere('email',$request->email)
->first();
$allroles = Role::all()->pluck('name');
$arraytaraf = [];
foreach($allroles as $index=>$taraf) {
$req = 'taraf'.$taraf;
if($request->$req)
if($check)
{
array_push($arraytaraf,$taraf);
return redirect()->route('pengguna.index')->with('failed','Maaf, Nama Pengguna / Emel Berikut Telah Wujud !');
} else {
$user = new User;
$user->name = $request->name;
$user->username = $request->username;
$user->kodcaw = $request->caw;
$user->status = 'active';
$user->t_daftar = $currentdate;
$user->email = $request->email;
$user->email_verified_at = $currentdate;
$user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password
$user->user_type = 1;
$user->save();
$allroles = Role::all()->pluck('name');
$arraytaraf = [];
foreach($allroles as $index=>$taraf) {
$req = 'taraf'.$taraf;
if($request->$req)
{
array_push($arraytaraf,$taraf);
}
}
$user->syncRoles($arraytaraf);
return redirect()->route('pengguna.index')
->with('success', 'Pengguna Berjaya Disimpan');
}
}
$user->syncRoles($arraytaraf);
return redirect()->route('pengguna.index')
->with('success', 'Pengguna Berjaya Disimpan');
}
public function store(Request $request)
app/Http/Controllers/ReportController.php
+111 -19
View File
@@ -33,6 +33,7 @@ use App\Models\Resit;
use App\Models\Customer;
use App\Models\LelongTebus;
use App\Models\Pengesahan;
use App\Models\TransaksiKeuntungan;
use Carbon\Carbon;
@@ -649,10 +650,63 @@ class ReportController extends Controller
->setPaper('a4','potrait');
return $pdf->download('Laporan Simulasi Cawangan.pdf');
}
public function simulasireportbycust($simulasi_id, $cawid)
{
$keuntungan = 0;
$arraylistgadai = 0;
$simulasilel = Simulasi::with('cawangan')->find($simulasi_id);
$cawname = Cawangan::where('id','=',$cawid)->first();
$cawanganDetail = $simulasilel->cawangan->find($cawid);
$marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
->where('simulasi_id','=',$simulasi_id)
->where('caw_id','=',$cawid);
$arraynorujukan = $marhun->pluck('norujukan')->toArray();
$datasimulasi = $marhun->get();
$marhuns = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
->select('nokp')
->groupBy('nokp')->get();
// dd($datagadai);
$arraysag = [];
foreach($marhuns as $index1=>$cal)
{
$customer = Customer::where('kpbaru','=',$cal['nokp'])
->orWhere('kplama','=',$cal['nokp'])
->first();
// dd($customer);
$listsag = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
->where('nokp','=',$cal['nokp'])
->get();
// dd($listgadai);
foreach($listsag as $index=>$listing){
$ktlhbyr = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan');
// dd($ktlhbyr);
$total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('keuntungan_rebet');
$total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan');
$beza_keuntungan = $total_untung_asal - $total_untung_rebet;
$keuntungan = bcdiv(($listing['tempoh']-$listing['tempohbayar'])*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan;
// dd($keuntungan);
$listsag[$index]['ktlhbyr'] = $ktlhbyr;
$listsag[$index]['keuntungan'] = $keuntungan;
}
$marhuns[$index1]['nama'] = $customer;
$marhuns[$index1]['listsag'] = $listsag;
}
$pdf = PDF::loadView('pdf.simulasireportbycust',compact('simulasilel','cawanganDetail','marhuns','simulasi_id','cawid','ktlhbyr','cawname'))
->setPaper('a4','potrait');
return $pdf->download('Laporan Simulasi Cawangan by Pelanggan.pdf');
}
public function lelongreport ($lelongid, $cawid){
@@ -770,33 +824,71 @@ class ReportController extends Controller
// return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo'));
}
public function lapubahmarhunlelong (){
public function lapubahmarhunlelongindex (){
$arraydetails = [];
$laporan= Pengesahan::join('lelongbidmarhun','pengesahan.lelongbidmarhun_id','=','lelongbidmarhun.id')
->join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan')
->select('pengesahan.norujukan','pengesahan.lelong_id','lelongbid.caw_id','pengesahan.diminta_pada','pengesahan.disahkan_oleh','pengesahan.disahkan_pada','pengesahan.diminta_oleh','pengesahan.status','pengesahan.status_ubah','lelongbidmarhun.old_karat','lelongbidmarhun.karat','lelongbidmarhun.old_berat','lelongbidmarhun.berat','lelongbid.kodcaw','lelongbid.norujukan','lelongbid.lelong_id')
->whereNotNull('pengesahan.disahkan_oleh')
->orderBy('pengesahan.id')
$arraydetails = [];
$laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->join('pengesahan','lelong.id','=','pengesahan.lelong_id')
->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
->distinct()
->orderBy('cawangan_lelong.lelong_id')
->get()
->toArray();
// dd($laporan);
foreach($laporan as $lap) //stop here 01.09.2022
{
$details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$lap['lelong_id'])
->where('caw_id',$lap['caw_id'])
foreach($laporan as $brg)
{
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id', $brg['lelong_id'])
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
array_push($arraydetails, ['lap' =>$lap,'details' =>$details]);
}
array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
}
return view('marhun.ubahmarhun', compact('laporan','arraydetails'));
return view('marhun.ubahmarhuncaw', compact('arraydetails'));
}
public function lapubahmarhunlelongindex ($lelong_id, $kodcaw){
$cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
->where('pengesahan.status', 1)
->whereNotNull('pengesahan.disahkan_oleh')
->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
->orderBy('pengesahan.lelongbid_id')
->distinct()
->get();
foreach($cawangan as $index1=>$caw)
{
$getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
$getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first();
$getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first();
$status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
->get();
$marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id'])
->get()
->toArray();
$cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
$cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name'];
$cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name'];
$cawangan[$index1]['detailmarhun']=$status;
$cawangan[$index1]['detail']=$marhuns;
}
return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
}
public function exportubahmarhun (){
app/Models/Lelong.php
+5
View File
@@ -40,4 +40,9 @@ class Lelong extends Model
{
return $this->hasMany(LelKarat::class, 'lelong_id', 'id');
}
public function pengesahan()
{
return $this->hasMany(Pengesahan::class,'lelong_id','id');
}
}
app/Models/Pengesahan.php
+7 -1
View File
@@ -23,7 +23,13 @@ class Pengesahan extends Model
'status_ubah'
];
public function lelongbidmarhun(){
public function lelongbidmarhun()
{
return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id');
}
public function lelong()
{
return $this->belongsTo(Lelong::class,'lelong_id','id');
}
}
database/migrations/2021_12_14_041557_create_lelongs_table.php
+2 -1
View File
@@ -123,7 +123,8 @@ class CreateLelongsTable extends Migration
$table->bigIncrements('id');
$table->unsignedBigInteger('lelongbid_id')->unsigned();
$table->decimal('bil', $precision = 3, $scale = 0);
$table->string('marhun');
$table->string('old_marhun');
$table->string('marhun');
$table->string('nota')->nullable();
$table->string('old_karat');
$table->string('karat');
resources/views/account/senarailelongan.blade.php
+1 -1
View File
@@ -15,7 +15,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Fasa</th>
resources/views/home.blade copy 2.php
+4 -4
View File
@@ -55,7 +55,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Harga Emas Asas</th>
@@ -138,7 +138,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>T.Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
@@ -286,7 +286,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Status Export</th>
@@ -347,7 +347,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
{{-- <th>Cawangan</th> --}}
<th>Nama</th>
resources/views/home.blade copy.php
+1 -1
View File
@@ -32,7 +32,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>T.Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
resources/views/home.blade.php
+4 -4
View File
@@ -113,7 +113,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Harga Emas Asas</th>
@@ -196,7 +196,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>T.Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
@@ -321,7 +321,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Status Export</th>
@@ -382,7 +382,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
{{-- <th>Cawangan</th> --}}
<th>Nama</th>
resources/views/home/senarailelongubahmutu.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Harga Emas Asas</th>
resources/views/home00.blade.php
+4 -4
View File
@@ -55,7 +55,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Harga Emas Asas</th>
@@ -138,7 +138,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>T.Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
@@ -271,7 +271,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Status Export</th>
@@ -332,7 +332,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
{{-- <th>Cawangan</th> --}}
<th>Nama</th>
resources/views/homexxxx.blade.php
+4 -4
View File
@@ -55,7 +55,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Harga Emas Asas</th>
@@ -139,7 +139,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>T.Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
@@ -263,7 +263,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Status Export</th>
@@ -326,7 +326,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
{{-- <th>Cawangan</th> --}}
<th>Nama</th>
resources/views/includes/sidebar.blade.php
+4 -4
View File
@@ -163,7 +163,7 @@
</ul>
<ul class="list-unstyled collapse {{ (request()->is('reportcaw/*')) ? 'show' : '' }}" id="reportSubmenu">
<li class="{{ (request()->is('reportcaw/indexnamapembidacaw/*') || request()->is('reportcaw/indexnamapembidacaw') ) ? 'active' : '' }}">
<a href="{{url('reportcaw/indexnamapembidacaw')}}">Nama Pembida</a>
<a href="{{url('reportcaw/indexnamapembidacaw')}}">Keseluruhan Pembida</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('reportcaw/*')) ? 'show' : '' }}" id="reportSubmenu">
@@ -499,13 +499,13 @@
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('report/*')) ? 'show' : '' }}" id="reportSubmenu">
<li class="{{ (request()->is('report/lapubahmarhunlelongindex/*') || request()->is('report/lapubahmarhunlelongindex') ) ? 'active' : '' }}">
<a href="{{url('report/lapubahmarhunlelongindex')}}">Perubahan Marhun</a>
<li class="{{ (request()->is('report/lapubahmarhunlelong/*') || request()->is('report/lapubahmarhunlelong') ) ? 'active' : '' }}">
<a href="{{url('report/lapubahmarhunlelong')}}">Perubahan Marhun</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('report/*')) ? 'show' : '' }}" id="reportSubmenu">
<li class="{{ (request()->is('report/lapbidaanpembidaindex/*') || request()->is('report/lapbidaanpembidaindex') ) ? 'active' : '' }}">
<a href="{{url('report/lapbidaanpembidaindex')}}">Nama Pembida</a>
<a href="{{url('report/lapbidaanpembidaindex')}}">Keseluruhan Pembida</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('report/*')) ? 'show' : '' }}" id="reportSubmenu">
resources/views/jananotis/notislelong.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
{{-- <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th> --}}
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Bilangan SAG</th>
resources/views/jurulelong/listcawangan.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Nama Cawangan</th>
<th>Harga Emas Asas</th>
resources/views/jurulelong/listpemenang.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Nama Cawangan</th>
<th>Fasa</th>
resources/views/jurulelong/senaraipemenangbycaw.blade.php
+1 -1
View File
@@ -20,7 +20,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Nama</th>
<th>No Kad Pengenalan</th>
<th>No Telefon</th>
resources/views/lelong/brgleldetails.blade.php
+54 -49
View File
@@ -3,58 +3,62 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3" style="margin-left:1%;">Butiran Laporan Barang Lelong </h3>
<div class="col">
<div class="card">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
<div class="card-header header-style">
<div class="header-style-title">
Butiran Laporan Barang Lelong
</div>
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
{{-- <th class="text-center">Muat Turun</th> --}}
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $laporan)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $laporan['brg']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['brg']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $laporan['brg']['fasa']}}</td>
<td align="left">
@foreach($laporan['detailsbrg'] as $details)
<a href=" {{ route('report.senaraibrglelongdetails', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="m-2">{{ $details['caw_name']}}</span><br>
@endforeach
</td>
{{--
<td class="text-center">
<a href="{{ route('report.senaraibrglelongdetails',$laporan['brg']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Details" ><i class="fas fa-download"></i></a>
</td> --}}
</tr>
@endforeach
</tbody>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $laporan)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $laporan['brg']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['brg']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $laporan['brg']['fasa']}}</td>
<td align="left">
@foreach($laporan['detailsbrg'] as $details)
<a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.senaraibrglelongdetails', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
<span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $details['caw_name']}}</span><br>
@endforeach
</td>
</tr>
</table>
</form>
</div>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
</div>
</div>
@@ -84,4 +88,5 @@
</script>
@endsection
resources/views/lelong/currentlelong.blade.php
+1 -1
View File
@@ -15,7 +15,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
resources/views/lelong/exportData.blade.php
+1 -1
View File
@@ -14,7 +14,7 @@
{{ $message }}
</div>
@endif
<p>ID Lelong: {{$lelong['id']}}</p>
<p>Batch Lelong: {{$lelong['id']}}</p>
<p>Tarikh Lelong: {{$lelong['tarikh_lelong']}}</p>
<p>Masa Mula Lelong: {{$lelong['masamula_lelong']}}</p>
<p>Masa Tamat Lelong: {{$lelong['masatamat_lelong']}}</p>
resources/views/lelong/indexbrgleldetailscaw.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelong/indexbrglelpembidacaw.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelong/indexlelfullcaw.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelong/indexnamapembidacaw.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelong/lapbrglelpembida.blade.php
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="col-md-11 mx-auto card p-4">
@foreach ($info as $info)
<span class="pt-3" style="margin-left:1%;"><b>Laporan Barang Lelong Pembida</b></span>
<span class="pt-3" style="margin-left:1%;">Lelong ID: {{ $lelong_id}}</span>
<span class="pt-3" style="margin-left:1%;">Batch Lelong: {{ $lelong_id}}</span>
<span class="pt-3" style="margin-left:1%;">Cawangan: {{ $info->caw_name}}</span>
<span class="pt-3" style="margin-left:1%;">Tarikh Lelong: {{ $info->tarikh_lelong}}</span><br>
@endforeach
resources/views/lelong/lapbrglelpembidaindex.blade.php
+56 -49
View File
@@ -3,56 +3,63 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3" style="margin-left:1%;">Laporan Barang Lelong Pembida</h3>
@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" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
{{-- <th class="text-center">Muat Turun</th> --}}
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $info)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $info['laporan']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $info['laporan']['fasa'] }}</td>
<td>
@foreach($info['details'] as $details)
<a href=" {{ route('report.lapbrglelpembida', ['lelong_id'=>$info['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
{{-- <td class="text-center">
<a href="{{ route('report.lapbrglelpembida',$info['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Pembida" ><i class="fas fa-download"></i></a>
</td> --}}
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
<div class="col">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Laporan Barang Lelong Pembida
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $info)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $info['laporan']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $info['laporan']['fasa'] }}</td>
<td>
@foreach($info['details'] as $details)
<a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.lapbrglelpembida', ['lelong_id'=>$info['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
</div>
</div>
resources/views/lelong/laplelong.blade.php
+1 -2
View File
@@ -6,7 +6,7 @@
<div class="col-md-11 mx-auto card p-4">
@foreach ($lelongid as $info)
<span class="pt-3" style="margin-left:1%;"><b>Laporan Lelong Keseluruhan</b></span>
<span class="pt-3" style="margin-left:1%;">Lelong ID: {{ $lelong_id}}</span>
<span class="pt-3" style="margin-left:1%;">Batch Lelong: {{ $lelong_id}}</span>
<span class="pt-3" style="margin-left:1%;">Cawangan: {{ $info->caw_name}}</span>
<span class="pt-3" style="margin-left:1%;">Tarikh Lelong: {{ $info->tarikh_lelong}}</span><br>
@endforeach
@@ -35,7 +35,6 @@
<th>Rugi</th>
<th>Harga Asas</th>
<th>Nama Pembeli</th>
</tr>
</thead>
<tbody>
resources/views/lelong/laplelongindex.blade.php
+57 -50
View File
@@ -3,57 +3,64 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3" style="margin-left:1%;">Laporan Lelong Keseluruhan</h3>
@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" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
{{-- <th class="text-center">Muat Turun</th> --}}
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $bid)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $bid['laporan']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $bid['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $bid['laporan']['fasa'] }}</td>
<td>
@foreach($bid['details'] as $details)
<a href=" {{ route('report.laplelong', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
{{-- <td class="text-center">
<a href="{{ route('report.laplelong',$bid['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong Keseluruhan" ><i class="fas fa-download"></i></a>
</td> --}}
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
<div class="col">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Senarai Lelong Keseluruhan
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $bid)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $bid['laporan']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $bid['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $bid['laporan']['fasa'] }}</td>
<td>
@foreach($bid['details'] as $details)
<a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.laplelong', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
</div>
</div>
resources/views/lelong/laporanbidaanindex.blade.php
+56 -50
View File
@@ -3,58 +3,64 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3" style="margin-left:1%;">Laporan Nama Pembida </h3>
@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" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
{{-- <th class="text-center">Tindakan</th> --}}
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $bid)
<tr>
<td>{{$loop->iteration}}
<td>{{ $bid['laporan']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $bid['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $bid['laporan']['fasa']}}</td>
<td>
@foreach($bid['details'] as $details)
<a href=" {{ route('report.senarailapbidaan', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<div class="col">
<div class="card">
<span class="m-2"> {{ $details['caw_name']}}</span><br>
<div class="card-header header-style">
<div class="header-style-title">
Senarai Keseluruhan Pembida
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $bid)
<tr>
<td>{{$loop->iteration}}
<td>{{ $bid['laporan']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $bid['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $bid['laporan']['fasa']}}</td>
<td>
@foreach($bid['details'] as $details)
<a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.senarailapbidaan', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
</tr>
@endforeach
</tbody>
@endforeach
</td>
{{-- <td class="text-center">
<a href="{{ route('report.senarailapbidaan',$bid['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Laporan Barang Lelong" ><i class="fas fa-download"></i></a>
</td> --}}
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</table>
</form>
</div>
</div>
</div>
</div>
</div>
resources/views/lelong/laporancawindex.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelong/laporanlelong.blade.php
+55 -45
View File
@@ -3,54 +3,65 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3" style="margin-left:1%;">Laporan Barang Lelong </h3>
<div class="col">
<div class="card">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
<div class="card-header header-style">
<div class="header-style-title">
Laporan Barang Lelong
</div>
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $laporan)
<tr style="text-align: left">
<td>{{ $loop->iteration }}</td>
<td>{{ $laporan['laporan']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $laporan['laporan']['fasa']}}</td>
<td>
@foreach($laporan['details'] as $details)
<a href=" {{ route('report.senaraibrglelong', ['lelong_id'=>$laporan['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="m-2">{{ $details['caw_name']}}</span><br>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $laporan)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $laporan['laporan']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $laporan['laporan']['fasa']}}</td>
<td style="text-align: left">
@foreach($laporan['details'] as $details)
<a class="confirmrefresh btn m-1 btn-danger" href="{{ route('report.senaraibrglelong', ['lelong_id'=>$laporan['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
<span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $details['caw_name']}}</span><br>
@endforeach
</td>
</tr>
@endforeach
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</tbody>
</table>
</form>
</div>
</div>
</div>
</div>
</div>
@@ -59,7 +70,7 @@
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablenotislelong = $('#tablenotislelong').DataTable({
var tablenotislelong = $('#tablenotislelong').DataTable({
"columnDefs": [
{
"targets": 0,
@@ -75,7 +86,6 @@
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
});
resources/views/lelong/lelongtaklaku.blade.php
+1 -1
View File
@@ -10,7 +10,7 @@
<table cellspacing="2" cellpadding="3" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped table-xl">
<thead class="bg-light ">
<tr>
<td><b>ID Lelong: {{$lelong_id}}</b></td>
<td><b>Batch Lelong: {{$lelong_id}}</b></td>
@foreach ($info as $info)
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d',$info->tarikh_lelong );
resources/views/lelong/lelongtebusindex.blade.php
+52 -49
View File
@@ -2,57 +2,60 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3" style="margin-left:1%;">Senarai Lelong Tebus</h3>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
<div class="row ">
<div class="col">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Senarai Lelong Tebus
</div>
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
{{-- <th class="text-center">Muat Turun</th> --}}
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $info)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $info['laporan']['batch_no']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $info['laporan']['fasa'] }}</td>
<td>
@foreach($info['details'] as $details)
<a href=" {{ route('report.lelongtebus', ['lelong_id'=>$info['laporan']['id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
{{-- <td class="text-center">
<a href="{{ route('report.lapbrglelpembida',$info['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Pembida" ><i class="fas fa-download"></i></a>
</td> --}}
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $info)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $info['laporan']['batch_no']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $info['laporan']['fasa'] }}</td>
<td>
@foreach($info['details'] as $details)
<a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.lelongtebus', ['lelong_id'=>$info['laporan']['id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
</div>
</div>
resources/views/lelong/listsagpindah.blade.php
+4 -4
View File
@@ -8,10 +8,10 @@
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<span class="pt-3" style="margin-left:1%; font-size:20px"><b>Senarai Lelong(Pindah ID Lelong)</b></span>
<span class="pt-3" style="margin-left:1%; font-size:20px"><b>Senarai Lelong(Pindah Batch Lelong)</b></span>
@foreach ($arrayinfo as $laporan)
<span class="pt-3" style="margin-left:1%;"><b>ID Lelong : {{ $laporan['laporan']['lelong_id']}}</b></span>
<span class="pt-3" style="margin-left:1%;"><b>Batch Lelong : {{ $laporan['laporan']['lelong_id']}}</b></span>
<span class="pt-3" style="margin-left:1%;"><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y');
@@ -36,9 +36,9 @@
<input type="hidden" name="cawid" value="{{$cawid}}">
<div> Pindah Ke-</div>
<select class="js-states browser-default select2" name="lelongidbaru" required id="lelongidbaru">
<option value="option_select" disabled selected>SILA PILIH ID LELONG</option>
<option value="option_select" disabled selected>SILA PILIH BATCH LELONG</option>
@foreach($datapindah as $data)
<option value="{{ $data['id'] }}">ID Lelong:{{ $data['id']}} / Tarikh: {{ $data['tarikh_lelong']}} / Kali Ke-: {{ $data['kali']}}</option>
<option value="{{ $data['id'] }}">Batch Lelong:{{ $data['id']}} / Tarikh: {{ $data['tarikh_lelong']}} / Kali Ke-: {{ $data['kali']}}</option>
@endforeach
</select>
<button type="submit" class="btn btn-success">Pindah Lelong</button>
resources/views/lelong/pindahsenarailelong.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
resources/views/lelong/senarailelong.blade.php
+4 -4
View File
@@ -52,7 +52,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
@@ -99,7 +99,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
@@ -143,7 +143,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
@@ -185,7 +185,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
resources/views/lelong/senarailelongpc.blade.php
+1 -1
View File
@@ -23,7 +23,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
resources/views/lelong/senarailelongtaklaku.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
resources/views/lelong/senaraimarhunpc.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
<tr>
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
resources/views/lelong/senaraimarhunsimulasi.blade.php
+1 -1
View File
@@ -13,7 +13,7 @@
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
<tr>
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
resources/views/lelong/senaraipemenang.blade.php
+1 -1
View File
@@ -17,7 +17,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Nama</th>
<th>No Kad Pengenalan</th>
<th>No Telefon</th>
resources/views/lelong/showpindah.blade.php
+2 -2
View File
@@ -64,9 +64,9 @@
<div> Pindah Ke-</div>
<select class="js-states browser-default select2" name="lelong_id" required id="lelong_id">
<option value="option_select" disabled selected>SILA PILIH ID LELONG</option>
<option value="option_select" disabled selected>SILA PILIH BATCH LELONG</option>
@foreach($datapindah as $data)
<option value="{{ $data['id'] }}">ID Lelong:{{ $data['id']}} / {{ $data['tarikh_lelong']}}</option>
<option value="{{ $data['id'] }}">Batch Lelong:{{ $data['id']}} / {{ $data['tarikh_lelong']}}</option>
@endforeach
</select>
<button type="submit" class="btn btn-success">Pindah Lelong</button>
resources/views/lelong/showrenewxlaku.blade.php
+2 -2
View File
@@ -38,7 +38,7 @@
</div>
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-2 col-form-label">ID Lelong Asal</label>
<label for="jbg" class="col-sm-2 col-form-label">Batch Lelong Asal</label>
<div class="col-sm-2">
{{$lelong_id}}
</div>
@@ -86,7 +86,7 @@
</div>
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-2 col-form-label">ID Lelong Baru</label>
<label for="jbg" class="col-sm-2 col-form-label">Batch Lelong Baru</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="lelongidbaru" name="lelongidbaru" value = "{{$idlelongbaru}}" readonly>
resources/views/lelong/showtukartarikh.blade.php
+2 -2
View File
@@ -37,7 +37,7 @@
</div>
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-2 col-form-label">ID Lelong Asal</label>
<label for="jbg" class="col-sm-2 col-form-label">Batch Lelong Asal</label>
<div class="col-sm-2">
{{$lelong_id}}
</div>
@@ -85,7 +85,7 @@
</div>
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-2 col-form-label">ID Lelong Baru</label>
<label for="jbg" class="col-sm-2 col-form-label">Batch Lelong Baru</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="lelongidbaru" name="lelongidbaru" value = "{{$idlelongbaru}}" readonly>
resources/views/lelong/tukartarikhlelong.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
resources/views/lelongkhas/jadualN.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelongkhas/jadualO.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelongkhas/laporanlelong.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelongkhas/laporantuntutbaki.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelongkhas/resitpemenang.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
<tr>
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
resources/views/lelongkhas/sandarankpkt.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelongkhas/sandaranpembida.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th class="text-center">Muat Turun</th>
resources/views/lelongkhas/senarailelongkhas.blade.php
+1 -1
View File
@@ -15,7 +15,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
resources/views/lelongkhas/senaraimarhunkhas.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
<tr>
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
resources/views/lelongkhas/senaraimarhunkhastelahjual.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
<tr>
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
resources/views/lelongkhas/tambahhargajual.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@
<table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped table-xl">
<thead class="bg-light ">
<tr>
<td><b>ID Lelong: {{$lelongbid->lelong_id}} <b></td>
<td><b>Batch Lelong: {{$lelongbid->lelong_id}} <b></td>
<input type="hidden" class="form-control" id="lelong_id" name="lelong_id" value = "{{$lelongbid->lelong_id}}">
<input type="hidden" class="form-control" id="cawid" name="cawid" value = "{{$cawanganid->id}}">
<td><b>No.Rujukan: {{$norujukan}}</b></td>
resources/views/marhun/marhun.blade.php
+2 -2
View File
@@ -169,11 +169,11 @@
@elseif($status['status'] == 1)
<button style="width:7%;" class="btn btn-info" >Telah Sah</button>
@else
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak1</button>
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak1/button>
@endif
@else
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak2</button>
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak</button>
@endif
{{-- <button style="width:7%;" class="btn btn-warning">Dalam Proses Pengesahan</button> --}}
@elseif($lelongbid->status_semak == 1)
resources/views/marhun/ubahmarhun.blade.php
+138 -125
View File
@@ -1,159 +1,172 @@
@extends('layouts.app')
@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="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="{{ route('report.lapubahmarhunlelong') }}" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Senarai SAG Perubahan Marhun: {{$getpengesahan['caw_name']}}
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="exportform" action="{{route('report.exportubahmarhun')}}" method="POST">
@csrf
<h4> Senarai Perubahan Marhun </h4>
<table class="table table-striped table-xl text-center" id="senaraiubahmarhun" style="width:100%">
<thead class="bg-primary text-white">
<!--<tr>
<th width="5%" align="left"></th>
<th width="25%" align="left"></th>
<th width="5%" align="left"></th>
<th width="25%" align="left"></th>
<th width="25%" align="left" colspan='4'>Maklumat Marhun</th>
<th width="25%" align="left">Marhun Asal</th>
<th width="25%" align="left">Marhun Ubah</th>
<th width="25%" align="left">Marhun Ubah</th>
<th width="25%" align="left"></th>
<th width="25%" align="left"></th>
</tr>-->
<tr>
<th width="5%" align="left">No</th>
<th width="25%" align="left">Cawangan</th>
<th width="5%" align="left">Lelong ID</th>
<th width="25%" align="left">No Rujukan</th>
<th width="5%" align="left">Karat Asal</th>
<th width="5%" align="left">Karat Baru</th>
<th width="5%" align="left">Berat Asal</th>
<th width="5%" align="left">Berat Baru</th>
<th width="15%" align="left">Tarikh Mohon</th>
<th width="15%" align="left">Tarikh Disahkan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $info)
@endif
<table class='table text-center table-bordered table-hover' id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<td width="5%" align="center">{{ $loop->iteration }} </td>
@foreach($info['details'] as $details)
<td width="14%" align="center">{{ $details['caw_name'] }}</td>
@endforeach
<td width="14%" align="center">{{ $info['lap']['lelong_id'] }}</td>
<td width="14%" align="center">{{ $info['lap']['norujukan'] }}</td>
<td width="17%" align="center">{{ $info['lap']['old_karat'] }}</td>
<td width="17%" align="center">{{ $info['lap']['karat'] }}</td>
<td width="17%" align="center">{{ number_format($info['lap']['old_berat'], 2, '.', ',') }}</td>
<td width="17%" align="center">{{ number_format($info['lap']['berat'], 2, '.', ',') }}</td>
<td width="17%" align="center">{{ $info['lap']['diminta_pada'] }}</td>
<td width="17%" align="center">{{ $info['lap']['disahkan_pada'] }}</td>
<th>Bil</th>
<th>No Rujukan</th>
<th>Perubahan</th>
<th>Marhun Asal</th>
<th>Marhun Baru</th>
<th>Mutu Asal</th>
<th>Mutu Baru</th>
<th>Berat Asal (gm)</th>
<th>Berat Baru (gm)</th>
<th>Diminta Oleh</th>
<th>Disahkan Oleh</th>
<th>Status</th>
</tr>
@endforeach
</tbody>
</thead>
<tbody>
@forelse($cawangan as $marhun)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $marhun['norujukan'] }}</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
@if($item['status_ubah'] == 1)
Mutu
@elseif($item['status_ubah'] == 2)
Pertambahan Marhun
@elseif($item['status_ubah'] == 3)
Hapus Marhun
@elseif($item['status_ubah'] == 4)
Berat
@elseif($item['status_ubah'] == 5)
Mutu & Berat
@elseif($item['status_ubah'] == 7)
Marhun
@elseif($item['status_ubah'] == 8)
Mutu, Berat & Marhun
@elseif($item['status_ubah'] == 9)
Mutu & Marhun
@elseif($item['status_ubah'] == 10)
Berat & Marhun
@endif
<br>
@endforeach</td>
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_marhun']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_marhun'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
@endif {{$item['request_marhun']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_karat']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_karat'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
@endif{{$item['request_karat']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_berat']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_berat'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
@endif{{$item['request_berat']}}<br>
@endforeach</td>
<td>{{ $marhun['diminta_oleh'] }}</td>
<td>{{ $marhun['disahkan_oleh'] }}</td>
<td><button class="btn btn-success btn-sm hovernone-success" disabled>BERJAYA DISAHKAN</button></td>
</tr>
@empty
<tr>
<td colspan="7">No Data</td>
</tr>
@endforelse
</tbody>
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(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',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
var tableubah = $('#senaraiubahmarhun').DataTable( {
"columnDefs": [
var tablelelong = $('#tablelelong').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 4,
"orderable": false
}
],
order: [[0, 'asc']],
// "ordering": false,
"searching":false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
buttons: [
{
className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export',
titleAttr: 'Muat Turun PDF',
text: '<h8><b>PDF</b></h8>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
// dom: 'Bfrtip',
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
// $('.addsim').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addsim').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
// function selectall(cb) {
// tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
// $(this).prop('checked', cb.checked);
// })
// }
</script>
@endsection
@endsection
resources/views/marhun/ubahmarhuncaw.blade.php
+92
View File
@@ -0,0 +1,92 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Senarai Ubah Marhun
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $laporan)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $laporan['brg']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['brg']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $laporan['brg']['fasa']}}</td>
<td align="left">
@foreach($laporan['detailsbrg'] as $details)
<a class="btn m-1 btn-primary" href=" {{ route('report.lapubahmarhunlelongindex', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="far fa-edit"></i></a>
<span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $details['caw_name']}}</span><br>
@endforeach
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablenotislelong = $('#tablenotislelong').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/pdf/brglelcaw.blade.php
+1 -1
View File
@@ -91,7 +91,7 @@ tr:nth-child(even) {
<br>
<tr>
@foreach ($info as $info)
<td>ID Lelong: {{$info['lelong_id']}}</td>
<td>Batch Lelong: {{$info['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdf/cetakbdbrglelong.blade.php
+1 -1
View File
@@ -91,7 +91,7 @@ tr:nth-child(even) {
<br>
{{-- <tr>
@foreach ($arrayinfo as $laporan)
<td>ID Lelong : {{$laporan['laporan']['lelong_id']}}</td>
<td>Batch Lelong : {{$laporan['laporan']['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdf/cetakkeluarscanbarcode.blade.php
+1 -1
View File
@@ -83,7 +83,7 @@
<td colspan="2"><b>Cawangan: {{$caw['caw_name']}}</b></td>
</tr>
<tr>
<td colspan="2"><b>ID Lelong: {{$lelong_id}}</b></td>
<td colspan="2"><b>Batch Lelong: {{$lelong_id}}</b></td>
</tr>
</table>
resources/views/pdf/cetakkeluarscanbarcodejual.blade.php
+1 -1
View File
@@ -81,7 +81,7 @@ tr:nth-child(even) {
<td colspan="2"><b>Cawangan: {{$caw['caw_name']}}</b></td>
</tr>
<tr>
<td colspan="2"><b>ID Lelong: {{$lelong_id}}</b></td>
<td colspan="2"><b>Batch Lelong: {{$lelong_id}}</b></td>
</tr>
</table>
resources/views/pdf/cetakmasukscanbarcode.blade.php
+1 -1
View File
@@ -80,7 +80,7 @@
<td colspan="2"><b>Cawangan: {{$caw['caw_name']}}</b></td>
</tr>
<tr>
<td colspan="2"><b>ID Lelong: {{$lelong_id}}</b></td>
<td colspan="2"><b>Batch Lelong: {{$lelong_id}}</b></td>
</tr>
</table>
resources/views/pdf/cetakterimaserahmarhun.blade.php
+1 -1
View File
@@ -81,7 +81,7 @@ tr:nth-child(even) {
<td colspan="2"><b>Cawangan: {{$caw['caw_name']}}</b></td>
</tr>
<tr>
<td colspan="2"><b>ID Lelong: {{$lelong_id}}</b></td>
<td colspan="2"><b>Batch Lelong: {{$lelong_id}}</b></td>
</tr>
</table>
resources/views/pdf/laporanbrgleldetailscaw.blade.php
+1 -1
View File
@@ -92,7 +92,7 @@ tr:nth-child(even) {
<br>
<tr>
@foreach ($arrayinfo as $laporan)
<td>ID Lelong : {{$laporan['laporan']['lelong_id']}}</td>
<td>Batch Lelong : {{$laporan['laporan']['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdf/laporanbrglelpembidacaw.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@ tr:nth-child(even) {
<thead>
<br>
<tr>
<td>ID Lelong: {{$lelong_id}}</td>
<td>Batch Lelong: {{$lelong_id}}</td>
@foreach ($info as $info)
<td>Tarikh Lelong : @php
resources/views/pdf/laporanlelfullcaw.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@ tr:nth-child(even) {
<thead>
<br>
<tr>
<td>ID Lelong: {{$lelong_id}}</td>
<td>Batch Lelong: {{$lelong_id}}</td>
@foreach ($info as $info)
<td>Tarikh Lelong : @php
resources/views/pdf/laporannamapembidacaw.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@ tr:nth-child(even) {
<thead>
<br>
<tr>
<td>ID Lelong: {{$lelong_id}}</td>
<td>Batch Lelong: {{$lelong_id}}</td>
@foreach ($lelongid as $info)
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
resources/views/pdf/listlelong.blade.php
+1 -1
View File
@@ -91,7 +91,7 @@ tr:nth-child(even) {
<br>
<tr>
@foreach ($arrayinfo as $laporan)
<td>ID Lelong : {{$laporan['laporan']['lelong_id']}}</td>
<td>Batch Lelong : {{$laporan['laporan']['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdf/listlelongdetails.blade.php
+1 -1
View File
@@ -91,7 +91,7 @@ tr:nth-child(even) {
<br>
<tr>
@foreach ($arrayinfo as $laporan)
<td>ID Lelong : {{$laporan['laporan']['lelong_id']}}</td>
<td>Batch Lelong : {{$laporan['laporan']['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdf/listubahmarhun.blade.php
+1 -1
View File
@@ -94,7 +94,7 @@ tr:nth-child(even) {
<tr>
<th width="5%" align="left">No</th>
<th width="20%" align="left">Cawangan</th>
<th width="5%" align="left">Lelong ID</th>
<th width="5%" align="left">Batch Lelong</th>
<th width="15%" align="left">No Rujukan</th>
<th width="7%" align="left">Karat Asal</th>
<th width="7%" align="left">Karat Baru</th>
resources/views/pdf/pdflapbrglelpembida.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@ tr:nth-child(even) {
<thead>
<br>
<tr>
<td>ID Lelong: {{$lelong_id}}</td>
<td>Batch Lelong: {{$lelong_id}}</td>
@foreach ($info as $info)
<td>Tarikh Lelong: @php
resources/views/pdf/pdflaplelong.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@ tr:nth-child(even) {
<thead>
<br>
<tr>
<td>Lelong ID: {{$lelong_id}}</td>
<td>Batch Lelong: {{$lelong_id}}</td>
@foreach ($info as $info)
<td>Tarikh Lelong:@php
resources/views/pdf/pdflelongreport.blade.php
+1 -1
View File
@@ -128,7 +128,7 @@
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
<tr>
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
resources/views/pdf/pdflelongreportpc.blade.php
+1 -1
View File
@@ -128,7 +128,7 @@
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
<tr>
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
resources/views/pdf/pdflelongtaklaku.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@ tr:nth-child(even) {
<thead>
<br>
<tr>
<td>Lelong ID: {{$lelong_id}}</td>
<td>Batch Lelong: {{$lelong_id}}</td>
@foreach ($infolelong as $info)
<td>Cawangan:{{ $info->caw_name}}</td>
<td>Tarikh Lelong:{{ $info->tarikh_lelong}}</td>
resources/views/pdf/pdflelongtebus.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@ tr:nth-child(even) {
<thead>
<br>
<tr>
<td>ID Lelong: {{$lelong_id}}</td>
<td>Batch Lelong: {{$lelong_id}}</td>
@foreach ($info as $info)
<td>Tarikh Lelong: @php
resources/views/pdf/pdfsenarailapbidaan.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@ tr:nth-child(even) {
<thead>
<br>
<tr>
<td>ID Lelong: {{$lelong_id}}</td>
<td>Batch Lelong: {{$lelong_id}}</td>
@foreach ($lelongid as $info)
<td>Tarikh Lelong:@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong );
resources/views/pdf/simulasireportbycust.blade.php
+278
View File
@@ -0,0 +1,278 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<style>
#sim {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px;
border-collapse: collapse;
width: 100%;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
border: 0px solid;
padding: 1px;
text-align: left;
}
#sim tr:nth-child(even){}
#sim tr:hover {}
#sim th {
text-align: center;
border: 0px solid;
table-layout:auto;
color: black;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
* {
box-sizing: border-box;
}
.row {
margin-right:-5px;
margin-right:-5px;
}
.column {
float: right;
width: 100%;
padding: 5px;
}
/* Clearfix (clear floats) */
.row::after {
content: "";
clear: both;
display: table;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 200%;
border: 0px solid #ddd;
}
td {
text-align: right;
padding: 16px;
}
th{
text-align: center;
padding: 16px;
}
tr:nth-child(even) {
}
</style>
<style>
/** Define now the real margins of every page in the PDF **/
body {
margin-top: 1cm;
/* margin-left: 2cm; */
/* margin-right: 2cm; */
margin-bottom: 2cm;
}
/** Define the header rules **/
header {
position: fixed;
top: -1cm;
left: 0cm;
right: 0cm;
height: 0cm;
/** Extra personal styles **/
/* background-color: #eaeaea; */
color: black;
text-align: center;
line-height: 1.5cm;
}
/** Define the footer rules **/
footer {
position: fixed;
bottom: 0cm;
left: 0cm;
right: 0cm;
height: 2cm;
/** Extra personal styles **/
/* background-color: #eaeaea; */
color: black;
text-align: center;
line-height: 1.5cm;
}
footer .pagenum:before {
content: counter(page);
}
</style>
<body>
<header>
<u><b><h5>LAPORAN SIMULASI CAWANGAN by PELANGGAN: {{$cawname['caw_name']}}</h5></b></u>
</header>
<footer>
<div class="pagenum-container"><span class="pagenum"></span></div>
</footer>
<table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
<thead>
<tr>
<th>No</th>
<th>Nama Pelanggan</th>
<th>No.KP</th>
<th>No.Rujukan</th>
<th>Tempoh</th>
<th>Berat(gm)</th>
<th>Keuntungan Telah Bayar (RM)</th>
<th>Keuntungan 6 Bulan (RM)</th>
<th>Keuntungan Semasa (RM)</th>
<th>Pembiayaan Asal (RM)</th>
<th>Baki Pembiayaan (RM)</th>
<th>Nilai Marhun (RM)</th>
</tr>
</thead>
@foreach ($marhuns as $index=> $marhun)
<tr>
<td>{{$loop->iteration}}</td>
<td style='word-wrap' align="left">{{ $marhun['nama']['nama']}}</td>
<td style='word-wrap'>{{ $marhun['nokp']}}</td>
<td style='white-space:nowrap;'>@foreach ($marhun['listsag'] as $item)
{{-- {{$loop->iteration}}.{{ $item['norujukan'] }}<br> --}}
{{ $item['norujukan'] }}<br>
@endforeach</td>
<td>@foreach ($marhun['listsag'] as $item)
{{ $item['tempoh'] }}<br>
@endforeach</td>
<td align = 'right'>
@php $jumberat = 0;@endphp
@foreach ($marhun['listsag'] as $item)
@php
$jumberat = $jumberat + $item['berat'];
@endphp
{{ number_format($item['berat'], 2, '.', ',') }}<br>
@endforeach
<strong>{{ number_format($jumberat, 2, '.', ',') }}</strong>
</td>
<td align = 'right'>
@php $jumktlhbyr = 0;@endphp
@foreach ($marhun['listsag'] as $item)
@php
$jumktlhbyr = $jumktlhbyr + $item['ktlhbyr'];
@endphp
{{ number_format($item['ktlhbyr'], 2, '.', ',') }}<br>
@endforeach
<strong>{{ number_format($jumktlhbyr, 2, '.', ',') }}</strong>
</td>
<td align = 'right'>
@php $jum6bulan = 0;@endphp
@foreach ($marhun['listsag'] as $item)
@php
$jum6bulan = $jum6bulan + $item['bakiupah'];
@endphp
{{ number_format($item['bakiupah'], 2, '.', ',') }}<br>
@endforeach
<strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
</td>
<td align = 'right'>
@php $jum6bulan = 0;@endphp
@foreach ($marhun['listsag'] as $item)
@php
$jum6bulan = $jum6bulan + $item['keuntungan'];
@endphp
{{ number_format($item['keuntungan'], 2, '.', ',') }}<br>
@endforeach
<strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
</td>
<td align = 'right'>
@php $jumpinjasal = 0;@endphp
@foreach ($marhun['listsag'] as $item)
@php
$jumpinjasal = $jumpinjasal + $item['pinjaman'];
@endphp
{{ number_format($item['pinjaman'], 2, '.', ',') }}<br>
@endforeach
<strong>{{ number_format($jumpinjasal, 2, '.', ',') }}</strong>
</td>
<td align = 'right'>
@php $jumpinjaman = 0;@endphp
@foreach ($marhun['listsag'] as $item)
@php
$jumpinjaman = $jumpinjaman + $item['bakipjm'];
@endphp
{{ number_format($item['bakipjm'], 2, '.', ',') }}<br>
@endforeach
<strong>{{ number_format($jumpinjaman, 2, '.', ',') }}</strong>
</td>
<td align = 'right'>
@php $jumnilaimarhun = 0;@endphp
@foreach ($marhun['listsag'] as $item)
@php
$jumnilaimarhun = $jumnilaimarhun + $item['nilaimarhun'];
@endphp
{{ number_format($item['nilaimarhun'], 2, '.', ',') }}<br>
@endforeach
<strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
</td>
<!-- <td align = 'right'>
@php $jumhargaasas = 0;@endphp
@foreach ($marhun['listsag'] as $item)
@php
$jumhargaasas = $jumhargaasas + $item['hargaasas'];
@endphp
{{ number_format($item['hargaasas'], 2, '.', ',') }}<br>
@endforeach
<strong>{{ number_format($jumhargaasas, 2, '.', ',') }}</strong>
</td> -->
</tr>
@endforeach
{{--
<tr>
<td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
<td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_pinjaman, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_bakiupah, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_bakilelong, 2, '.', ',') }}</strong></td>
</tr> --}}
</table>
</body>
resources/views/pdfkhas/cetakjadualN.blade.php
+1 -1
View File
@@ -105,7 +105,7 @@
<br>
<tr>
@foreach ($info as $info)
<td>ID Lelong: {{$info['lelong_id']}}</td>
<td>Batch Lelong: {{$info['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdfkhas/cetakjadualO.blade.php
+1 -1
View File
@@ -97,7 +97,7 @@
<br>
<tr>
@foreach ($info as $info)
<td>ID Lelong: {{$info['lelong_id']}}</td>
<td>Batch Lelong: {{$info['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdfkhas/cetaklaporanlelong.blade.php
+1 -1
View File
@@ -61,7 +61,7 @@
<td>PERMODALAN KELANTAN BERHAD</td>
<td><strong><u>LAPORAN LELONGAN</u></strong></td>
<td>ID Lelong: {{$info['lelong_id']}}</td>
<td>Batch Lelong: {{$info['lelong_id']}}</td>
<td>
</td>
</tr>
resources/views/pdfkhas/cetaklaporantuntutbaki.blade.php
+2 -2
View File
@@ -60,7 +60,7 @@
<td>PERMODALAN KELANTAN BERHAD</td>
<td><strong><u>LAPORAN TUNTUT/BELUM LEBIHAN</u></strong></td>
<td>ID Lelong: {{$info['lelong_id']}}</td>
<td>Batch Lelong: {{$info['lelong_id']}}</td>
<td>
</td>
</tr>
@@ -83,7 +83,7 @@
<br>
<tr>
@foreach ($info as $info)
<td>ID Lelong: {{$info['lelong_id']}}</td>
<td>Batch Lelong: {{$info['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdfkhas/cetaksandarankpkt.blade.php
+1 -1
View File
@@ -89,7 +89,7 @@ tr:nth-child(even) {
<br>
<tr>
@foreach ($info as $info)
<td>ID Lelong: {{$info['lelong_id']}}</td>
<td>Batch Lelong: {{$info['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pdfkhas/cetaksandaranpembida.blade.php
+1 -1
View File
@@ -89,7 +89,7 @@ tr:nth-child(even) {
<br>
<tr>
@foreach ($info as $info)
<td>ID Lelong: {{$info['lelong_id']}}</td>
<td>Batch Lelong: {{$info['lelong_id']}}</td>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
resources/views/pembayaran/senarailelongbayaran.blade.php
+1 -1
View File
@@ -28,7 +28,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
{{-- <th>Cawangan</th> --}}
<th>Fasa</th>
<th>Tarikh Lelong</th>
resources/views/pembayaran/testbillplz.blade.php
+1 -1
View File
@@ -33,7 +33,7 @@
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="lelong_id">ID Lelong</label>
<label for="lelong_id">Batch Lelong</label>
<input type="text" class="form-control" name="lelong_id" id="lelong_id">
</div>
</div>
resources/views/pembida/kemaskini.blade.php
+3 -3
View File
@@ -43,16 +43,16 @@
</div>
<div class="custom-control custom-switch" >
<input type="checkbox" class="custom-control-input" name="status" id="customSwitch1" onchange="showstatus(this)">
<label class="custom-control-label" for="customSwitch1" data-status="{{ $user->status }}" id="txtstatus"></lable>
<label class="custom-control-label" for="customSwitch1" data-status="{{ $user->status }}" id="txtstatus"></label>
</div>
</div>
<div class="d-flex col-md-6">
<div style="margin-right:2%;">
<label for="status1">Ban</label>
<label for="status1">Senarai Hitam</label>
</div>
<div class="custom-control custom-switch" >
<input type="checkbox" class="custom-control-input" style="background-color:red !important" name="statusban" id="customSwitch2" onchange="showban(this)">
<label class="custom-control-label" for="customSwitch2" id="txtstatusban"></lable>
<label class="custom-control-label" for="customSwitch2" id="txtstatusban"></label>
</div>
</div>
</div>
resources/views/pembida/listkebenaranbayarantunai.blade.php
+1 -1
View File
@@ -24,7 +24,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Status Export</th>
resources/views/pembida/senlelbelumbayarbidaan.blade.php
+1 -1
View File
@@ -15,7 +15,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Status Lelong</th>
resources/views/pembida/senlelpembayaranbidaan.blade.php
+1 -1
View File
@@ -14,7 +14,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Status Export</th>
resources/views/pengesahan/listperubahanmutumarhun.blade.php
+77 -13
View File
@@ -13,40 +13,104 @@
Senarai SAG: Pengesahan Oleh PC
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<table class='table text-center table-bordered table-hover' id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Cawangan</th>
{{-- <th>ID Lelong</th> --}}
{{-- <th>Cawangan</th> --}}
<th>No Rujukan</th>
<th>Perubahan</th>
<th>Marhun Asal</th>
<th>Marhun Baru</th>
<th>Mutu Asal</th>
<th>Mutu Baru</th>
<th>Berat Asal (gm)</th>
<th>Berat Baru (gm)</th>
<th>Status</th>
<th>Diminta Oleh</th>
<th>Disahkan Oleh</th>
{{-- <th>Diminta Oleh</th>
<th>Disahkan Oleh</th> --}}
<!-- <th class="text-center">Action</th> -->
</tr>
</thead>
<tbody>
@foreach($cawangan as $marhun)
{{-- @foreach($cawangan as $marhun) --}}
@forelse($cawangan as $marhun)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $marhun['lelong_id'] }}</td>
<td align = 'left'>{{ $marhun['namacaw'] }}</td>
{{-- <td>{{ $marhun['lelong_id'] }}</td> --}}
{{-- <td align = 'left'>{{ $marhun['namacaw'] }}</td> --}}
<td>{{ $marhun['norujukan'] }}</td>
<td>
<button class="btn btn-success btn-sm hovernone-success" disabled>BERJAYA DISAHKAN</button>
<td>{{ $marhun['diminta_oleh'] }}</td>
<td>{{ $marhun['disahkan_oleh'] }}</td>
{{-- {{dd($marhun['detailmarhun'])}} --}}
<td>@foreach ($marhun['detailmarhun'] as $item)
@if($item['status_ubah'] == 1)
Mutu
@elseif($item['status_ubah'] == 2)
Pertambahan Marhun
@elseif($item['status_ubah'] == 3)
Hapus Marhun
@elseif($item['status_ubah'] == 4)
Berat
@elseif($item['status_ubah'] == 5)
Mutu & Berat
@elseif($item['status_ubah'] == 7)
Marhun
@elseif($item['status_ubah'] == 8)
Mutu, Berat & Marhun
@elseif($item['status_ubah'] == 9)
Mutu & Marhun
@elseif($item['status_ubah'] == 10)
Berat & Marhun
@endif
<br>
@endforeach</td>
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_marhun']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_marhun'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
@endif {{$item['request_marhun']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_karat']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_karat'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
@endif{{$item['request_karat']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_berat']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_berat'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
@endif{{$item['request_berat']}}<br>
@endforeach</td>
<td><button class="btn btn-success btn-sm hovernone-success" disabled>BERJAYA DISAHKAN</button></td>
{{-- <td>{{ $marhun['diminta_oleh'] }}</td> --}}
{{-- <td>{{ $marhun['disahkan_oleh'] }}</td> --}}
<!-- <td>
<a href=" {{ route('pengesahan.detailmutumarhun', ['norujukan'=>$marhun['norujukan'], $id]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
</td> -->
</tr>
@endforeach
@empty
<tr>
<td colspan="7">No Data</td>
</tr>
@endforelse
</tbody>
</table>
resources/views/pengesahan/senarailelong.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Nama Cawangan</th>
<th>Harga Emas Asas</th>
resources/views/pengesahan/senarailelongubahmutu.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
{{-- <th>Cawangan</th> --}}
<th>Tarikh Lelong</th>
<th>Fasa</th>
resources/views/pengesahan/senaraitangguhlelong.blade.php
+1 -1
View File
@@ -20,7 +20,7 @@
<tr>
<th>Bil</th>
<th>Tarikh Tangguh</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>No Rujukan</th>
<th>Nota</th>
<th class="text-center">Tindakan</th>
resources/views/serahan/laporanserahan.blade.php
+1 -1
View File
@@ -15,7 +15,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Cawangan</th>
<th>Fasa</th>
<th>Tarikh Lelong</th>

Some files were not shown because too many files have changed in this diff Show More