From 89e20bb31ca929f506d4b103dedd7036fd6d13c7 Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Sun, 19 Jun 2022 14:23:27 +0800 Subject: [PATCH] update --- app/Http/Controllers/MarhunController.php | 66 +++++-- app/Http/Controllers/PaymentController.php | 20 ++- .../Controllers/TangguhLelongController.php | 161 +++++++++--------- .../views/account/sahsagonline.blade.php | 4 +- resources/views/includes/sidebar.blade.php | 10 +- .../marhun/senarailelongmarhun.blade.php | 1 + .../views/marhun/senaraimarhun.blade.php | 13 +- .../pembayaran/kaunterpembayaran.blade.php | 1 - .../pembayaran/senarailelongbayaran.blade.php | 1 + .../views/pengesahan/mutumarhun.blade.php | 18 +- .../views/tangguhlelong/searchbyic.blade.php | 39 +++-- .../views/tangguhlelong/sensahpc.blade.php | 6 +- 12 files changed, 215 insertions(+), 125 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index da3feadc..e069baa9 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -49,33 +49,68 @@ class MarhunController extends Controller $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first(); - $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan ->where('caw_id','=', $caw->id) ->get(); - $sag = LelongBid::where('lelong_id', $lelong_id) + $sag = LelongBid::where('lelong_id', $lelong_id) //belum disemak ->where('caw_id', $caw->id) ->where('status_semak', 0) ->get(); // dd($sag); - $sdhdisemak = LelongBid::select('id','norujukan') - ->where('lelong_id', $lelong_id) - ->where('caw_id', $caw->id) - ->where('status_semak', 1) - ->distinct() + //Get data filtered which is other than tangguh lelong from PC + + $sdhdisemak = LelongBid::join('pengesahan', 'lelongbid.id', '=', 'pengesahan.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.caw_id', $caw->id) + ->where('lelongbid.status_semak', 1) + ->where('pengesahan.diminta_oleh', $user['id']) + ->where('pengesahan.status', 1) + ->where('pengesahan.status_ubah', '!=', 6) ->get(); $dalamproses = Pengesahan::select('pengesahan.norujukan') ->join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') ->where('pengesahan.lelong_id', $lelong_id) - ->where('caw_id','=', $caw->id) + ->where('lelongbid.caw_id','=', $caw->id) + ->where('pengesahan.diminta_oleh', $user['id']) + ->where('pengesahan.status', 1) + ->where('pengesahan.status_ubah', '!=', 6) ->whereNull('pengesahan.disahkan_oleh') ->distinct() ->get(); - $sdhdisahkan = Pengesahan::select('pengesahan.norujukan') - ->join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + $sdhdisahkan = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + ->where('pengesahan.diminta_oleh', $user['id']) + ->where('pengesahan.status', 1) + ->where('pengesahan.status_ubah', '!=', 6) + ->where('pengesahan.lelong_id', $lelong_id) + ->whereNotNull('pengesahan.disahkan_oleh') + ->where('lelongbid.status_semak', 1) + ->get(); + // dd($sdhdisahkan); + + //Get data filtered which is from PC + $sdhdisemaktangguhlel = LelongBid::join('pengesahan', 'lelongbid.id', '=', 'pengesahan.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.caw_id', $caw->id) + ->where('lelongbid.status_semak', 1) + ->where('pengesahan.status', 2) + ->where('pengesahan.status_ubah', 6) + ->get(); + + $dalamprosestangguhlel = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + ->where('pengesahan.lelong_id', $lelong_id) + ->where('lelongbid.caw_id','=', $caw->id) + ->where('pengesahan.status', 2) + ->where('pengesahan.status_ubah', 6) + ->whereNull('pengesahan.disahkan_oleh') + ->get(); + + $sdhdisahkantangguhlel = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + ->where('pengesahan.status', 2) + ->where('pengesahan.status_ubah', 6) ->where('pengesahan.lelong_id', $lelong_id) ->where('caw_id','=', $caw->id) ->whereNotNull('pengesahan.disahkan_oleh') @@ -89,6 +124,13 @@ class MarhunController extends Controller ->where('lelong_id', $lelong_id) ->get(); + $statusdrpdpc = Pengesahan::where('lelongbid_id', $bid['id']) + ->where('lelong_id', $lelong_id) + ->where('status_ubah', 6) + ->first(); + + $lelongbid[$index1]['statustangguhlel'] = $statusdrpdpc; + if($sudahdisahkan) { foreach($sudahdisahkan as $sahkan) @@ -111,7 +153,9 @@ class MarhunController extends Controller } } - return view('marhun.senaraimarhun',compact('lelongbid','lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan')); + return view('marhun.senaraimarhun',compact('lelongbid','lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', + 'dalamprosestangguhlel', 'sdhdisahkantangguhlel' + )); } public function kemaskini(Request $request) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index d7d3f55b..0ca94387 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -131,12 +131,24 @@ class PaymentController extends Controller 'lelongbidder.status_payment' ) ->get(); - // dd($eachbid); - + + // foreach($gettunai as $index1=>$cash) + // { + // // dd($cash); + // $remarktunai = Payment::where('id', $cash['payment_id']) + // ->where('remark', '=', 'TUNAI') + // ->select('remark') + // ->first(); + // // dd($remarktunai); + + // $eachbid[$index1]['cash_only'] = $remarktunai; + // } + $getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id') ->where('payment.lelong_id', $lelong_id) ->where('payment.user_id', $user_id) ->get()->toArray(); + // dd($getresit); $array_resit = []; foreach($getresit as $index1=>$resit) @@ -172,7 +184,7 @@ class PaymentController extends Controller 'kodcaw' => $user->kodcaw, 'status_payment_opt' => 1, 'status' => 2, - 'remark' => 'BAYARAN DI KAUNTER', + 'remark' => 'TUNAI', 'resit_id' => $resit->id, 'total_payment' => $request->amaunkiraan, '1sen' => $request->ambilansen1, @@ -259,6 +271,8 @@ class PaymentController extends Controller { // dd($request->all()); //eachbid = lelongbid_id + $bid_id = implode(",", $request->eachbid); + dd($bid_id); $paymentexist = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id') ->where('payment.lelong_id', $request->lelong_id) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 099f062a..7ebb86f2 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -73,6 +73,7 @@ class TangguhLelongController extends Controller ->where('customer.kpbaru', $request->nokp) ->orWhere('customer.kplama', $request->nokp) ->first(); + // dd($checkkodcaw); if($request->nokp == null) { @@ -102,9 +103,12 @@ class TangguhLelongController extends Controller ->get(); // dd($getnorujukan); - $customer_detail = Customer::where('kpbaru', $ic['nokp']) - ->orWhere('kplama', $ic['nokp']) + $customer_detail = Customer::join('daerah', 'customer.koddaerah', '=', 'daerah.koddaerah') + ->join('negeri', 'customer.kodnegeri', '=', 'negeri.kodnegeri') + ->where('customer.kpbaru', $ic['nokp']) + ->orWhere('customer.kplama', $ic['nokp']) ->first(); + // dd($customer_detail); // $getic['customer_detail'] = $customer_detail; // $getic2 = $customer_detail; @@ -140,15 +144,6 @@ class TangguhLelongController extends Controller } } - // $icarray = []; - - // foreach($getic->toArray() as $array) - // { - // if(sizeof($array) == 170) - // array_push($icarray, $array); - // } - - // dd($getic->toArray()); $lelong_id = $request->lelong_id; @@ -166,74 +161,88 @@ class TangguhLelongController extends Controller $currentdate = $currentdate->toDateTimeString(); $lelbidmarhun = $request->checkboxdata; - // dd($lelbidmarhun); - $lelong = Lelong::where('id', $request->lelong_id)->get()->toArray(); - - foreach($lelbidmarhun as $bidmarhun) + if($lelbidmarhun == null) { - $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbid.id', $bidmarhun) - ->select('lelongbidmarhun.id as lelongbidmarhun_id', - 'lelongbidmarhun.bil', - 'lelongbidmarhun.marhun', - 'lelongbidmarhun.nota', - 'lelongbidmarhun.old_karat', - 'lelongbidmarhun.karat', - 'lelongbidmarhun.old_berat', - 'lelongbidmarhun.berat', - 'lelongbidmarhun.old_harga', - 'lelongbidmarhun.harga', - 'lelongbidmarhun.old_nmarhun', - 'lelongbidmarhun.n_marhun', - 'lelongbidmarhun.old_hargaasas', - 'lelongbidmarhun.hargaasas', - 'lelongbid.id as lelongbid_id', - 'lelongbid.caw_id', - 'lelongbid.kodcaw', - 'lelongbid.norujukan', - 'lelongbid.t_lelong', - 'lelongbid.hargaasas', - 'lelongbid.nopembeli', - 'lelongbid.jbg', - 'lelongbid.kadarupah', - 'lelongbid.upahsimpan', - 'lelongbid.ansuran', - 'lelongbid.nilaimarhun', - 'lelongbid.pinjaman', - 'lelongbid.bakiupah', - 'lelongbid.cajlain', - 'lelongbid.cajlelong', - 'lelongbid.baki', - 'lelongbid.berat', - 'lelongbid.marhun', - ) - ->get()->toArray(); - // dd($lelongbidmarhun); - - $pengesahan = new Pengesahan(); - $pengesahan->lelong_id = $request->lelong_id; - $pengesahan->lelongbid_id = $bidmarhun; - $pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id']; - $pengesahan->norujukan = $lelongbidmarhun[0]['norujukan']; - $pengesahan->diminta_oleh = $user->id; - $pengesahan->diminta_pada = $currentdate; - $pengesahan->status = 2; - $pengesahan->status_ubah = 6; - $pengesahan->save(); - - $tangguhlelong = new TangguhLelong(); - $tangguhlelong->lelong_id = $request->lelong_id; - $tangguhlelong->lelongbid_id = $bidmarhun; - $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan']; - $tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman']; - $tangguhlelong->ditangguh_oleh = $user->id; - $tangguhlelong->ditangguh_pada = $currentdate; - $tangguhlelong->nota = $request->remark; - $tangguhlelong->save(); - + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Klik Pada Kotak Semak'); + } + else + { + $lelbidmarhun = $request->checkboxdata; + + $lelong = Lelong::where('id', $request->lelong_id)->get()->toArray(); + + foreach($lelbidmarhun as $bidmarhun) + { + // dd($bidmarhun); + $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid.id', $bidmarhun) + ->select('lelongbidmarhun.id as lelongbidmarhun_id', + 'lelongbidmarhun.bil', + 'lelongbidmarhun.marhun', + 'lelongbidmarhun.nota', + 'lelongbidmarhun.old_karat', + 'lelongbidmarhun.karat', + 'lelongbidmarhun.old_berat', + 'lelongbidmarhun.berat', + 'lelongbidmarhun.old_harga', + 'lelongbidmarhun.harga', + 'lelongbidmarhun.old_nmarhun', + 'lelongbidmarhun.n_marhun', + 'lelongbidmarhun.old_hargaasas', + 'lelongbidmarhun.hargaasas', + 'lelongbid.id as lelongbid_id', + 'lelongbid.caw_id', + 'lelongbid.kodcaw', + 'lelongbid.norujukan', + 'lelongbid.t_lelong', + 'lelongbid.hargaasas', + 'lelongbid.nopembeli', + 'lelongbid.jbg', + 'lelongbid.kadarupah', + 'lelongbid.upahsimpan', + 'lelongbid.ansuran', + 'lelongbid.nilaimarhun', + 'lelongbid.pinjaman', + 'lelongbid.bakiupah', + 'lelongbid.cajlain', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.berat', + 'lelongbid.marhun', + ) + ->get()->toArray(); + + $lelbid = LelongBid::where('id', $lelongbidmarhun[0]['lelongbid_id'])->first(); + $lelbid->status_semak = 1; + $lelbid->update(); + + // $updatelelbid = LelongBid::where('id', $lelongbidmarhun[0]['id']) + + $pengesahan = new Pengesahan(); + $pengesahan->lelong_id = $request->lelong_id; + $pengesahan->lelongbid_id = $bidmarhun; + $pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id']; + $pengesahan->norujukan = $lelongbidmarhun[0]['norujukan']; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->status = 2; + $pengesahan->status_ubah = 6; + $pengesahan->save(); + + $tangguhlelong = new TangguhLelong(); + $tangguhlelong->lelong_id = $request->lelong_id; + $tangguhlelong->lelongbid_id = $bidmarhun; + $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan']; + $tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman']; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->nota = $request->remark; + $tangguhlelong->save(); + + } + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya'); } - return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya'); } diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php index e9689eef..cde976e0 100644 --- a/resources/views/account/sahsagonline.blade.php +++ b/resources/views/account/sahsagonline.blade.php @@ -135,11 +135,11 @@ "orderable": false }, { - "targets": 6, + "targets": 7, "orderable": false } ], - order: [[1, 'asc']], + order: [[0, 'asc']], "info": false, "lengthChange": false, "pageLength": 15, diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 9f79d67b..c0883429 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -49,7 +49,7 @@ Marhun -
  • +
    • diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php index 6b8f2539..1e0c50e9 100644 --- a/resources/views/marhun/senarailelongmarhun.blade.php +++ b/resources/views/marhun/senarailelongmarhun.blade.php @@ -10,6 +10,7 @@

    {{ $message }}

    @endif +

    Senarai Lelongan Marhun

    diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php index 12e351ab..4635075d 100644 --- a/resources/views/marhun/senaraimarhun.blade.php +++ b/resources/views/marhun/senaraimarhun.blade.php @@ -19,6 +19,11 @@

    Dalam Proses : {{ sizeof($dalamproses) }}

    Sudah Disemak : {{ sizeof($sdhdisemak) }}

    Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }}

    +
    +

    Tangguh Lelong Oleh Pengurus Cawangan

    +

    Sudah Disemak : {{ sizeof($sdhdisemaktangguhlel) }}

    +

    Dalam Proses : {{ sizeof($dalamprosestangguhlel) }}

    +

    Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkantangguhlel) }}

    @@ -31,6 +36,7 @@ + @@ -57,6 +63,11 @@ @endif + @@ -104,7 +115,7 @@ "orderable": false }, { - "targets": 4, + "targets": 5, "orderable": false } ], diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index ca6c6ccc..fbed651e 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -44,7 +44,6 @@ @endif - diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php index 4a54f87b..aae0a5d5 100644 --- a/resources/views/pembayaran/senarailelongbayaran.blade.php +++ b/resources/views/pembayaran/senarailelongbayaran.blade.php @@ -10,6 +10,7 @@

    {{ $message }}

    @endif +

    Senarai Lelong

    No Rujukan Tarikh Lelong Status SemakPengesahan Action
    + @if($bid['statustangguhlel'] != null) + + @endif +
    diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index 1d7e786c..e6f0eea7 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -62,33 +62,33 @@ - + - - + +
    @if($detail[0]['old_berat'] != $detail[0]['berat']) - {{ number_format($detail[0]['old_berat'], 2, '.', '') }} + {{ $detail[0]['old_berat'] }} @endif {{ $detail[0]['berat'] }} - {{ $detail[0]['harga_gadai'] }} + {{ number_format($detail[0]['harga_gadai'], 2, '.', ',') }} @if($detail[0]['old_harga'] != $detail[0]['harga']) - {{ number_format($detail[0]['old_harga'], 2, '.', '') }} + {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} @endif - {{ $detail[0]['harga'] }} + {{ number_format($detail[0]['harga'], 2, '.', ',') }} - {{ $detail[0]['nmarhun_gadai'] }} + {{ number_format($detail[0]['nmarhun_gadai'], 2, '.', ',') }} @if($detail[0]['old_nmarhun'] != $detail[0]['n_marhun']) - {{ number_format($detail[0]['old_nmarhun'], 2, '.', '') }} + {{ number_format($detail[0]['old_nmarhun'], 2, '.', ',') }} @endif - {{ $detail[0]['n_marhun'] }} + {{ number_format($detail[0]['n_marhun'], 2, '.', ',') }} @if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas']) - {{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} + {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} @endif - {{ $detail[0]['hargaasas'] }} + {{ number_format($detail[0]['hargaasas'], 2, '.', ',') }} @if($detail[0]['status_ubah'] == 1) diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php index ebf47ca8..62b6e367 100644 --- a/resources/views/tangguhlelong/searchbyic.blade.php +++ b/resources/views/tangguhlelong/searchbyic.blade.php @@ -9,16 +9,23 @@

    {{ $message }}

    + @elseif ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    @endif
    -

    Nama : {{$customer_detail['nama']}}

    -

    No Kad Pengenalan : {{ ($customer_detail) ? $customer_detail['kpbaru'] : $customer_detail['kplama']}}

    -

    Alamat : {{$customer_detail['alamat1']}}

    -

    Not Telefon : {{$customer_detail['telefon']}}

    -

    Tarikh Lelong : {{$getic[0]['t_lelong']}}

    -

    Nama Cawangan : {{$namacaw['caw_name']}}

    +
    Nama :
    {{$customer_detail['nama']}}
    +
    No Kad Pengenalan :
    {{ ($customer_detail) ? $customer_detail['kpbaru'] : $customer_detail['kplama']}}
    +
    Alamat :
    {{$customer_detail['alamat1']}}
    +
    Poskod :
    {{$customer_detail['poskod']}}
    +
    Nama Daerah :
    {{$customer_detail['namadaerah']}}
    +
    Negeri :
    {{$customer_detail['negeri']}}
    +
    Not Telefon :
    {{$customer_detail['telefon']}}
    +
    Tarikh Lelong :
    {{$getic[0]['t_lelong']}}
    +
    Nama Cawangan :
    {{$namacaw['caw_name']}}
    @@ -44,10 +51,10 @@
    {{$loop->iteration}} {{$ic['norujukan']}}{{$ic['jbg']}}{{$ic['tempoh']}} {{$ic['marhun']}}{{$ic['nilaimarhun']}}{{$ic['pinjaman']}}{{ number_format($ic['nilaimarhun'], 2, '.', ',')}}{{ number_format($ic['pinjaman'], 2, '.', ',')}} {{$ic['berat']}} @if(!$ic['sdhadapengesahan']) @@ -61,11 +68,15 @@

    -
    - -
    - -
    + {{--
    --}} + {{-- --}} + {{--
    --}} + {{-- --}} + {{--
    --}} + {{--
    --}} +
    + +
    Kembali diff --git a/resources/views/tangguhlelong/sensahpc.blade.php b/resources/views/tangguhlelong/sensahpc.blade.php index 344278b0..bc56f492 100644 --- a/resources/views/tangguhlelong/sensahpc.blade.php +++ b/resources/views/tangguhlelong/sensahpc.blade.php @@ -22,7 +22,7 @@ Tarikh Lelong No Rujukan JBG - Narhun + Marhun Nilai Marhun (RM) Pembiayaan (RM) Berat @@ -40,8 +40,8 @@ {{$sah['norujukan']}} {{$sah['bid_details'][0]['jbg']}} {{$sah['bid_details'][0]['marhun']}} - {{$sah['bid_details'][0]['nilaimarhun']}} - {{$sah['bid_details'][0]['pinjaman']}} + {{ number_format($sah['bid_details'][0]['nilaimarhun'], 2, '.', ',')}} + {{ number_format($sah['bid_details'][0]['pinjaman'], 2, '.', ',')}} {{$sah['bid_details'][0]['berat']}} {{$sah['nota']}}