From c49d63ec7ce8be597656e74c857522a69da5594d Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Fri, 6 Sep 2024 15:54:51 +0800 Subject: [PATCH] update tagujrah dalam existing record lelong lama dan lain2 --- app/Console/Commands/kemaskiniLelong.php | 2 ++ app/Http/Controllers/LelongController.php | 20 +++++++---- app/Http/Controllers/ReportController.php | 4 +-- .../Controllers/SimulasiUjrahController.php | 27 ++++++--------- app/Models/Cawangan.php | 1 + ..._110216_add_tagujrah_in_cawangan_table.php | 33 +++++++++++++++++++ .../views/lelong/senaraimarhun.blade.php | 22 ++++++------- resources/views/lelong/showlelong.blade.php | 2 +- .../views/pdf/laporanlelfullcaw.blade.php | 2 +- resources/views/pdf/pdflaplelong.blade.php | 2 +- resources/views/pdf/pdflelongreport.blade.php | 2 +- .../simulasiujrah/senaraimarhunlel.blade.php | 2 +- .../simulasiujrah/showsimulasi.blade.php | 2 +- 13 files changed, 78 insertions(+), 43 deletions(-) create mode 100644 database/migrations/2024_09_06_110216_add_tagujrah_in_cawangan_table.php diff --git a/app/Console/Commands/kemaskiniLelong.php b/app/Console/Commands/kemaskiniLelong.php index 91e966ff..e23d8d74 100644 --- a/app/Console/Commands/kemaskiniLelong.php +++ b/app/Console/Commands/kemaskiniLelong.php @@ -102,6 +102,7 @@ class kemaskiniLelong extends Command $lelongbid->save(); } }else if($gadai->tagbaru == '1'){ + //kiraan keuntungan ujrah $jeniskeuntungan = 'onepercent'; $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json(); $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan)->json(); @@ -161,6 +162,7 @@ class kemaskiniLelong extends Command $lelongbid->save(); } }elseif($gadai->tagbaru == '1'){ + //kiraan keuntungan ujrah $jeniskeuntungan = 'onepercent'; $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json(); $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan)->json(); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 47140ab1..423f0b6b 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -348,6 +348,7 @@ class LelongController extends Controller 'bakilelong' => $bakilelong, 'ujrah' => $ujrah, 'onepercent' => $onepercent, + 'tagujrah' => $caw->tagujrah, ]); $total_nilaimarhun += $nilai_marhun; @@ -3872,11 +3873,14 @@ class LelongController extends Controller $keuntungan = 0.00; } else{ + //kiraan keuntungan ujrah $jeniskeuntungan = 'onepercent'; - $keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json(); - $keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100; - // dd($keuntungan); + $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json(); + $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json(); + $keuntungan = $keuntungan1['pendapatan']; + $rounded_ujrah = $ujrahonepercentrebet['ujrah']; + $rounded_onepercent = $ujrahonepercentrebet['onepercent']; } } @@ -3903,13 +3907,15 @@ class LelongController extends Controller elseif($datagadai->tempohbayar == $datagadai->tempoh ){ $keuntungan = 0.00; } - else{ + else{ //kiraan keuntungan ujrah $jeniskeuntungan = 'onepercent'; - $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahtawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json(); - $keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100; - // dd($keuntungan); + $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json(); + $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json(); + $keuntungan = $keuntungan1['pendapatan']; + $rounded_ujrah = $ujrahonepercentrebet['ujrah']; + $rounded_onepercent = $ujrahonepercentrebet['onepercent']; } } } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 046af0cb..6603d1e8 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -442,7 +442,7 @@ class ReportController extends Controller ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan.caw_code',$kodcaw) ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.tagujrah') + ->select('lelong_id','tarikh_lelong','lelong.fasa','cawangan_lelong.tagujrah') ->groupBy('lelong_id') ->get(); @@ -942,7 +942,7 @@ class ReportController extends Controller $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') ->where('cawangan_lelong.lelong_id','=',$lelongid) - ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.tagujrah') + ->select('lelong_id','tarikh_lelong','lelong.fasa','cawangan_lelong.tagujrah') ->groupBy('lelong_id') ->get()->toArray(); diff --git a/app/Http/Controllers/SimulasiUjrahController.php b/app/Http/Controllers/SimulasiUjrahController.php index 10949a8f..386429ed 100644 --- a/app/Http/Controllers/SimulasiUjrahController.php +++ b/app/Http/Controllers/SimulasiUjrahController.php @@ -1020,17 +1020,11 @@ class SimulasiUjrahController extends Controller //kiraan keuntungan ujrah $jeniskeuntungan = 'onepercent'; - $keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$listing['kodcaw'].'/'.$listing['norujukan'].'/'.$jeniskeuntungan)->json(); - if($keuntungan1 == null){ - $keuntungan = 0.00; - }else{ - $keuntungan = round(($keuntungan1['pendapatan'] *100)/5,0)*5/100; - } - // $ujrahonepercentrebet = Http::get(config('app.api_url'). 'lelong/kiraupahUjrahOnePercentRebate/'.$listing['kodcaw'].'/'.$listing['norujukan'])->json(); - // $keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100; - // $rounded_ujrah = round(($ujrahonepercentrebet['ujrah']*100)/5,0)*5/100; - // $rounded_onepercent = round(($ujrahonepercentrebet['onepercent']*100)/5,0)*5/100; - // dd($ujrahonepercent, $ujrahonepercentrebet, $rounded_ujrah, $rounded_onepercent); + $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json(); + $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json(); + $keuntungan = $keuntungan1['pendapatan']; + $rounded_ujrah = $ujrahonepercentrebet['ujrah']; + $rounded_onepercent = $ujrahonepercentrebet['onepercent']; } @@ -1260,12 +1254,11 @@ class SimulasiUjrahController extends Controller //kiraan keuntungan ujrah $jeniskeuntungan = 'onepercent'; - $keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$surats['kodcaw'].'/'.$surats['norujukan'].'/'.$jeniskeuntungan)->json(); - if($keuntungan1 == null){ - $keuntungan = 0.00; - }else{ - $keuntungan = round(($keuntungan1['pendapatan'] *100)/5,0)*5/100; - } + $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json(); + $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json(); + $keuntungan = $keuntungan1['pendapatan']; + $rounded_ujrah = $ujrahonepercentrebet['ujrah']; + $rounded_onepercent = $ujrahonepercentrebet['onepercent']; // dd($surats['hargajualan']); $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan']; diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php index ab1a37a6..45f0f297 100644 --- a/app/Models/Cawangan.php +++ b/app/Models/Cawangan.php @@ -29,6 +29,7 @@ class Cawangan extends Model 'pkb_jmc', 'para2', 'para3', + 'tagujrah' ]; public function simulasi() diff --git a/database/migrations/2024_09_06_110216_add_tagujrah_in_cawangan_table.php b/database/migrations/2024_09_06_110216_add_tagujrah_in_cawangan_table.php new file mode 100644 index 00000000..eb36369a --- /dev/null +++ b/database/migrations/2024_09_06_110216_add_tagujrah_in_cawangan_table.php @@ -0,0 +1,33 @@ +integer('tagujrah')->default(0); + }); + + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('cawangan', function (Blueprint $table) { + $table->dropColumn('tagujrah'); + }); + } +} diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 320a32ad..4df78cde 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -11,9 +11,9 @@
- @if($lelonglel->tagujrah == '0') + @if($cawanganDetail['tagujrah'] == '0') senarai Sag : {{ $cawanganDetail->caw_name }} - @elseif($lelonglel->tagujrah == '1') + @elseif($cawanganDetail['tagujrah'] == '1') senarai Sag Ujrah: {{ $cawanganDetail->caw_name }} @endif
@@ -67,9 +67,9 @@ - @if($lelonglel->tagujrah == '0') + @if($cawanganDetail['tagujrah'] == '0') - @elseif($lelonglel->tagujrah == '1') + @elseif($cawanganDetail['tagujrah'] == '1') @endif @@ -84,12 +84,12 @@ - @if($lelonglel->tagujrah == '0') + @if($cawanganDetail['tagujrah'] == '0') - @elseif($lelonglel->tagujrah == '1') + @elseif($cawanganDetail['tagujrah'] == '1') - + @endif @@ -116,9 +116,9 @@ - @if($lelonglel->tagujrah == '0') + @if($cawanganDetail['tagujrah'] == '0') - @elseif($lelonglel->tagujrah == '1') + @elseif($cawanganDetail['tagujrah'] == '1') @@ -161,9 +161,9 @@ - @if($lelonglel->tagujrah == '0') + @if($cawanganDetail['tagujrah'] == '0') - @elseif($lelonglel->tagujrah == '1') + @elseif($cawanganDetail['tagujrah'] == '1') diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 4281b247..7103d446 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -197,7 +197,7 @@ @elseif($lelong->tagujrah == '1') - + @endif diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php index a4e78da2..52bc2a7d 100644 --- a/resources/views/pdf/laporanlelfullcaw.blade.php +++ b/resources/views/pdf/laporanlelfullcaw.blade.php @@ -168,7 +168,7 @@ tr:nth-child(even) { @elseif($info['tagujrah'] == '1') - + @endif diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php index 0647b032..9b083b93 100644 --- a/resources/views/pdf/pdflaplelong.blade.php +++ b/resources/views/pdf/pdflaplelong.blade.php @@ -169,7 +169,7 @@ tr:nth-child(even) { @elseif($info['tagujrah'] == '1') - + @endif diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php index 70fd9259..cdc112dd 100644 --- a/resources/views/pdf/pdflelongreport.blade.php +++ b/resources/views/pdf/pdflelongreport.blade.php @@ -162,7 +162,7 @@ @elseif($laporan['laporan']['tagujrah'] == '1') - + @endif diff --git a/resources/views/simulasiujrah/senaraimarhunlel.blade.php b/resources/views/simulasiujrah/senaraimarhunlel.blade.php index fdcb13cc..25c42b67 100644 --- a/resources/views/simulasiujrah/senaraimarhunlel.blade.php +++ b/resources/views/simulasiujrah/senaraimarhunlel.blade.php @@ -73,7 +73,7 @@ - + diff --git a/resources/views/simulasiujrah/showsimulasi.blade.php b/resources/views/simulasiujrah/showsimulasi.blade.php index 7ba26478..462ac36d 100644 --- a/resources/views/simulasiujrah/showsimulasi.blade.php +++ b/resources/views/simulasiujrah/showsimulasi.blade.php @@ -183,7 +183,7 @@ - +
Berat (gm) Nilai Marhun Asal (RM) Pembiayaan (RM)Keuntungan (RM)Keuntungan (RM) 1%(RM)Ujrah(RM)Lain-Lain Caj(RM)Caj Lelong (RM) Harga Asas (RM){{ number_format($marhun['berat'], 2, '.', ',') }} {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} {{ number_format($marhun['pinjaman'], 2, '.', ',') }}{{ number_format($marhun['bakiupah'], 2, '.', ',') }}{{ number_format($marhun['bakiupah'], 2, '.', ',') }} {{ number_format($marhun['onepercent'], 2, '.', ',') }} {{ number_format($marhun['ujrah'], 2, '.', ',') }}{{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nilaimarhun, 2, '.', ',') }} {{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_bakiupah, 2, '.', ',') }}{{ number_format($total_bakiupah, 2, '.', ',') }} {{ number_format($total_onepercent, 2, '.', ',') }} {{ number_format($total_ujrah, 2, '.', ',') }}Keuntungan (RM) 1%(RM)Ujrah(RM)Lain-Lain Caj(RM)Caj (RM) Harga Asas (RM)Keuntungan (RM) 1% (RM)Ujrah (RM)Lain-Lain Caj (RM)Caj Lelong (RM) Harga Lelong (RM)Keuntungan (RM) 1% (RM)Ujrah (RM)Lain-Lain Caj (RM)Caj Lelong (RM) Harga Lelong (RM)Keuntungan (RM) 1% (RM)Ujrah (RM)Lain-Lain Caj (RM)Caj Lelong (RM) Harga Asas (RM)Pembiayaan (RM) Keuntungan (RM) 1% (RM)Ujrah (RM)Lain-Lain Caj (RM) Caj Lelong (RM) Harga Asas (RM) Baki Lelong (RM)Pembiayaan (RM) Keuntungan (RM) 1% (RM)Ujrah (RM)Lain-Lain Caj (RM) Caj (RM) Harga Asas (RM) Baki (RM)