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

Merged in izzati-ujrah (pull request #54)

Browse Source 
update tagujrah dalam existing record lelong lama dan lain2
This commit is contained in:
izzati zulkifli
2024-09-06 07:56:35 +00:00
parent 178a5a2845 c49d63ec7c
commit 1c35982ce0
13 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/kemaskiniLelong.php
+2
View File
@@ -102,6 +102,7 @@ class kemaskiniLelong extends Command
$lelongbid->save(); $lelongbid->save();
} }
}else if($gadai->tagbaru == '1'){ }else if($gadai->tagbaru == '1'){
//kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent'; $jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json(); $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(); $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan)->json();
@@ -161,6 +162,7 @@ class kemaskiniLelong extends Command
$lelongbid->save(); $lelongbid->save();
} }
}elseif($gadai->tagbaru == '1'){ }elseif($gadai->tagbaru == '1'){
//kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent'; $jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json(); $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(); $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan)->json();
app/Http/Controllers/LelongController.php
+13 -7
View File
@@ -348,6 +348,7 @@ class LelongController extends Controller
'bakilelong' => $bakilelong, 'bakilelong' => $bakilelong,
'ujrah' => $ujrah, 'ujrah' => $ujrah,
'onepercent' => $onepercent, 'onepercent' => $onepercent,
'tagujrah' => $caw->tagujrah,
]); ]);
$total_nilaimarhun += $nilai_marhun; $total_nilaimarhun += $nilai_marhun;
@@ -3872,11 +3873,14 @@ class LelongController extends Controller
$keuntungan = 0.00; $keuntungan = 0.00;
} }
else{ else{
//kiraan keuntungan ujrah //kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent'; $jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json(); $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
$keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100; $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
// dd($keuntungan); $keuntungan = $keuntungan1['pendapatan'];
$rounded_ujrah = $ujrahonepercentrebet['ujrah'];
$rounded_onepercent = $ujrahonepercentrebet['onepercent'];
} }
} }
@@ -3903,13 +3907,15 @@ class LelongController extends Controller
elseif($datagadai->tempohbayar == $datagadai->tempoh ){ elseif($datagadai->tempohbayar == $datagadai->tempoh ){
$keuntungan = 0.00; $keuntungan = 0.00;
} }
else{ else{
//kiraan keuntungan ujrah //kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent'; $jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahtawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json(); $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
$keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100; $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
// dd($keuntungan); $keuntungan = $keuntungan1['pendapatan'];
$rounded_ujrah = $ujrahonepercentrebet['ujrah'];
$rounded_onepercent = $ujrahonepercentrebet['onepercent'];
} }
} }
} }
app/Http/Controllers/ReportController.php
+2 -2
View File
@@ -442,7 +442,7 @@ class ReportController extends Controller
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan.caw_code',$kodcaw) ->where('cawangan.caw_code',$kodcaw)
->where('cawangan_lelong.lelong_id','=',$lelong_id) ->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') ->groupBy('lelong_id')
->get(); ->get();
@@ -942,7 +942,7 @@ class ReportController extends Controller
$lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->where('cawangan_lelong.lelong_id','=',$lelongid) ->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') ->groupBy('lelong_id')
->get()->toArray(); ->get()->toArray();
app/Http/Controllers/SimulasiUjrahController.php
+10 -17
View File
@@ -1020,17 +1020,11 @@ class SimulasiUjrahController extends Controller
//kiraan keuntungan ujrah //kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent'; $jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$listing['kodcaw'].'/'.$listing['norujukan'].'/'.$jeniskeuntungan)->json(); $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
if($keuntungan1 == null){ $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
$keuntungan = 0.00; $keuntungan = $keuntungan1['pendapatan'];
}else{ $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
$keuntungan = round(($keuntungan1['pendapatan'] *100)/5,0)*5/100; $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
}
// $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);
} }
@@ -1260,12 +1254,11 @@ class SimulasiUjrahController extends Controller
//kiraan keuntungan ujrah //kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent'; $jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$surats['kodcaw'].'/'.$surats['norujukan'].'/'.$jeniskeuntungan)->json(); $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
if($keuntungan1 == null){ $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
$keuntungan = 0.00; $keuntungan = $keuntungan1['pendapatan'];
}else{ $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
$keuntungan = round(($keuntungan1['pendapatan'] *100)/5,0)*5/100; $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
}
// dd($surats['hargajualan']); // dd($surats['hargajualan']);
$ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan']; $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];
app/Models/Cawangan.php
+1
View File
@@ -29,6 +29,7 @@ class Cawangan extends Model
'pkb_jmc', 'pkb_jmc',
'para2', 'para2',
'para3', 'para3',
'tagujrah'
]; ];
public function simulasi() public function simulasi()
database/migrations/2024_09_06_110216_add_tagujrah_in_cawangan_table.php
+33
View File
@@ -0,0 +1,33 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddTagujrahInCawanganTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('cawangan', function (Blueprint $table) {
$table->integer('tagujrah')->default(0);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('cawangan', function (Blueprint $table) {
$table->dropColumn('tagujrah');
});
}
}
resources/views/lelong/senaraimarhun.blade.php
+11 -11
View File
@@ -11,9 +11,9 @@
<i class="fas fa-arrow-left"></i> <i class="fas fa-arrow-left"></i>
</a> </a>
<div class="header-style-title"> <div class="header-style-title">
@if($lelonglel->tagujrah == '0') @if($cawanganDetail['tagujrah'] == '0')
senarai Sag : {{ $cawanganDetail->caw_name }} senarai Sag : {{ $cawanganDetail->caw_name }}
@elseif($lelonglel->tagujrah == '1') @elseif($cawanganDetail['tagujrah'] == '1')
senarai Sag Ujrah: {{ $cawanganDetail->caw_name }} senarai Sag Ujrah: {{ $cawanganDetail->caw_name }}
@endif @endif
</div> </div>
@@ -67,9 +67,9 @@
<input type="hidden" name="lelongid" value="{{$lelongid}}"> <input type="hidden" name="lelongid" value="{{$lelongid}}">
<input type="hidden" name="cawid" value="{{$cawid}}"> <input type="hidden" name="cawid" value="{{$cawid}}">
<table class="table text-right table-bordered" id="marhun" style="width:100%"> <table class="table text-right table-bordered" id="marhun" style="width:100%">
@if($lelonglel->tagujrah == '0') @if($cawanganDetail['tagujrah'] == '0')
<thead class="bg-primary text-white"> <thead class="bg-primary text-white">
@elseif($lelonglel->tagujrah == '1') @elseif($cawanganDetail['tagujrah'] == '1')
<thead class="bg-success text-white"> <thead class="bg-success text-white">
@endif @endif
@@ -84,12 +84,12 @@
<th>Berat (gm)</th> <th>Berat (gm)</th>
<th>Nilai Marhun Asal (RM)</th> <th>Nilai Marhun Asal (RM)</th>
<th>Pembiayaan (RM)</th> <th>Pembiayaan (RM)</th>
@if($lelonglel->tagujrah == '0') @if($cawanganDetail['tagujrah'] == '0')
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
@elseif($lelonglel->tagujrah == '1') @elseif($cawanganDetail['tagujrah'] == '1')
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>1%(RM)</th> <th>1%(RM)</th>
<th>Ujrah(RM)</th> <th>Lain-Lain Caj(RM)</th>
@endif @endif
<th>Caj Lelong (RM)</th> <th>Caj Lelong (RM)</th>
<th>Harga Asas (RM)</th> <th>Harga Asas (RM)</th>
@@ -116,9 +116,9 @@
<td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td> <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td> <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td> <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
@if($lelonglel->tagujrah == '0') @if($cawanganDetail['tagujrah'] == '0')
<td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td> <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
@elseif($lelonglel->tagujrah == '1') @elseif($cawanganDetail['tagujrah'] == '1')
<td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td> <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['onepercent'], 2, '.', ',') }}</td> <td>{{ number_format($marhun['onepercent'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['ujrah'], 2, '.', ',') }}</td> <td>{{ number_format($marhun['ujrah'], 2, '.', ',') }}</td>
@@ -161,9 +161,9 @@
<td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td> <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
@if($lelonglel->tagujrah == '0') @if($cawanganDetail['tagujrah'] == '0')
<td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
@elseif($lelonglel->tagujrah == '1') @elseif($cawanganDetail['tagujrah'] == '1')
<td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_onepercent, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_onepercent, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_ujrah, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_ujrah, 2, '.', ',') }}</b></td>
resources/views/lelong/showlelong.blade.php
+1 -1
View File
@@ -197,7 +197,7 @@
@elseif($lelong->tagujrah == '1') @elseif($lelong->tagujrah == '1')
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>1%(RM)</th> <th>1%(RM)</th>
<th>Ujrah(RM)</th> <th>Lain-Lain Caj(RM)</th>
@endif @endif
<th>Caj (RM)</th> <th>Caj (RM)</th>
<th>Harga Asas (RM)</th> <th>Harga Asas (RM)</th>
resources/views/pdf/laporanlelfullcaw.blade.php
+1 -1
View File
@@ -168,7 +168,7 @@ tr:nth-child(even) {
@elseif($info['tagujrah'] == '1') @elseif($info['tagujrah'] == '1')
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>1% (RM)</th> <th>1% (RM)</th>
<th>Ujrah (RM)</th> <th>Lain-Lain Caj (RM)</th>
@endif @endif
<th>Caj Lelong (RM)</th> <th>Caj Lelong (RM)</th>
<th>Harga Lelong (RM)</th> <th>Harga Lelong (RM)</th>
resources/views/pdf/pdflaplelong.blade.php
+1 -1
View File
@@ -169,7 +169,7 @@ tr:nth-child(even) {
@elseif($info['tagujrah'] == '1') @elseif($info['tagujrah'] == '1')
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>1% (RM)</th> <th>1% (RM)</th>
<th>Ujrah (RM)</th> <th>Lain-Lain Caj (RM)</th>
@endif @endif
<th>Caj Lelong (RM)</th> <th>Caj Lelong (RM)</th>
<th>Harga Lelong (RM)</th> <th>Harga Lelong (RM)</th>
resources/views/pdf/pdflelongreport.blade.php
+1 -1
View File
@@ -162,7 +162,7 @@
@elseif($laporan['laporan']['tagujrah'] == '1') @elseif($laporan['laporan']['tagujrah'] == '1')
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>1% (RM)</th> <th>1% (RM)</th>
<th>Ujrah (RM)</th> <th>Lain-Lain Caj (RM)</th>
@endif @endif
<th>Caj Lelong (RM)</th> <th>Caj Lelong (RM)</th>
<th>Harga Asas (RM)</th> <th>Harga Asas (RM)</th>
resources/views/simulasiujrah/senaraimarhunlel.blade.php
+1 -1
View File
@@ -73,7 +73,7 @@
<th>Pembiayaan (RM)</th> <th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>1% (RM)</th> <th>1% (RM)</th>
<th>Ujrah (RM)</th> <th>Lain-Lain Caj (RM)</th>
<th>Caj Lelong (RM)</th> <th>Caj Lelong (RM)</th>
<th>Harga Asas (RM)</th> <th>Harga Asas (RM)</th>
<th>Baki Lelong (RM)</th> <th>Baki Lelong (RM)</th>
resources/views/simulasiujrah/showsimulasi.blade.php
+1 -1
View File
@@ -183,7 +183,7 @@
<th>Pembiayaan (RM)</th> <th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>1% (RM)</th> <th>1% (RM)</th>
<th>Ujrah (RM)</th> <th>Lain-Lain Caj (RM)</th>
<th>Caj (RM)</th> <th>Caj (RM)</th>
<th>Harga Asas (RM)</th> <th>Harga Asas (RM)</th>
<th>Baki (RM)</th> <th>Baki (RM)</th>