Merge branch 'ujrah_master' of https://bitbucket.org/arrahn-pkb/api_arrahn into finadev
This commit is contained in:
@@ -29,6 +29,7 @@ use App\Pembeli;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use App\Services\RingkasanHarianServices;
|
||||
use App\Services\OnePercentServices;
|
||||
|
||||
use Log;
|
||||
use DB;
|
||||
@@ -1607,6 +1608,66 @@ class LelongController extends Controller
|
||||
}
|
||||
|
||||
|
||||
public function kiraupahUjrahOnePercent($kodcaw,$norujukan){
|
||||
$onepercentservices = new OnePercentServices();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')
|
||||
->where('kodcaw','=',$kodcaw)
|
||||
->first();
|
||||
|
||||
$gadai_data = Gadai::on($cawangan['mysql'])
|
||||
->where('norujukan','=',$norujukan)
|
||||
->first();
|
||||
|
||||
if($gadai_data['tempoh'] >= 12.0){
|
||||
$tempoh = 12;
|
||||
}else{
|
||||
$tempoh = $gadai_data['tempoh'];
|
||||
}
|
||||
|
||||
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
|
||||
$array_upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
|
||||
$ujrah = $bilang_bln * $array_upah['ujrah'];
|
||||
$onepercent = $bilang_bln * $array_upah['onepercent'];
|
||||
$onepercent_semasa = $onepercent;
|
||||
$ujrah_semasa = $ujrah;
|
||||
|
||||
return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa];
|
||||
}
|
||||
|
||||
public function kiraupahUjrahOnePercentRebate($kodcaw,$norujukan){
|
||||
$onepercentservices = new OnePercentServices();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')
|
||||
->where('kodcaw','=',$kodcaw)
|
||||
->first();
|
||||
|
||||
$gadai_data = Gadai::on($cawangan['mysql'])
|
||||
->where('norujukan','=',$norujukan)
|
||||
->first();
|
||||
|
||||
if($gadai_data['tempoh'] >= 12.0){
|
||||
$tempoh = 12;
|
||||
}else{
|
||||
$tempoh = $gadai_data['tempoh'];
|
||||
}
|
||||
|
||||
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
|
||||
$array_upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
|
||||
$ujrah = $bilang_bln * $array_upah['ujrah'];
|
||||
$onepercent = $bilang_bln * $array_upah['onepercent'];
|
||||
|
||||
// $rounded_ujrah = round(($ujrah*100)/5,0)*5/100;
|
||||
$ujrah_semasa = $ujrah;
|
||||
|
||||
// $rounded_onepercent = round(($onepercent*100)/5,0)*5/100;
|
||||
$onepercent_semasa = $onepercent;
|
||||
|
||||
return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa];
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -798,7 +798,10 @@ $router->group(['prefix'=>'admin'], function () use ($router){
|
||||
});
|
||||
|
||||
$router->group(['prefix'=>'lelong'], function () use ($router){
|
||||
$router->get('upahtawarruq/{kodcaw}/{norujukan}/{jeniskeuntungan}',['uses'=>'TebusController@upahTawarruq']);
|
||||
$router->get('upahrebettawarruq/{kodcaw}/{norujukan}/{jeniskeuntungan}',['uses'=>'TebusController@upahRebetTawarruq']);
|
||||
$router->get('kiraupahUjrahOnePercent/{kodcaw}/{norujukan}',['uses'=>'LelongController@kiraupahUjrahOnePercent']);
|
||||
$router->get('kiraupahUjrahOnePercentRebate/{kodcaw}/{norujukan}',['uses'=>'LelongController@kiraupahUjrahOnePercentRebate']);
|
||||
$router->post('taglel/update',['uses'=>'GadaiController@updateTagLelong']);
|
||||
$router->post('taglel/revert',['uses'=>'GadaiController@revertTagLelong']);
|
||||
$router->post('exportLelong',['uses'=>'LelongController@exportLelong']);
|
||||
|
||||
Reference in New Issue
Block a user