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

fix

Browse Source
This commit is contained in:
Afiq
2022-03-01 22:24:42 +08:00
parent b9a9d65811
commit 6881aaa2a8
6 changed files with 287 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+19 -7
View File
@@ -20,6 +20,7 @@ use App\Tunai;
use App\Komuditi;
use App\KawalanStokLama;
use App\KawalanStok;
use App\KadarUpah;
use App\Moratorium;
use App\Audit;
use App\Customer;
@@ -207,6 +208,7 @@ class GadaiController extends Controller
public function daftarGadaiMarhun($norujukan,Request $request){
// dd("ggwp");
$current = Carbon::now();
$current = new Carbon();
@@ -228,24 +230,34 @@ class GadaiController extends Controller
$bil_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->count();
$total_nilai_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('n_marhun');
$total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat');
$kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
$upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
$upah6 = $upah1 * 6;
$upah12 = $upah1 * 12;
$hargajualan = $request->pinjaman + $upah12;
$gadai = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->update(array(
'nilaimarhun' => $request->nilaimarhun,
'berat'=> $request->berat,
'nilaimarhun' => $total_nilai_marhun,
'berat'=> $total_berat,
'pinjaman' => $request->pinjaman,
'kadarupah' => $request->kadarupah,
'kadarupah' => $kadar_raw['kadarupdah'],
'marhun' => $request->marhun,
'percentpinj' => $margin_pinjam,
'teller' => $request->teller,
'bakipjm' => $request->pinjaman,
'bakiupah' => $request->upah6,
'bakiupah' => $upah6,
'jbg' => 0.5,
't_update' => $current->toDateString(),
'cetak' => 0,
'upah12' => $request->upah12,
'hargajualan' => $request->hargajualan,
'bakihargajualan' => $request->hargajualan,
'upah12' => $upah12,
'hargajualan' => $hargajualan,
'bakihargajualan' => $hargajualan,
'tagserah' => 0,
't_matang' => $t_matang,
't_matang1' => $t_kontrak,
app/Http/Controllers/TebusController.php
+14 -12
View File
@@ -392,8 +392,10 @@ class TebusController extends Controller
'sttebus' => "T",
't_update' => $current->toDateString(),
));
$harga_tebus = $this->tebusTawarruq($kodcaw,$norujukan);
$upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
$upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
$upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
$create_tebus = Tebus::on($cawangan['mysql'])->create([
'kodcaw'=> $kodcaw,
@@ -403,20 +405,20 @@ class TebusController extends Controller
'jenistebus' => $request->jenistebus,
'glcode' => "0",
't_tebus' => $current->toDateString(),
'jbg' => $request->jbg,
'kadarupah' => $request->kadarupah,
'nilaimarhun' => $request->nilai_marhun,
'pinjaman' => $request->pinjaman,
'ansuran' => $request->ansuran,
'jbg' => $gadai['tempoh'],
'kadarupah' => $gadai['kadarupah'],
'nilaimarhun' => $gadai['nilaimarhun'],
'pinjaman' => $gadai['pinjaman'],
'ansuran' => 0.00,
'addpinjaman' => $request->addpinjaman,
'bakipjm' => $request->bakipinjaman,
'bakiupah' => $request->bakiupah,
'bakipjm' => $harga_tebus,
'bakiupah' => $upah_tebus,
'terima' => "*",
'kodgl' => "0",
'nowakil' => $request->nowakil,
'rebate' => $rebet,
'marhuntebus' => $request->marhun,
'historygadaian' => $request->historygadaian,
'historygadaian' => $norujukan,
'tarikhbyrn' => $current->toDateString(),
'teller' => $request->teller
]);
@@ -437,9 +439,9 @@ class TebusController extends Controller
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $norujukan,
'bayaran_keuntungan' => $request->bakiupah,
'bayaran_keuntungan' => $upah_tebus,
'bayaran_pembiayaan' => $gadai['bakipjm'],
'keuntungan_rebet' => $upah_rebet,
'keuntungan_rebet' => $upah_rebet_sebenar,
'tarikh_bayaran'=> $current,
'kodcaw'=> $kodcaw
]);
@@ -464,7 +466,7 @@ class TebusController extends Controller
'nokp' => $gadai['nokp'],
'teller' => $request->teller,
'kodcaw' => $kodcaw,
'duit_masuk' => $request->bakipinjaman,
'duit_masuk' => $harga_tebus,
'created_at' => $current,
'bakiharga' => $baki_hargajualan,
]);
app/Http/Controllers/TransactionOnlineController.php
+35 -11
View File
@@ -32,6 +32,10 @@ class TransactionOnlineController extends Controller
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
$sag = Gadai::on($cawangan['mysql'])->where('norujukan',$request->norujukan)->first();
$transaction = TransactionOnline::on('mysql7')->create([
'nokp' => $request->nokp,
'reference_no' => $request->reference_no,
@@ -42,7 +46,8 @@ class TransactionOnlineController extends Controller
'total_payment' => $request->total_payment,
'tarikh' => $current->toDateString(),
'masa' => $current->toTimeString(),
'customer_name' => $request->customer_name
'customer_name' => $request->customer_name,
'tempohbayar'=>$sag['tempoh']
]);
return response()->json($transaction,201);
@@ -68,7 +73,7 @@ class TransactionOnlineController extends Controller
$gadai_data = Gadai::on($cawangan['mysql'])->where([['norujukan',$transaction['norujukan']],['nokp',$transaction['nokp']]])->first();
if($gadai_data['hargajualan'] > 0){
$this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
$this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at'],$transaction['tempohbayar']);
}else{
$this->createAdvansur($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
}
@@ -83,7 +88,7 @@ class TransactionOnlineController extends Controller
'teller' => 'ONLINE'
]);
TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan'],['billplz_id',$transaction['billplz_id']]]])->update([
TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan']],['billplz_id',$transaction['billplz_id']]])->update([
'update_status' => 1,
'update_serahan' => 1
]);
@@ -92,7 +97,7 @@ class TransactionOnlineController extends Controller
return response()->json('success');
}
public function kiraupahTawarruq($kodcaw,$norujukan){
public function kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar){
$cawangan = Cawangan::on('mysql7')
->where('kodcaw','=',$kodcaw)
->first();
@@ -101,7 +106,7 @@ class TransactionOnlineController extends Controller
->where('norujukan','=',$norujukan)
->first();
$bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
$bilang_bln = $tempohbayar - $gadai_data['tempohbayar'];
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
@@ -114,7 +119,7 @@ class TransactionOnlineController extends Controller
return $upah_semasa;
}
public function kiraUpahRebet($kodcaw,$norujukan){
public function kiraUpahRebet($kodcaw,$norujukan,$tempohbayar){
$cawangan = Cawangan::on('mysql7')
->where('kodcaw','=',$kodcaw)
->first();
@@ -123,7 +128,7 @@ class TransactionOnlineController extends Controller
->where('norujukan','=',$norujukan)
->first();
$bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
$bilang_bln = $tempohbayar - $gadai_data['tempohbayar'];
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
@@ -137,15 +142,19 @@ class TransactionOnlineController extends Controller
return $upah_rebet;
}
public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at){
public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at,$tempohbayar){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
$upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
if($tempohbayar == 0.0){
$tempohbayar = $gadai['tempoh'];
}
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar);
$upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan,$tempohbayar);
$total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
@@ -188,7 +197,7 @@ class TransactionOnlineController extends Controller
'jbg' => 0,
't_update' => Carbon::parse($paid_at)->toDateString(),
'bakihargajualan' => $baki_hargajualan,
'tempohbayar' => $gadai['tempoh'],
'tempohbayar' => $tempohbayar,
'lelong_tawarruq' => $lelong_tawarruq
));
return response()->json($update_gadai, 200);
@@ -243,4 +252,19 @@ class TransactionOnlineController extends Controller
return response()->json(false);
}
}
public function getListUnsuccessful(){
$list = TransactionOnline::on('mysql7')->whereIn('status',['NOT PAID','UNSUCCESSFUL'])->get();
return response()->json($list);
}
public function updateUnsuccessfulTransaction(Request $request){
$transaction = TransactionOnline::on('mysql7')->where('billplz_id','=',$request->billplz_id)->update(array(
'status' => $request->status,
'paid_at' => $request->paid_at
));
return response()->json($transaction,200);
}
}
app/KadarUpah.php
+27
View File
@@ -0,0 +1,27 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class KadarUpah extends Model
{
protected $table = 'kadarupah';
protected $connection = 'mysql7';
/**
* The attributes that are mass assignable.
*
* @var array
*/
// protected $fillable = [
// ];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
config/database.php
+12
View File
@@ -5,6 +5,18 @@ return [
'default' => 'accounts',
'connections' => [
'lelong' => [
'driver' => 'mysql',
'host' => env('DB_HOST_LELONG'),
'port' => env('DB_PORT_LELONG'),
'database' => env('DB_DATABASE_LELONG'),
'username' => env('DB_USERNAME_LELONG'),
'password' => env('DB_PASSWORD_LELONG'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST'),
routes/web.php
+3
View File
@@ -224,6 +224,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('transaction/online/express',['uses'=>'TransactionOnlineController@getTransactionOnline']);
$router->get('transaction/online/update',['uses'=>'TransactionOnlineController@updateTransactionOnline']);
$router->get('transaction/online/login',['uses'=>'TransactionOnlineController@getTransactionOnlineLogin']);
$router->get('transaction/online/unsuccessful',['uses'=>'TransactionOnlineController@getListUnsuccessful']);
$router->put('transaction/online/unsuccesfull/update',['uses'=>'TransactionOnlineController@updateUnsuccessfulTransaction']);