From bf5359464caa902524409ae74c57b84ee4db8794 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Mon, 27 Dec 2021 17:02:13 +0800 Subject: [PATCH] latest --- app/Http/Controllers/LelongController.php | 53 +-- app/Http/Controllers/MarhunController.php | 60 ++-- app/Http/Controllers/SimulasiController.php | 159 +++++++-- app/Models/GadaiMarhun.php | 22 ++ ...21_12_13_053311_create_cawangans_table.php | 46 +-- ...21_12_14_041545_create_simulasis_table.php | 4 +- ...2021_12_14_041557_create_lelongs_table.php | 4 +- resources/views/includes/sidebar.blade.php | 11 +- resources/views/lelong/showlelong.blade.php | 317 ++++++++++++++++++ .../views/marhun/kemaskinimarhun.blade.php | 2 +- resources/views/marhun/marhun.blade.php | 2 +- .../views/simulasi/showsimulasi.blade.php | 39 ++- routes/web.php | 6 +- 13 files changed, 610 insertions(+), 115 deletions(-) create mode 100644 app/Models/GadaiMarhun.php create mode 100644 resources/views/lelong/showlelong.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 7eb974c3..3b66c160 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -52,10 +52,10 @@ class LelongController extends Controller public function show($id) { - $simulasi_id = $id; - $simulasi = Simulasi::where('id','=',$id)->first(); - $cawangansim = CawanganSimulasi::where('simulasi_id','=',$id)->get(); - $simkarat = SimKarat::where('simulasi_id','=',$id)->get(); + $lelong_id = $id; + $lelong = Lelong::where('id','=',$id)->first(); + $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get(); + $lelkarat = LelKarat::where('lelong_id','=',$id)->get(); $arraydata = []; $arraycaw = []; @@ -83,10 +83,10 @@ class LelongController extends Controller $total14K = 0; $total9K = 0; - foreach($cawangansim as $cawsim) + foreach($cawanganlel as $cawlel) { - $cawangan = Cawangan::where('id','=',$cawsim->caw_id)->first(); - $databid = SimulasiBid::where('caw_id','=',$cawsim->caw_id)->get(); + $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); + $databid = LelongBid::where('caw_id','=',$cawlel->caw_id)->get(); $packet = 0; $berat = 0; @@ -100,7 +100,7 @@ class LelongController extends Controller foreach($databid as $bid) { - $marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid->id)->get(); + $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid->id)->get(); $berat = $berat + $bid->berat; $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun')); $pinjaman =$pinjaman + $bid->pinjaman; @@ -119,47 +119,47 @@ class LelongController extends Controller } - $total24Kgb += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','24.0Kgb') ->sum('berat'); - $total24K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total24K += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','24.0K') ->sum('berat'); - $total23k += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total23k += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','23.0K') ->sum('berat'); - $total22K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total22K += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','22.0K') ->sum('berat'); - $total21K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total21K += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','21.0K') ->sum('berat'); - $total20K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total20K += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','20.0K') ->sum('berat'); - $total18Kp += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total18Kp += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','18.0Kp') ->sum('berat'); - $total18K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total18K += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','18.0K') ->sum('berat'); - $total14Kp += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total14Kp += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','14.0Kp') ->sum('berat'); - $total14K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total14K += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','14.0K') ->sum('berat'); - $total9K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + $total9K += LelongBidMarhun::where('lelongbid_id','=',$bid->id) ->where('karat','=','9.0K') ->sum('berat'); @@ -168,7 +168,7 @@ class LelongController extends Controller } array_push($arraycaw,[ 'cawangan'=>$cawangan->caw_name, - 't_lelong'=>$simulasi->tarikh_lelong, + 't_lelong'=>$lelong->tarikh_lelong, 'bil_marhun'=>sizeof($databid), 'berat'=>$berat, 'n_marhun'=>$nilai_marhun, @@ -193,7 +193,7 @@ class LelongController extends Controller - return view('simulasi.showsimulasi',compact( + return view('lelong.showlelong',compact( 'arraycaw', 'total_marhun', 'total_berat', @@ -215,8 +215,8 @@ class LelongController extends Controller 'total14Kp', 'total14K', 'total9K', - 'simkarat', - 'simulasi_id')); + 'lelkarat', + 'lelong_id')); } public function create($id) @@ -256,6 +256,7 @@ class LelongController extends Controller foreach ($datasimbid as $simulasibid ) { $lelongbid = new LelongBid; + $lelongbid->lelong_id = $lelong->id; $lelongbid->caw_id = $simulasibid->caw_id; $lelongbid->kodcaw =$simulasibid->kodcaw; $lelongbid->norujukan =$simulasibid->norujukan; @@ -332,6 +333,12 @@ class LelongController extends Controller return redirect()->route('lelong.senarailelong') ->with('success','Kemaskini Berjaya'); } + + public function kemaskini(Request $request) + { + return redirect()->route('lelong.showlelong',$request->idlelong) + ->with('success','Kemaskini Berjaya'); + } } \ No newline at end of file diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index ba3cbac6..ac7340fb 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -39,37 +39,57 @@ class MarhunController extends Controller public function index() { $user = Auth::user(); - $lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id') - ->where('cawangan.caw_code','=',$user->kodcaw)->get(); - dd($lelong->all()); - $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first(); + $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first(); $lelongbid = LelongBid::where('caw_id','=',$caw->id)->get(); - return view('marhun.senaraimarhun',compact('lelongbid')); + $lelongid = LelongBid::select('lelong_id')->where('caw_id','=',$caw->id)->groupBy('lelong_id')->get(); + $lelong = Lelong::whereIn('id', $lelongid)->get(); + + + + return view('marhun.senaraimarhun',compact('lelongbid','lelong')); } public function kemaskini(Request $request) { - dd($request->all()); + // dd($request->all()); - $marhun = LelongBidMarhun::where('lelongbid_id','=',$request->idmarhun)->first(); - $lelongbid = LelongBid::where('id','=',$marhun->lelong_bid)->first(); - $caw = CawanganLelong::where('id','=',$lelongbid->caw_id)-first(); - $lelong = Lelong::where('id','=',$caw->caw_id)->first(); + $marhun = LelongBidMarhun::where('id','=',$request->idmarhun)->first(); + $lelongbid = LelongBid::where('id','=',$marhun->lelongbid_id)->first(); + // dd($lelongbid); + $caw = CawanganLelong::where('id','=',$lelongbid->caw_id)->first(); + $lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first(); - $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get(); - $marhun->marhun = $request->marhun; - $marhun->karat = $request->karat; - $marhun->berat = $request->berat; - $marhun->harga = $request->harga; - $marhun->n_marhun = $request->n_marhun; - $marhun->hargaasas = $request->hargaasas; - $marhun->save(); + $simkarat = LelKarat::where('lelong_id','=',$lelong->id)->get(); - return redirect()->route('marhun.senaraimarhun') + foreach($simkarat as $karat) + { + if($karat->karat == $request->karat) + { + $bezaberat = $marhun->berat - $request->berat_emas; + // $bezahargaasas = $marhun->hargaasas - $request->hargaasas; + $val = round($request->berat_emas * $karat->harga); + + + $marhun->marhun = $request->marhun; + $marhun->karat = $request->karat; + $marhun->berat = $request->berat_emas; + $marhun->harga = $request->harga; + $marhun->n_marhun = $request->berat_emas * $karat->harga; + $marhun->hargaasas = floatval(number_format($val,2)); + $marhun->save(); + + $lelongbid->berat = $lelongbid->berat - ($bezaberat); + // $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); + $lelongbid->save(); + + } + } + + + return redirect()->route('marhun.show',$lelongbid->id) ->with('success','Kemaskini Marhun Berjaya'); } diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index ec51d45d..0604dfac 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -6,9 +6,12 @@ use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; +use Carbon\Carbon; use App\Models\User; use PDF; use App\Models\Cawangan; +use App\Models\Gadai; +use App\Models\GadaiMarhun; use App\Models\Simulasi; use App\Models\SimulasiBid; use App\Models\SimulasiBidMarhun; @@ -50,8 +53,23 @@ class SimulasiController extends Controller public function janadata(Request $request) { - $cawangan = Cawangan::all(); + $t_lelong = Carbon::parse($request->tarikh_lelong); + $bulan = round($request->jbg,0); + $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); + // dd($jbgadai); + $surat = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus','=',0) + ->where('tagpalsu','=',0) + ->where('tagpalsu2','=',0) + ->where('taglel','=',0) + ->where('lelong_tawarruq','=',1) + ->get(); + + + + $cawangan = Cawangan::all(); + // dd($cawangan); //create simulasi $simulasi = new Simulasi; $simulasi->tarikh_lelong = $request->tarikh_lelong; @@ -88,14 +106,43 @@ class SimulasiController extends Controller $caw_simulasi->lokasi = $caw->lokasi; $caw_simulasi->save(); - $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get(); - foreach($simulasibid as $data) + // dd($caw->caw_code); + $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->kodcaw = $data->kodcaw; + $simulasibid->norujukan = $data->norujukan; + $simulasibid->t_lelong = $t_lelong; + $simulasibid->hargaasas = 0.00; + $simulasibid->hargajual = 0.00; + $simulasibid->jbg = $data->jbg; + $simulasibid->kadarupah = $data->kadarupah; + $simulasibid->upahsimpan = $data->upahsimpan; + $simulasibid->ansuran = $data->ansuran; + $simulasibid->nilaimarhun = $data->nilaimarhun; + $simulasibid->pinjaman = $data->pinjaman; + $simulasibid->bakiupah = $data->bakiupah; + $simulasibid->cajlain = $data->cajlain; + $simulasibid->cajlelong = 0.00; + $simulasibid->baki = $data->baki; + $simulasibid->berat = $data->berat; + $simulasibid->marhun = $data->marhun; + $simulasibid->gst_hj = $data->gst_hj; + $simulasibid->gst_cl = $data->gst_cl; + $simulasibid->percent = $data->percent; + $simulasibid->status_jual = 0; + $simulasibid->status_payment = 0; + $simulasibid->mora_upah = 0; + $simulasibid->save(); + $sumhargaasas = 0; $berat = 0; - $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$data->id)->get(); - foreach($simulasibidmarhun as $marhun) + $gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get(); + foreach($gadaimarhun as $marhun) { $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get(); // dd($simkarat); @@ -104,27 +151,35 @@ class SimulasiController extends Controller if($karat->karat == $marhun->karat) { - // dd($karat); $val = round($marhun->berat * $karat->harga); $sumhargaasas = $sumhargaasas + $val; $berat = $berat + $marhun->berat; - $marhun->harga = $karat->harga; - $marhun->n_marhun = $marhun->berat * $karat->harga; - $marhun->hargaasas = floatval(number_format($val,2)); - $marhun->save(); + $simmarhun = new SimulasiBidMarhun; + $simmarhun->simulasibid_id = $simulasibid->id; + $simmarhun->bil = $marhun->bil; + $simmarhun->marhun = $marhun->marhun; + $simmarhun->nota = $marhun->nota; + $simmarhun->karat = $marhun->karat; + $simmarhun->berat = $marhun->berat; + $simmarhun->harga = $karat->harga; + $simmarhun->n_marhun = $marhun->berat * $karat->harga; + $simmarhun->hargaasas = floatval(number_format($val,2)); + $simmarhun->save(); } } } + $calcaj = ($request->cajlelong/100)*$sumhargaasas; - $data->hargaasas = $sumhargaasas; - $data->cajlelong = $calcaj; - $data->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; - $data->berat = $berat; - $data->save(); + $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); + $updatesimbid->hargaasas = $sumhargaasas; + $updatesimbid->cajlelong = $calcaj; + $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + $updatesimbid->berat = $berat; + $updatesimbid->save(); } } } @@ -137,14 +192,42 @@ class SimulasiController extends Controller $caw_simulasi->lokasi = $caw->lokasi; $caw_simulasi->save(); - $simulasibid = SimulasiBid::where('caw_id','=',$request->caw)->get(); - foreach($simulasibid as $data) + $suratcaw = $surat->where('kodcaw','=',$caw->code)->get(); + // $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get(); + foreach($suratcaw as $data) { - + $simulasibid = new SimulasiBid; + $simulasibid->simulasi_id = $simulasi->id; + $simulasibid->caw_id = $caw_simulasi->id; + $simulasibid->kodcaw = $data->kodcaw; + $simulasibid->norujukan = $data->norujukan; + $simulasibid->t_lelong = $t_lelong; + $simulasibid->hargaasas = 0.00; + $simulasibid->hargajual = 0.00; + $simulasibid->jbg = $data->jbg; + $simulasibid->kadarupah = $data->kadarupah; + $simulasibid->upahsimpan = $data->upahsimpan; + $simulasibid->ansuran = $data->ansuran; + $simulasibid->nilaimarhun = $data->nilaimarhun; + $simulasibid->pinjaman = $data->pinjaman; + $simulasibid->bakiupah = $data->bakiupah; + $simulasibid->cajlain = $data->cajlain; + $simulasibid->cajlelong = 0.00; + $simulasibid->baki = $data->baki; + $simulasibid->berat = $data->berat; + $simulasibid->marhun = $data->marhun; + $simulasibid->gst_hj = $data->gst_hj; + $simulasibid->gst_cl = $data->gst_cl; + $simulasibid->percent = $data->percent; + $simulasibid->status_jual = 0; + $simulasibid->status_payment = 0; + $simulasibid->mora_upah = 0; + $simulasibid->save(); + $sumhargaasas = 0; $berat = 0; - $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$data->id)->get(); - foreach($simulasibidmarhun as $marhun) + $gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get(); + foreach($gadaimarhun as $marhun) { $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get(); // dd($simkarat); @@ -153,27 +236,34 @@ class SimulasiController extends Controller if($karat->karat == $marhun->karat) { - // dd($karat); $val = round($marhun->berat * $karat->harga); $sumhargaasas = $sumhargaasas + $val; $berat = $berat + $marhun->berat; - $marhun->harga = $karat->harga; - $marhun->n_marhun = $marhun->berat * $karat->harga; - $marhun->hargaasas = floatval(number_format($val,2)); - $marhun->save(); + $simmarhun = new SimulasiBidMarhun; + $simmarhun->bil = $marhun->bil; + $simmarhun->marhun = $marhun->marhun; + $simmarhun->nota = $marhun->nota; + $simmarhun->karat = $marhun->karat; + $simmarhun->berat = $marhun->berat; + $simmarhun->harga = $karat->harga; + $simmarhun->n_marhun = $marhun->berat * $karat->harga; + $simmarhun->hargaasas = floatval(number_format($val,2)); + $simmarhun->save(); } } } - + + $calcaj = ($request->cajlelong/100)*$sumhargaasas; - $data->hargaasas = $sumhargaasas; - $data->cajlelong = $calcaj; - $data->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; - $data->berat = $berat; - $data->save(); + $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); + $updatesimbid->hargaasas = $sumhargaasas; + $updatesimbid->cajlelong = $calcaj; + $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + $updatesimbid->berat = $berat; + $updatesimbid->save(); } } else @@ -370,6 +460,11 @@ class SimulasiController extends Controller return redirect()->route('analisa.senaraisimulasi') ->with('success','Padam Simulasi Berjaya'); } + + public function filter(Request $request) + { + + } } \ No newline at end of file diff --git a/app/Models/GadaiMarhun.php b/app/Models/GadaiMarhun.php new file mode 100644 index 00000000..f2bf32ed --- /dev/null +++ b/app/Models/GadaiMarhun.php @@ -0,0 +1,22 @@ +bigIncrements('id'); - $table->string('kodcaw'); - $table->string('norujukan'); + $table->string('kodcaw'); + $table->string('norujukan'); $table->decimal('jbg', $precision = 7, $scale = 2); - $table->decimal('kadarupah', $precision = 5, $scale = 2); - $table->decimal('upahsimpan', $precision = 11, $scale = 2); - $table->decimal('ansuran', $precision = 11, $scale = 2); - $table->decimal('nilaimarhun', $precision = 9, $scale = 2); - $table->decimal('pinjaman', $precision = 9, $scale = 2); - $table->decimal('bakiupah', $precision = 7, $scale = 2); - $table->decimal('cajlain', $precision = 7, $scale = 2); - $table->decimal('baki', $precision = 9, $scale = 2); - $table->decimal('berat', $precision = 7, $scale = 2); - $table->string('marhun'); - $table->decimal('gst_hj', $precision = 7, $scale = 2); - $table->decimal('gst_cl', $precision = 7, $scale = 2); - $table->decimal('percent', $precision = 7, $scale = 2); - $table->integer('mora_upah'); - $table->date('t_gadai'); - $table->date('t_matang'); - $table->integer('sttebus'); - $table->integer('tagpalsu'); - $table->integer('tagpalsu2'); - $table->integer('taglel'); - $table->integer('lelong_tawarruq'); + $table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable(); + $table->decimal('upahsimpan', $precision = 11, $scale = 2)->nullable(); + $table->decimal('ansuran', $precision = 11, $scale = 2)->nullable(); + $table->decimal('nilaimarhun', $precision = 9, $scale = 2)->nullable(); + $table->decimal('pinjaman', $precision = 9, $scale = 2)->nullable(); + $table->decimal('bakiupah', $precision = 7, $scale = 2)->nullable(); + $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable(); + $table->decimal('baki', $precision = 9, $scale = 2)->nullable(); + $table->decimal('berat', $precision = 7, $scale = 2)->nullable(); + $table->string('marhun')->nullable(); + $table->decimal('gst_hj', $precision = 7, $scale = 2)->default(0.00); + $table->decimal('gst_cl', $precision = 7, $scale = 2)->default(0.00); + $table->decimal('percent', $precision = 7, $scale = 2)->nullable(); + $table->integer('mora_upah')->default(0); + $table->date('t_gadai')->nullable(); + $table->date('t_matang')->nullable(); + $table->integer('sttebus')->nullable(); + $table->integer('tagpalsu')->nullable(); + $table->integer('tagpalsu2')->nullable(); + $table->integer('taglel')->nullable(); + $table->integer('lelong_tawarruq')->nullable(); $table->timestamps(); }); diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php index 1c000fb0..3ed5c114 100644 --- a/database/migrations/2021_12_14_041545_create_simulasis_table.php +++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php @@ -55,8 +55,8 @@ class CreateSimulasisTable extends Migration $table->date('t_lelong'); $table->decimal('hargaasas', $precision = 9, $scale = 2); $table->decimal('hargajual', $precision = 9, $scale = 2); - $table->date('t_jual'); - $table->integer('nopembeli'); + $table->date('t_jual')->nullable(); + $table->integer('nopembeli')->nullable(); $table->decimal('jbg', $precision = 7, $scale = 2); $table->decimal('kadarupah', $precision = 5, $scale = 2); $table->decimal('upahsimpan', $precision = 11, $scale = 2); diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 65e50f3b..72f4dcfb 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -56,8 +56,8 @@ class CreateLelongsTable extends Migration $table->date('t_lelong'); $table->decimal('hargaasas', $precision = 9, $scale = 2); $table->decimal('hargajual', $precision = 9, $scale = 2); - $table->date('t_jual'); - $table->integer('nopembeli'); + $table->date('t_jual')->nullable(); + $table->integer('nopembeli')->nullable(); $table->decimal('jbg', $precision = 7, $scale = 2); $table->decimal('kadarupah', $precision = 5, $scale = 2); $table->decimal('upahsimpan', $precision = 11, $scale = 2); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 3876ec97..14e1e662 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -57,9 +57,14 @@ --}} @endhasrole @hasrole('jurulelong') - {{--
  • - Home -
    • --}} +
  • + + +
    • @endhasrole @hasrole('operasi')
  • diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php new file mode 100644 index 00000000..72a9d0fa --- /dev/null +++ b/resources/views/lelong/showlelong.blade.php @@ -0,0 +1,317 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + +
    + + +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + {{-- {{$cawangan[0] }} --}} +
    + +
    +
    + + +@endsection diff --git a/resources/views/marhun/kemaskinimarhun.blade.php b/resources/views/marhun/kemaskinimarhun.blade.php index ab9bd4c6..24a701ae 100644 --- a/resources/views/marhun/kemaskinimarhun.blade.php +++ b/resources/views/marhun/kemaskinimarhun.blade.php @@ -76,7 +76,7 @@ "orderable": false }, { - "targets": 5, + "targets": 9, "orderable": false } ], diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 740a3438..1e948987 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -139,7 +139,7 @@ "orderable": false }, { - "targets": 5, + "targets": 9, "orderable": false } ], diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 0d686fc4..064f05f4 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -174,10 +174,36 @@ @endif {{-- {{$cawangan[0] }} --}} - - - +