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

Merge branch 'main' into faiqahzaman

Browse Source
This commit is contained in:
faiqahzaman
2022-04-28 13:34:05 +08:00
parent b08fbf2896 36bb8e5665
commit c5e6030e09
25 changed files with 757 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+1 -1
View File
@@ -128,7 +128,7 @@ class AccountController extends Controller
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', '3,2')
->where('payment.status_payment_opt', '3,2')
->where('lelongbidder.status_payment', 2)
->select(
'lelongbid.id as lelongbid_id',
app/Http/Controllers/ImportDataController.php
+163
View File
@@ -0,0 +1,163 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Carbon\Carbon;
use App\Models\User;
use App\Models\Gadai;
use App\Models\GadaiMarhun;
use App\Models\Cawangan;
use App\Models\TransaksiKeuntungan;
use DateTime;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Input;
class ImportDataController extends Controller
{
//PC
public function importdata(Request $request)
{
//return view('importdata.importdatacawangan');
$caw = Cawangan::all();
return view('importdata.listcawangan',compact('caw'));
}
public function listcawangan()
{
$caw = Cawangan::all();
return view('importdata.listcawangan',compact('caw'));
}
public function showsenarai($kodcaw)
{
$caw = Cawangan::where('caw_code','=',$kodcaw)->first();
return view('importdata.showsenarai',compact('caw'));
}
public function importdatagadai($kodcaw)
{
// dd($kodcaw);
$caw = Cawangan::all();
if (Gadai::where('kodcaw', '=', $kodcaw)->count() == null)
{
$results = DB::select("SELECT * FROM cawangan where caw_code = '$kodcaw' ");
//dd($results);
foreach($results as $row)
{
$caw_ip = $row->caw_ip;
$caw_dbuser = $row->caw_dbuser;
$caw_dbpass = $row->caw_dbpass;
$caw_dbname = $row->caw_dbname;
$caw_name = $row->caw_name;
$caw_id = $row->id;
// dd($caw_ip);
$db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass);
if (!$db)
{
echo "<p style='color:#F00'>Server Down: $caw_name</p>";
continue;
die('Could not connect: ' . mysqli_error());
}
mysqli_select_db($db,$caw_dbname);
$count = 0;
$result=mysqli_query($db,"SELECT * FROM gadai where sttebus = '' and upah12 is NOT NULL");
while($row_gadai = mysqli_fetch_array($result))
{
$count++;
$kodcaw = $row_gadai['kodcaw'];
$norujukan = $row_gadai['norujukan'];
$nopelanggan = $row_gadai['nopelanggan'];
$nokp = $row_gadai['nokp'];
$t_gadai = $row_gadai['t_gadai'];
$masa = $row_gadai['masa'];
$sirig = $row_gadai['sirig'];
$nilaimarhun = $row_gadai['nilaimarhun'];
$berat = $row_gadai['berat'];
$pinjaman = $row_gadai['pinjaman'];
$kadarupah = $row_gadai['kadarupah'];
$tempoh = $row_gadai['tempoh'];
$t_matang = $row_gadai['t_matang'];
$t_matang1 = $row_gadai['t_matang1'];
$teller = $row_gadai['teller'];
$bakipjm = $row_gadai['bakipjm'];
$bakiupah = $row_gadai['bakiupah'];
$marhun = $row_gadai['marhun'];
$taglel = $row_gadai['taglel'];
$ansakhir = $row_gadai['ansakhir'];
$t_update = $row_gadai['t_update'];
$tagtbaki = $row_gadai['tagtbaki'];
$penilai = $row_gadai['penilai'];
$percentpinj = $row_gadai['percentpinj'];
$tagpalsu = $row_gadai['tagpalsu'];
$semakbarcode = $row_gadai['semakbarcode'];
$historygadaian = $row_gadai['historygadaian'];
$upah12 = $row_gadai['upah12'];
$hargajualan = $row_gadai['hargajualan'];
$bakihargajualan = $row_gadai['bakihargajualan'];
$tempohbayar = $row_gadai['tempohbayar'];
DB::insert("INSERT INTO elelong.gadai (kodcaw,norujukan,nopelanggan,nokp,t_gadai,masa,sirig,nilaimarhun,berat,pinjaman,sttebus,tagcetak,kadarupah,tempoh,t_matang,t_matang1,teller,bakipjm,bakiupah,marhun,taglel,ansakhir,t_update,tagtbaki,penilai,percentpinj,tagpalsu,semakbarcode,historygadaian,upah12,hargajualan,bakihargajualan,tempohbayar)
VALUES ('$kodcaw','$norujukan','$nopelanggan','$nokp','$t_gadai','$masa','$sirig','$nilaimarhun','$berat','$pinjaman', '','','$kadarupah','$tempoh','$t_matang','$t_matang1','$teller','$bakipjm','$bakiupah','$marhun','$taglel','$ansakhir','$t_update','$tagtbaki','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$tempohbayar')");
//untuk gadaimarhun
$result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'");
while($row_tender1 = mysqli_fetch_array($result1))
{
$kodcaw1 = $row_tender1['kodcaw'];
$norujukan1 = $row_tender1['norujukan'];
$bil1 = $row_tender1['bil'];
$t_gadai1 = $row_tender1['t_gadai'];
$marhun1 = $row_tender1['marhun'];
$nota1 = $row_tender1['nota'];
$karat1 = $row_tender1['karat'];
$berat1 = $row_tender1['berat'];
$harga1 = $row_tender1['harga'];
$n_marhun1 = $row_tender1['n_marhun'];
DB::insert("INSERT INTO elelong.gadaimarhun (kodcaw,norujukan,t_gadai,bil,marhun,nota,karat,berat,harga,n_marhun)
VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota1','$karat1','$berat1','$harga1','$n_marhun1')");
}
}
return redirect()->route('importdata.listcawangan')
->with('success','Data '.$caw_name.' berjaya import');
}
}else{
return redirect()->route('importdata.listcawangan')
->with('success','Data '.$kodcaw.' Ini Telah Wujud Sila Hapus Data Dahulu');
}
}
public function hapusdatacawangan($kodcaw)
{
$caw = Gadai::where('kodcaw','=',$kodcaw);
$caw->delete();
$cawmarhun = GadaiMarhun::where('kodcaw','=',$kodcaw);
$cawmarhun->delete();
// dd($cawmarhun);
return redirect()->route('importdata.listcawangan')
->with('success','Data '.$kodcaw.' Berjaya Dihapuskan');
}
}
app/Http/Controllers/LelongController.php
+48 -10
View File
@@ -984,14 +984,26 @@ class LelongController extends Controller
public function lapbidaanpembidaindex (Request $request){
$arraydetails = [];
$lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
foreach($lelongid as $laporan){
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.laporanbidaanindex',compact('lelongid'));
return view('lelong.laporanbidaanindex',compact('lelongid','arraydetails'));
}
@@ -1068,12 +1080,25 @@ class LelongController extends Controller
}
Public function laplelongindex (Request $request){
$arraydetails =[];
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
return view('lelong.laplelongindex',compact('lelongid'));
foreach($lelongid as $laporan){
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.laplelongindex',compact('lelongid','arraydetails'));
}
@@ -1168,11 +1193,24 @@ class LelongController extends Controller
Public function lapbrglelpembidaindex (Request $request){
$arraydetails = [];
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
return view ('lelong.lapbrglelpembidaindex',compact('lelongid'));
foreach($lelongid as $laporan){
$details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails, ['laporan' =>$laporan,'details' =>$details]);
}
return view ('lelong.lapbrglelpembidaindex',compact('lelongid','arraydetails'));
}
app/Http/Controllers/MarhunController.php
+82 -111
View File
@@ -521,83 +521,72 @@ class MarhunController extends Controller
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)->where('lelong_id', $request->lelong_id)->get();
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)
->first();
$pengesahan->id = $pengesahan['id'] ;
$pengesahan->disahkan_oleh = $user['id'];
$pengesahan->disahkan_pada = $currentdate;
$pengesahan->save();
// dd($pengesahan);
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
if($request->jenis_button == "terima")
{
foreach($pengesahan as $index1=>$sah)
{
$savepengesahan = Pengesahan::where('id', $sah['id'])
->first();
$savepengesahan->disahkan_oleh = $user['id'];
$savepengesahan->disahkan_pada = $currentdate;
$savepengesahan->status = 1;
$savepengesahan->save();
$lelongbid = LelongBid::where('id', $sah->lelongbid_id)->get();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $sah->lelongbid_id)->get();
$lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
->where('pengesahan.lelongbid_id', $sah->lelongbid_id)
->where('pengesahan.id', $sah->id)
->get();
$total_berat = 0;
$total_hargaasas = 0;
foreach($lelongbidmarhuns as $index2=>$bidmarhuns)
{
if($bidmarhuns->status_ubah == 3)
{
$bidmarhuns->delete();
}
else
{
//
}
$lelongbids = LelongBid::where('id', $sah->lelongbid_id)->first();
$txtmarhun = ",1 " . $bidmarhuns->marhun ;
$lelongbids->marhun = str_replace( $txtmarhun,"", $lelongbid[0]['marhun']);
$lelongbids->berat = $total_berat += $bidmarhuns->berat ;
$lelongbids->hargaasas = $total_hargaasas += $bidmarhuns->hargaasas;
$lelongbids->save();
}
$lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->where('pengesahan.id', $pengesahan->id)
->get();
dd($lelongbidmarhuns['marhun']);
foreach($lelongbidmarhuns as $bidmarhuns)
{
if($bidmarhuns->status_ubah == 3)
{
$bidmarhuns->delete();
}
else
{
//
}
}
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->select('pengesahan.id as pengesahan_id')
->first();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$pengesahan->lelongbid_id)
->get();
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
$txtmarhun = ",1 " . $lelongbidmarhuns->marhun ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat;
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas;
$lelongbid->save();
// $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
}
else if($request->jenis_button == "tangguhlelong")
{
foreach($pengesahan as $index1=>$sah)
{
$savepengesahan = Pengesahan::where('id', $sah['id'])
->first();
$savepengesahan->disahkan_oleh = $user['id'];
$savepengesahan->disahkan_pada = $currentdate;
$savepengesahan->status = 1;
$savepengesahan->save();
$lelongbidasal = LelongBid::where('id', $sah['lelongbid_id'])->first();
//add into table tangguhlelong
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $sah->lelong_id;
$tangguhlelong->lelongbid_id = $sah->lelongbid_id;
$tangguhlelong->norujukan = $sah->norujukan;
$tangguhlelong->pinjaman = $lelongbidasal['pinjaman'];
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->nota;
$tangguhlelong->save();
$marhundelete = LelongBid::where('id', $sah->lelongbid_id)->delete();
}
//add into table tangguhlelong
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $pengesahan->lelong_id;
$tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
$tangguhlelong->norujukan = $pengesahan->norujukan;
$tangguhlelong->pinjaman = $lelongbid[0]['pinjaman'];
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->nota;
$tangguhlelong->save();
// dd($tangguhlelong);
$marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete();
}
@@ -641,29 +630,38 @@ class MarhunController extends Controller
}
public function pcdelete($id, $lelongbid_id)
{
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
->where('pengesahan.lelongbid_id', $lelongbid_id)
->select('pengesahan.id as pengesahan_id')
->first();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$lelongbid_id)
->get();
$lelongbid = LelongBid::where('id', $lelongbid_id)->first();
$txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
$lelongbid->save();
}
public function senarailelong()
{
$arrayinfo = [];
$lelong = Lelong::where('sts_lelong', 0)
->get()->toArray();
->get();
foreach($lelong as $details)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id', $details['id'])
->get()
->toArray();
array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
}
return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
return view('pengesahan.senarailelong',compact('lelong'));
}
public function senaraitangguhlelong($id)
{
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id')
$tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
->where('tangguhlelong.lelong_id', $id)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
@@ -681,41 +679,14 @@ class MarhunController extends Controller
)
->get();
foreach($tangguhlelong as $index1=>$tanguhlel)
{
$getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('lelong_id', $id)
->first();
$tangguhlelong[$index1]['details'] = $tanguhlel;
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
}
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
}
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
{
$tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
->where('gadaimarhun.norujukan', $norujukan)
->where('tangguhlelong.id', $tangguhlelong_id)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
'tangguhlelong.pinjaman',
'tangguhlelong.tarikhtangguh',
'tangguhlelong.nota as tangguh_nota',
'tangguhlelong.pinjaman',
'gadaimarhun.id as gadaimarhun_id',
'gadaimarhun.bil',
'gadaimarhun.marhun',
'gadaimarhun.nota as gadai_nota',
'gadaimarhun.karat',
'gadaimarhun.berat',
'gadaimarhun.harga',
'gadaimarhun.n_marhun'
)
$marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
->where('tangguhlelong.lelong_id', $id)
->where('tangguhlelong.norujukan', $norujukan)
->get();
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
app/Http/Controllers/PenggunaController.php
+5 -4
View File
@@ -63,18 +63,19 @@ class PenggunaController extends Controller
$currentdate = $currentdate->toDateTimeString();
//dd($request->all());
$validator = Validator::make($request->all(), [
'email' => 'required|string|unique:users|email'
'email' => 'required|string|unique:users|email',
'username' => 'required|string|unique:users'
]);
if ($validator->fails()) {
$errors = [
'success' => "error",
//'message' => $validator->errors()
'message' => $validator->errors()
];
return redirect()->route('pengguna.index')
->with('success', 'Sila Masukkan Email Yang Sah'); }
->with('message', 'Sila Masukkan Email Yang Sah'); }
$user = new User;
$user->name = $request->name;
@@ -111,7 +112,7 @@ class PenggunaController extends Controller
array_push($arraytaraf,$taraf);
}
}
// dd($arraytaraf);
//dd($arraytaraf);
$user->syncRoles($arraytaraf);
if($request->status == true)
app/Http/Controllers/SimulasiController.php
+19 -10
View File
@@ -57,7 +57,7 @@ class SimulasiController extends Controller
public function janadata(Request $request)
{
// dd($request->all());
//dd($request->all());
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
@@ -185,22 +185,27 @@ class SimulasiController extends Controller
}
elseif($request->caw && $request->caw != 'all')
{
// dd($request->caw);
$caw = Cawangan::where('id','=',$request->caw)->first();
//dd($request->caw);
$caw = Cawangan::whereIn('id',$request->caw)->get();
// dd($caw);
foreach($caw as $index=>$cawsimulasi){
// dd($cawsimulasi->id);
$caw_simulasi = new CawanganSimulasi;
$caw_simulasi->simulasi_id = $simulasi->id;
$caw_simulasi->caw_id = $caw->id;
$caw_simulasi->caw_id = $cawsimulasi->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $caw->lokasi;
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
$caw_simulasi->save();
// dd($caw_simulasi);
$suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all();
$suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
// $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
foreach($suratcaw as $data)
{
$simulasibid = new SimulasiBid;
$simulasibid->simulasi_id = $simulasi->id;
$simulasibid->caw_id = $caw->id;
$simulasibid->caw_id = $cawsimulasi->id;
$simulasibid->kodcaw = $data->kodcaw;
$simulasibid->norujukan = $data->norujukan;
$simulasibid->t_lelong = $request->tarikh_lelong;
@@ -267,6 +272,7 @@ class SimulasiController extends Controller
$updatesimbid->save();
}
}
}
else
{
dd('error');
@@ -301,7 +307,7 @@ class SimulasiController extends Controller
return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo'));
}
public function show($id)
public function show(Request $request, $id)
{
$simulasi_id = $id;
$simulasi = Simulasi::where('id','=',$id)->first();
@@ -460,6 +466,8 @@ class SimulasiController extends Controller
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
->get();
}
@@ -479,7 +487,7 @@ class SimulasiController extends Controller
'total23k',
'total22K',
'total21K',
'total20K',
'total20K',
'total18Kp',
'total18K',
'total14Kp',
@@ -490,7 +498,8 @@ class SimulasiController extends Controller
'jeniskarat',
'data',
'total_upahkeuntungan',
'total_nilaimarhun'));
'total_nilaimarhun'
));
}
public function delete($id)
app/Http/Controllers/TamatKontController.php
+9 -3
View File
@@ -206,14 +206,18 @@ class TamatKontController extends Controller
->first();
$tarikh_lelong = Carbon::parse($t_lelong);
$t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
// $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
$t_lelongdisplay = $tarikh_lelong->format('d-m-Y');
$t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
$t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('norujukan', $surats['norujukan'])
->get();
dd($senarai);
//dd($senarai);
$getsurat[$index1]['list_norujukan'] = $senarai;
}
@@ -226,7 +230,9 @@ class TamatKontController extends Controller
't_lelong',
't_gadais',
't_anggaran',
'tarikh_lelong'
'tarikh_lelong',
't_daftarlelong',
't_lelongdisplay'
));
}
config/app.php
+1
View File
@@ -231,6 +231,7 @@ return [
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
'PDF' => Barryvdh\DomPDF\Facade::class,
'Input' => Illuminate\Support\Facades\Input::class,
],
database/migrations/2021_12_13_053311_create_cawangans_table.php
+2
View File
@@ -218,7 +218,9 @@ class CreateCawangansTable extends Migration
Schema::create('gadaimarhun', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('kodcaw')->nullable();
$table->string('norujukan');
$table->date('t_gadai')->nullable();;
$table->decimal('bil', $precision = 3, $scale = 2);
$table->string('marhun');
$table->string('nota');
database/migrations/2021_12_14_041545_create_simulasis_table.php
+5 -5
View File
@@ -15,13 +15,13 @@ class CreateSimulasisTable extends Migration
{
Schema::create('simulasi', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('tarikh_lelong');
$table->string('tarikh_lelong')->nullable();
$table->time('masatamat_lelong')->nullable();
$table->dateTime('masakemaskini_data')->nullable();
$table->string('kali')->nullable();
$table->string('harga_emas_asas');
$table->string('jbg');
$table->integer('cajlelong');
$table->string('harga_emas_asas')->nullable();
$table->string('jbg')->nullable();
$table->integer('cajlelong')->nullable();
$table->timestamps();
});
@@ -34,7 +34,7 @@ class CreateSimulasisTable extends Migration
$table->string('import_data_sts')->nullable();
$table->date('export_data_stsdate')->nullable();
$table->date('import_data_sts_date')->nullable();
$table->string('lokasi');
$table->string('lokasi')->nullable();
$table->timestamps();
$table->foreign('caw_id')
database/migrations/2021_12_14_041557_create_lelongs_table.php
+1 -1
View File
@@ -37,7 +37,7 @@ class CreateLelongsTable extends Migration
$table->string('import_data_sts')->nullable();
$table->date('export_data_stsdate')->nullable();
$table->date('import_data_sts_date')->nullable();
$table->string('lokasi');
$table->string('lokasi')->nullable();
$table->timestamps();
$table->foreign('caw_id')
database/seeders/RolesSeeder.php
+5
View File
@@ -119,6 +119,10 @@ class RolesSeeder extends Seeder
'name' => 'notistamatkontrak',
'description' => 'Notis 30 Hari Sebelum Tamat Kontrak'
]);
Permission::create([
'name' => 'importdata',
'description' => 'Import Data Cawangan Dari LIVE to Master'
]);
//account
@@ -174,6 +178,7 @@ class RolesSeeder extends Seeder
$role6->givePermissionTo('pengesahan');
$role6->givePermissionTo('notistamatkontrak');
$role6->givePermissionTo('kemaskinihargaasas');
$role6->givePermissionTo('importdata');
$role7 = Role::create(['name' => 'account']);
$role7->givePermissionTo('pengesahanbayaran');
resources/views/importdata/importdatacawangan.blade.php
+38
View File
@@ -0,0 +1,38 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-12 mx-auto card">
@if ($message = Session::get('failed'))
<div class="alert alert-danger" style="margin-top:1%;">
<p>{{ $message }}</p>
</div>
@endif
<h3 class="pt-3" style="margin-left:2%;">Import Data Cawangan</h3>
<form action="" method="POST" id="formsenarai">
@csrf
<div class="form-group row" style="margin-top:2%; margin-left:1%;">
<label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Lelongan</label>
<div>
<input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh">
</div>
<label for="tempoh" class="col-sm-1 col-form-label" style="margin-left:3%;">Tempoh</label>
<div>
<input type="text" class="form-control" id="tempoh" name="tempoh" placeholder="12" disabled>
</div>
</div>
<div class="form-group row" style="margin-top:2%;">
<div class="col-sm-10">
<button type="button" class="btn btn-primary" onclick="carian()" style="margin-left:2%; width:9%;">Carian</button>
</div>
</div>
</form>
</div>
</div>
</div>
@endsection
resources/views/importdata/listcawangan.blade.php
+163
View File
@@ -0,0 +1,163 @@
@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="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<h3 class="pt-3" style="margin-left:2%;">Import Data Cawangan</h3>
<form id="exportform" action="" method="POST">
<?php
echo " <table class='table table-striped' id='cawangan'>";
echo " <thead>";
echo " <tr>";
echo " <th>#</th>";
echo " <th>Cawangan</th>";
//echo " <th>Tarikh Lelong</th>";
//echo " <th>Batch Lelong</th>";
//echo " <th>Tarikh Lelong</th>";
echo " <th>Import Data</th>";
echo " <th>Hapus Data</th>";
// echo " <th>Senarai Lelongan</th>";
// echo " <th>Export Data</th>";
echo " </tr>";
echo " </thead>";
echo "<tbody>";
$count = 0;
// $result = mysql_query("SELECT * FROM cawangan_lelong");
$results = DB::select('select * from cawangan');
foreach($results as $row)
{
$caw_ip = $row->caw_ip;
$caw_dbuser = $row->caw_dbuser;
$caw_dbpass = $row->caw_dbpass;
$caw_dbname = $row->caw_dbname;
$caw_name = $row->caw_name;
$caw_id = $row->id;
$kodcaw = $row->caw_code;
//dd($caw_ip);
$db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass);
if (!$db)
{
echo "<p style='color:#F00'>Server Down: $con[caw_dbname]/$con[caw_name]</p>";
continue;
die('Could not connect: ' . mysqli_error());
}
mysqli_select_db($db,$caw_dbname);
$count++;
echo "<tr>";
echo "<td>$count</td>";
echo "<td>$caw_name</td>";
//echo "<td>$tarikh</td>";
// echo "<td>$batchno</td>";
//echo "<td>$tarikh</td>";
echo "<td><a class='btn btn-info' href='importdatagadai/$kodcaw'><i class='fa fa-delete'></i>Import Data From Live To Master</a></td>";
echo "<td><a class='btn btn-danger' href='hapusdatacawangan/$kodcaw'><i class='fa fa-delete'></i>Hapus</a></td>";
// echo "<td><a class='btn btn-success' href='list_gadai_caw/$caw_id'><i class='fa fa-delete'></i>Lihat Senarai</a></td>";
// echo "<td><a class='btn btn-warning' href='exportdatalelong/$caw_id'><i class='fa fa-success'></i>Export Data</a></td>";
echo "</tr>";
}
echo "</table>"?>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
function newconnection() {
$("#formnewconnection").submit();
}
function confirm(id) {
// console.log(id);
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
$("#formdelconn-"+id).submit();
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
}
var tablecawangan = $('#cawangan').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 8,
"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');
function selectall(cb) {
tablecawangan.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/importdata/showsenarai.blade.php
+108
View File
@@ -0,0 +1,108 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<?php
echo " <table class='table table-striped' id='cawangan'>";
echo " <thead>";
echo " <tr>";
echo " <th>#</th>";
echo " <th>Cawangan</th>";
//echo " <th>Tarikh Lelong</th>";
echo " <th>Batch Lelong</th>";
echo " <th>Tarikh Lelong</th>";
echo " <th>Import Data</th>";
echo " <th>Senarai Lelongan</th>";
echo " <th>Export Data</th>";
echo " </tr>";
echo " </thead>";
echo "<tbody>";
$count = 0;
// $result = mysql_query("SELECT * FROM cawangan_lelong");
$results = DB::select('select * from cawangan');
foreach($results as $row)
{
$caw_ip = $row->caw_ip;
$caw_dbuser = $row->caw_dbuser;
$caw_dbpass = $row->caw_dbpass;
$caw_dbname = $row->caw_dbname;
$caw_name = $row->caw_name;
$caw_id = $row->id;
//dd($caw_ip);
$db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass);
if (!$db)
{
echo "<p style='color:#F00'>Server Down: $con[caw_dbname]/$con[caw_name]</p>";
continue;
die('Could not connect: ' . mysqli_error());
}
mysqli_select_db($db,$caw_dbname);
$count++;
$result_tender = mysqli_query($db,"SELECT *, lelong.batchno as batch, DATE_FORMAT(tarikh, '%d/%m/%Y') AS tarikh FROM batchlel
JOIN lelong ON (lelong.batchno = batchlel.batchno)
where norujukan NOT IN(select norujukan FROM gadai where sttebus = 'L' OR sttebus = 'H') and lelong.hargajual = '0.00' and lelong.nopembeli = '0' ORDER BY `batchlel`.`tarikh` ASC");
$row_tender = mysqli_fetch_array($result_tender);
$result_tender1 = mysqli_query($db,"SELECT MAX(batchno) as batchno
FROM batchlel");
$row_tender1 = mysqli_fetch_array($result_tender1);
$batchno = $row_tender['batch'];
$tarikh = $row_tender['tarikh'];
echo "<tr>";
echo "<td>$count</td>";
echo "<td>$caw_name</td>";
//echo "<td>$tarikh</td>";
echo "<td>$batchno</td>";
echo "<td>$tarikh</td>";
echo "<td><a class='btn btn-info' href='export_tolelong/$caw_id/$batchno'><i class='fa fa-delete'></i>Import Data</a></td>";
echo "<td><a class='btn btn-success' href='list_lelongan_caw/$caw_id/$batchno'><i class='fa fa-delete'></i>Lihat Senarai</a></td>";
echo "<td><a class='btn btn-warning' href='export_tolelong_livecaw/$caw_id/$batchno'><i class='fa fa-success'></i>Export Data</a></td>";
echo "</tr>";
}
echo "</table>"?>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
function confirm() {
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Simpan: {
btnClass: 'btn-warning',
action: function () {
$("#formeditconnection").submit();
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
}
</script>
@endsection
resources/views/includes/sidebar.blade.php
+3
View File
@@ -101,6 +101,9 @@
</li>
@endhasrole
@hasrole('operasi')
<li class="{{ (request()->is('importdata/*')) ? 'active' : '' }}">
<a href="{{url('importdata/importdatacawangan')}}">Import Data</a>
</li>
<li class="{{ (request()->is('notistamatkontrak/*')) ? 'active' : '' }}">
<a href="{{url('notistamatkontrak/sebelumtamatkont')}}">Notis Tamat Kontrak</a>
</li>
resources/views/jananotis/tempbycaw.blade.php
+21 -4
View File
@@ -17,9 +17,22 @@
<div class="container">
<div class="row mb-2">
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
<p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
<p> <b>Tarikh Lelong : </b> {{ $t_lelongdisplay }}</p>
<p> <b>Tarikh Gadai Sehingga : </b> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</p>
<p> <b>Tarikh Perlu Blast Notis SMS(30 Hari) : </b> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
$datez1 = $myDateTime->modify('-1 month')->format('d-m-Y');
echo($datez1);
@endphp</p>
<p> <b>Tarikh Perlu Daftar Batch Lelong(20 Hari) : </b>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
$datez1 = $myDateTime->modify('-20 days')->format('d-m-Y');
echo($datez1);
@endphp</p>
</div>
</div>
</div>
@@ -36,6 +49,8 @@
<th>Baki Pembiayaan (RM)</th>
<th>Keuntungan 6 Bulan (RM)</th>
<th>Keuntungan Telah Bayar (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Tamat Kontrak</th>
</tr>
</thead>
@@ -50,7 +65,9 @@
<td>{{ $surat['list_norujukan'][0]['pinjaman'] }}</td>
<td>{{ $surat['list_norujukan'][0]['bakipjm'] }}</td>
<td>{{ $surat['list_norujukan'][0]['bakiupah'] }}</td>
<td></td>
<td>{{ $surat['list_norujukan'][0]['ansakhir'] }}</td>
<td>{{ $surat['list_norujukan'][0]['nilaimarhun'] }}</td>
<td>{{ $surat['list_norujukan'][0]['t_matang1'] }}</td>
</tr>
@endforeach
</tbody>
resources/views/lelong/lapbrglelpembidaindex.blade.php
+13 -7
View File
@@ -15,7 +15,7 @@
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
<th>Bil</th>
<th>Lelong ID</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
@@ -24,14 +24,20 @@
</thead>
<tbody>
@foreach ($lelongid as $info)
@foreach ($arraydetails as $info)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $info->id }}"></td>
<td>{{ $info->lelong_id}}</td>
<td>{{ $info->caw_name}}</td>
<td>{{ $info->tarikh_lelong }}</td>
<td>{{$loop->iteration}}</td>
<td>{{ $info['laporan']['lelong_id']}}</td>
<td>
@foreach($info['details'] as $details)
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{ $info['laporan']['tarikh_lelong'] }}</td>
<td class="text-center">
<a href="{{ route('lelong.lapbrglelpembida',$info->lelong_id,$info->caw_name) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Pembida" ><i class="far fa-edit"></i></a>
<a href="{{ route('lelong.lapbrglelpembida',$info['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Pembida" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
resources/views/lelong/laplelongindex.blade.php
+14 -8
View File
@@ -15,7 +15,7 @@
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
<th>Bil</th>
<th>Lelong ID</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
@@ -24,15 +24,21 @@
</thead>
<tbody>
@foreach ($lelongid as $bid)
@foreach ($arraydetails as $bid)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $bid->id }}"></td>
<td>{{ $bid->lelong_id}}</td>
<td>{{ $bid->caw_name}}</td>
<td>{{ $bid->tarikh_lelong }}</td>
<td class="text-center">
<a href="{{ route('lelong.laplelong',$bid->lelong_id,$bid->caw_name) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong Keseluruhan" ><i class="far fa-edit"></i></a>
<td>{{$loop->iteration}}</td>
<td>{{ $bid['laporan']['lelong_id']}}</td>
<td>
@foreach($bid['details'] as $details)
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{ $bid['laporan']['tarikh_lelong'] }}</td>
<td class="text-center">
<a href="{{ route('lelong.laplelong',$bid['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong Keseluruhan" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
resources/views/lelong/laporanbidaanindex.blade.php
+15 -7
View File
@@ -4,6 +4,7 @@
<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">
@@ -15,7 +16,7 @@
<table class="table table-striped table-xl" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
<th>Bil</th>
<th>Lelong ID</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
@@ -24,14 +25,21 @@
</thead>
<tbody>
@foreach ($lelongid as $bid)
@foreach ($arraydetails as $bid)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $bid->id }}"></td>
<td>{{ $bid->lelong_id}}</td>
<td>{{ $bid->caw_name}}</td>
<td>{{ $bid->tarikh_lelong }}</td>
<td>{{$loop->iteration}}
<td>{{ $bid['laporan']['lelong_id']}}</td>
<td>
@foreach($bid['details'] as $details)
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{ $bid['laporan']['tarikh_lelong'] }}</td>
<td class="text-center">
<a href="{{ route('lelong.senarailapbidaan',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="far fa-edit"></i></a>
<a href="{{ route('lelong.senarailapbidaan',$bid['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
resources/views/pengurusanpengguna/index.blade.php
+14 -1
View File
@@ -73,7 +73,7 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">New Pengguna</h5>
<h5 class="modal-title">Tambah Pengguna</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
@@ -110,6 +110,19 @@
</div>
</div>
<!-- <div class="form-row">
<label for="name">Taraf Pengguna</label>
<div class="form-group col-md-9">
@foreach ($allroles as $namataraf)
<div class="col-4 form-check form-check-inline">
<input class="form-check-input" name="taraf{{$namataraf}}" type="checkbox" id="taraf{{$namataraf}}" value="{{$namataraf}}" >
{{-- <input type="hidden" id="alltaraf" value=""> --}}
<label class="form-check-label" for="taraf{{$namataraf}}">{{$namataraf}}</label>
</div>
@endforeach
</div>
</div> -->
<div class="form-row">
<div class="form-group col-md-9">
resources/views/simulasi/janasimulasi.blade.php
+12 -5
View File
@@ -1,6 +1,9 @@
@extends('layouts.app')
@section('content')
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/js/select2.min.js"></script>
<div class="container-fluid">
<div class="row ">
<div class="col-md-12 mx-auto card">
@@ -11,7 +14,7 @@
<p>{{ $message }}</p>
</div>
@endif
<form action="{{route('analisa.janadata')}}" method="POST">
<form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data">
@csrf
<div class="form-group row">
<label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh</label>
@@ -30,13 +33,13 @@
</div>
<label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
<div class="col-sm-4">
<select class="custom-select" name="caw" id="caw">
<option value="">Please select</option>
<select class="selectpicker" multiple name="caw[]" id="caw">
<!-- <option value="">Please select</option> -->
@foreach ($caw as $item)
<option value="{{$item->id}}">{{$item->caw_name}}</option>
@endforeach
<option value="all">Select All</option>
<!-- <option value="all">Select All</option> -->
</select>
</div>
</div>
@@ -62,7 +65,11 @@
</div>
</div>
<script>
$('#caw').select2({
width: '100%',
placeholder: "Pilih Cawangan",
allowClear: true
});
</script>
@endsection
resources/views/simulasi/senaraimarhunlel.blade.php
+1 -1
View File
@@ -44,7 +44,7 @@
<td>{{ $marhun['caw_name'] }}</td>
<td>{{ $marhun['norujukan']}}</td>
<td>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['jbg'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
resources/views/simulasi/showsimulasi.blade.php
+6 -3
View File
@@ -32,6 +32,11 @@
<tr>
<td>Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }}</td>
</tr>
<tr>
@foreach ($data as $data1)
<td>Tarikh Lelong: {{ $data1['tarikh_lelong']}}</td>
@endforeach
</tr>
</table>
</div>
<div class="col-md-2"></div>
@@ -61,7 +66,6 @@
<tr class="text-center">
<th>No</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Bil Marhun (Paket)</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
@@ -79,7 +83,6 @@
<tr>
<td>{{$index+1}}</td>
<td><a href=" {{ route('analisa.senaraimarhunlel',['simulasi_id'=>$simulasi_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
<td>{{ $caw['t_lelong'] }}</td>
<td>{{ $caw['bil_marhun'] }}</td>
<td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
@@ -94,7 +97,7 @@
</tbody>
<tfoot>
<tr>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ $total_marhun }}</td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
routes/web.php
+8
View File
@@ -205,6 +205,14 @@ Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notist
Route::post('/senaraitemp',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']);
Route::get('/tempbycaw/{details}/{t_lelong}',['as'=>'notistamatkontrak.tempbycaw','uses'=>'TamatKontController@tempbycaw']);
});
Route::group(['middleware' => ['permission:importdata'],'prefix'=>'importdata'], function () {
Route::get('/importdatacawangan',['as'=>'importdata.importdatacawangan','uses'=>'ImportDataController@importdata']);
Route::get('/listcawangan',['as'=>'importdata.listcawangan','uses'=>'ImportDataController@listcawangan']);
Route::get('/showsenarai/{id}',['as'=>'importdata.showsenarai','uses'=>'ImportDataController@showsenarai']);
Route::get('/importdatagadai/{caw_id}',['as'=>'importdata.importdatagadai','uses'=>'ImportDataController@importdatagadai']);
Route::get('/hapusdatacawangan/{caw_id}',['as'=>'importdata.hapusdatacawangan','uses'=>'ImportDataController@hapusdatacawangan']);
});
//Operasi
Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () {