diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 6e5268ab..e978f95a 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -19,7 +19,7 @@ use App\Models\Pengesahan; use App\Models\GadaiMarhun; use PDF; use DateTime; - +use PHPUnit\Framework\Constraint\Count; class TangguhLelongController extends Controller { @@ -45,6 +45,7 @@ class TangguhLelongController extends Controller // $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') // ->where('lelong_id',$info['lelong_id']) + $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual','caw_code') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') @@ -55,7 +56,7 @@ class TangguhLelongController extends Controller ->get() ->toArray(); array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); - // dd($detailsinfo); + //dd($detailsinfo); } @@ -282,26 +283,31 @@ class TangguhLelongController extends Controller { $arrayinfo = []; - $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') - ->groupBy('lelong_id') + $tangguh = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') + ->join('lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id') + ->where('tangguhlelong.status','!=',4) + ->where('lelong.sts_lelong',0) + ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg') + ->distinct() ->get() ->toArray(); - foreach($lelong as $info) + foreach($tangguh as $t) { - - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$info['lelong_id']) + $sag = TangguhLelong::where('lelong_id', $t['lelong_id']) + ->where('kodcaw', $t['caw_code']) + ->where('status','!=',4) + ->select('norujukan') ->get() - ->toArray(); - array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); - // dd($arrayinfo); + ->count(); + + array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]); } - return view('tangguhlelong.senleltangguh',compact('lelong', 'arrayinfo')); + + + return view('tangguhlelong.senleltangguh',compact('tangguh','sag')); } @@ -549,54 +555,62 @@ class TangguhLelongController extends Controller $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id',$bidmarhun->id) ->get(); $bidmarhun['lelongbidmarhun'] = $lelongbidmarhun->toArray(); - - $bidmarhun['percents'] = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100),2); - $history = TangguhLelong::where('lelongbid_id',$bidmarhun->id) - ->first(); - - if($history) + if(empty($bidmarhun->nmarhuns)) { - return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Maaf No Rujukan Telah Wujud Dalam Senarai Mohon Tangguh'); + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Maklum Operasi Kemaskini Harga Emas Lelong Terlebih Dahulu'); + } + else + { + + $bidmarhun['percents'] = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100),2); + + $history = TangguhLelong::where('lelongbid_id',$bidmarhun->id) + ->first(); + + if($history) + { + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Maaf No Rujukan Telah Wujud Dalam Senarai Mohon Tangguh'); + + } elseif($bidmarhun->fasa == 2) + { + //block tangguh sekiranya telah masuk fasa 2 + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Maaf No Rujukan Telah Berada Dalam Fasa 2'); + + }else { + $tangguhlelong = new TangguhLelong(); //pastikan hanya 1 kali insert utk lelong_id & norujukan yg sama + $tangguhlelong->kodcaw = $bidmarhun->kodcaw; + $tangguhlelong->lelong_id = $request->lelong_id; + $tangguhlelong->lelongbid_id = $bidmarhun->id; + $tangguhlelong->norujukan = $bidmarhun->norujukan; + $tangguhlelong->pinjaman = $bidmarhun->pinjaman; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->status = 0; + $tangguhlelong->save(); + + $pengesahan = new Pengesahan(); + $pengesahan->lelong_id = $request->lelong_id; + $pengesahan->lelongbid_id = $bidmarhun->id; + $pengesahan->lelongbidmarhun_id = $bidmarhun->id; + $pengesahan->norujukan = $bidmarhun->norujukan; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->save(); + } - } elseif($bidmarhun->fasa == 2) - { - //block tangguh sekiranya telah masuk fasa 2 - return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Maaf No Rujukan Telah Berada Dalam Fasa 2'); - - }else { - $tangguhlelong = new TangguhLelong(); //pastikan hanya 1 kali insert utk lelong_id & norujukan yg sama - $tangguhlelong->kodcaw = $bidmarhun->kodcaw; - $tangguhlelong->lelong_id = $request->lelong_id; - $tangguhlelong->lelongbid_id = $bidmarhun->id; - $tangguhlelong->norujukan = $bidmarhun->norujukan; - $tangguhlelong->pinjaman = $bidmarhun->pinjaman; - $tangguhlelong->ditangguh_oleh = $user->id; - $tangguhlelong->ditangguh_pada = $currentdate; - $tangguhlelong->status = 0; - $tangguhlelong->save(); + $cwgn = Cawangan::where('caw_code','=',$bidmarhun->kodcaw) + ->first(); - $pengesahan = new Pengesahan(); - $pengesahan->lelong_id = $request->lelong_id; - $pengesahan->lelongbid_id = $bidmarhun->id; - $pengesahan->lelongbidmarhun_id = $bidmarhun->id; - $pengesahan->norujukan = $bidmarhun->norujukan; - $pengesahan->diminta_oleh = $user->id; - $pengesahan->diminta_pada = $currentdate; - $pengesahan->save(); - } - - $cwgn = Cawangan::where('caw_code','=',$bidmarhun->kodcaw) - ->first(); + $customer = Customer::where('kpbaru','=',$nokp) + ->orWhere('kplama','=',$nokp) + ->join('poskod','customer.poskod','=','poskod.poskod') + ->join('daerah','poskod.koddaerah','=','daerah.koddaerah') + ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri') + ->first(); - $customer = Customer::where('kpbaru','=',$nokp) - ->orWhere('kplama','=',$nokp) - ->join('poskod','customer.poskod','=','poskod.poskod') - ->join('daerah','poskod.koddaerah','=','daerah.koddaerah') - ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri') - ->first(); - - $lelongbid[$index1]['nama'] = ($customer) ? $customer : dd($nokp); + $lelongbid[$index1]['nama'] = ($customer) ? $customer : dd($nokp); + } } //get staf cwgn roles harian @@ -696,7 +710,7 @@ class TangguhLelongController extends Controller ->whereNull('pengesahan.disahkan_oleh') ->whereNull('pengesahan.disahkan_pada') ->whereNull('tangguhlelong.tarikhtangguh') - ->whereIn('tangguhlelong.status',[1,2,3,4]) + ->whereIn('tangguhlelong.status',[0,1,2,3,4]) ->get(); @@ -814,13 +828,23 @@ class TangguhLelongController extends Controller { $arrayinfo = []; - $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') - ->where('lelong.sts_lelong', 0) + // $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + // ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + // ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') + // ->where('lelong.sts_lelong', 0) + // ->where('tangguhlelong.status',4) + // ->select('cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong','cawangan.caw_code') + // ->groupBy('cawangan_lelong.lelong_id') + // ->get() + // ->toArray(); + + $lelong = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') + ->join('lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id') ->where('tangguhlelong.status',4) - ->select('cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong') - ->groupBy('cawangan_lelong.lelong_id') + ->where('lelong.sts_lelong',0) + ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg') + ->distinct() ->get() ->toArray(); @@ -831,7 +855,15 @@ class TangguhLelongController extends Controller ->where('lelong_id',$info['lelong_id']) ->get() ->toArray(); - array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + $sag = TangguhLelong::where('lelong_id', $info['lelong_id']) + ->where('kodcaw', $info['caw_code']) + ->where('status',4) + ->select('norujukan') + ->get() + ->count(); + + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo, 'sag'=>$sag]); // dd($arrayinfo); } diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index e585afe0..72fb6082 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -60,14 +60,14 @@ Semakan Marhun --> -
  • +
  • Scan Barcode
    • diff --git a/resources/views/tangguhlelong/carian.blade.php b/resources/views/tangguhlelong/carian.blade.php index c97d3d38..9e17c00c 100644 --- a/resources/views/tangguhlelong/carian.blade.php +++ b/resources/views/tangguhlelong/carian.blade.php @@ -2,8 +2,10 @@ @section('content')
    +

    Permohonan Tangguh Lelong

    + @if ($message = Session::get('success'))

    {{ $message }}

    diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php index 963db09b..e6a529b0 100644 --- a/resources/views/tangguhlelong/searchbyic.blade.php +++ b/resources/views/tangguhlelong/searchbyic.blade.php @@ -4,7 +4,7 @@
    - + @if ($message = Session::get('success'))

    {{ $message }}

    @@ -18,6 +18,7 @@
    +

    Permohonan Tangguh Lelong

    Nama :
    {{$customer_detail['nama']}}
    No Kad Pengenalan :
    {{ ($customer_detail) ? $customer_detail['kpbaru'] : $customer_detail['kplama']}}
    diff --git a/resources/views/tangguhlelong/searchtodownload.blade.php b/resources/views/tangguhlelong/searchtodownload.blade.php index d3a4c858..ac9da7a7 100644 --- a/resources/views/tangguhlelong/searchtodownload.blade.php +++ b/resources/views/tangguhlelong/searchtodownload.blade.php @@ -4,7 +4,7 @@
    - +

    Permohonan Tangguh Lelong

    @if ($message = Session::get('success'))

    {{ $message }}

    @@ -26,7 +26,13 @@
    Nama Daerah :
    {{$customer_detail['namadaerah']}}
    Negeri :
    {{$customer_detail['negeri']}}
    No Telefon :
    {{$customer_detail['telefon']}}
    -
    Tarikh Lelong :
    {{$getic[0]['t_lelong']}}
    +
    Tarikh Lelong :
    + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $getic[0]['t_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp +
    Nama Cawangan :
    {{$namacaw['caw_name']}}
    diff --git a/resources/views/tangguhlelong/senactionoperasi.blade.php b/resources/views/tangguhlelong/senactionoperasi.blade.php index 4d0fca60..b5062c95 100644 --- a/resources/views/tangguhlelong/senactionoperasi.blade.php +++ b/resources/views/tangguhlelong/senactionoperasi.blade.php @@ -4,6 +4,7 @@
    +

    Senarai Permohonan Tangguh Lelong

    @@ -14,7 +15,7 @@ @endif
    - +
    @@ -53,7 +54,7 @@ - + @endforeach @@ -219,6 +218,44 @@ }); } + var tablelelong = $('#tablelelong').DataTable({ + "columnDefs": [ + { + "targets": 0, + "orderable": false + }, + { + "targets": 7, + "orderable": false + } + ], + order: [[1, 'asc']], + // "ordering": false, + "info": false, + "lengthChange": false, + "pageLength": 99999999, + 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: '', + // 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: '', + // action: function ( e, dt, node, config ) { + // $("#exportform").submit(); + // } + // } + ] + });
    No @if($sah['status'] == 0) - + @elseif($sah['status'] == 1) @@ -67,22 +68,20 @@ @endif @if($sah['status'] == 2) - + + @elseif($sah['status'] == 3) @endif -