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

fix delete panjar

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-07-07 16:38:29 +08:00
parent 750232c915
commit 547f36d9a1
6 changed files with 84 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/DenoPanjar.php
+2 -2
View File
@@ -13,8 +13,8 @@ class DenoPanjar extends Model
*
* @var array
*/
protected $fillable = ['no','kodlaluan','serahan','tarikh','masa','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50','jenis','recno'];
protected $fillable = ['no','kodlaluan','serahan','tarikh','masa','update','jenis','recno','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50'];
/**
* The attributes excluded from the model's JSON form.
app/Http/Controllers/GadaiController.php
+2 -1
View File
@@ -958,8 +958,9 @@ class GadaiController extends Controller
$keuntungan = $ansurans->sum('trans.bayaran_keuntungan');
$pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan');
$bilangan = $ansurans->count();
$arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan];
$arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan, 'bilangan' => $bilangan];
return response()->json($arrayansuran,200);
}
app/Http/Controllers/LaporanController.php
+14 -4
View File
@@ -47,10 +47,12 @@ class LaporanController extends Controller
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.kodcaw','=',$request->kodcaw)
->where('trans.trans_type','=','A')
->groupBy('trans.id')
// ->groupBy('trans.id')
->sum('bayaran_keuntungan');
// $total_ansuran = number_format($total_ansuran,2);
$total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
@@ -181,7 +183,10 @@ class LaporanController extends Controller
}
//g
$bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('jumlah');
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh);
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman');
@@ -205,6 +210,7 @@ class LaporanController extends Controller
'bilangan_ansuran'=>$bilangan_ansuran,
'bilangan_customer_baru'=>$bilangan_customer_baru,
'bayar_baki_lelong'=>$bayar_baki_lelong,
'bayar_rugi_lelong'=>$bayar_rugi_lelong,
'gadai_70'=>$gadai_70,
'gadai_75'=>$gadai_75,
'gadai_80'=>$gadai_80,
@@ -265,7 +271,7 @@ class LaporanController extends Controller
->whereDate('trans.created_at','<=',$request->akhir)
->where('trans.trans_type','=','A')
->where('trans.kodcaw','=',$request->kodcaw)
->groupBy('trans.id')
// ->groupBy('trans.id')
->sum('bayaran_keuntungan');
// $total_ansuran = number_format($total_ansuran,2);
@@ -301,7 +307,10 @@ class LaporanController extends Controller
}
//g
$bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->sum('jumlah');
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]);
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
@@ -325,6 +334,7 @@ class LaporanController extends Controller
'bilangan_ansuran'=>$bilangan_ansuran,
'bilangan_customer_baru'=>$bilangan_customer_baru,
'bayar_baki_lelong'=>$bayar_baki_lelong,
'bayar_rugi_lelong'=>$bayar_rugi_lelong,
'gadai_70'=>$gadai_70,
'gadai_75'=>$gadai_75,
'gadai_80'=>$gadai_80,
app/Http/Controllers/PanjarController.php
+33
View File
@@ -241,11 +241,44 @@ class PanjarController extends Controller
'txtsen10' => $request->txtsen10,
'txtsen20' => $request->txtsen20,
'txtsen50' => $request->txtsen50,
'jenis' =>$request->jenis,
'recno' =>$request->recno,
'update' => '0'
]);
return response()->json($denopanjar,200);
}
public function getDenoPanjar($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$denopanjar=DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get();
return response()->json($denopanjar,200);
}
public function updateDenoPanjar($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$denopanjar=DenoPanjar::on('mysql7')
->where('recno','=', $request->recno)
->update(array(
'pelulus' => $request->pelulus,
'masalulus'=> $harini->toTimeString()
));
return response()->json($denopanjar,200);
}
}
app/Http/Controllers/VaultController.php
+30
View File
@@ -88,6 +88,36 @@ class VaultController extends Controller
return response()->json($updateVault, 200);
}
public function updateVaultDeletePanjar($kodcaw, Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first();
$bakiawal = $vault['bakiawal'];
$keluar = $vault['keluar'];
$masuk = $vault['masuk'];
$bakiakhir = $vault['bakiakhir'];
$bakieod = $vault['bakieod'];
$pendahuluan = $vault['pendahuluan'];
$serahan = $vault['serahan'];
$totpanjaran = $vault['totpanjar'];
$totalpanjar = $request->totpanjar - $totpanjaran;
$bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar;
$updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
'totpanjar' => $totalpanjar,
'bakiakhir'=>$bakiakhir,
'bakieod'=>$bakiakhir
));
return response()->json($updateVault, 200);
}
public function updateVaultPendahuluanSerahan($kodcaw, Request $request)
{
$current = Carbon::now();
routes/web.php
+3
View File
@@ -233,6 +233,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']);
$router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']);
$router->put('UpdateVault/Panjar/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']);
$router->put('UpdateVault/DeletePanjar/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePanjar']);
$router->put('UpdateVaultPendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPendahuluanSerahan']);
$router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
$router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
@@ -292,6 +293,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
//API DENO PANJAR & DENO PEND-SERAHAN
$router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']);
$router->post('requestdenopanjar/get/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']);
$router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']);
$router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']);
//API WAKIL