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

Merge branch 'adminapi' of https://gitlab.com/online-sistem1/api_arrahn into adminapi

Browse Source
This commit is contained in:
hafifierahman
2022-02-20 11:22:15 +08:00
parent bdc43e3877 a895e58d78
commit fd3e42d6bf
6 changed files with 275 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+241 -61
View File
@@ -21,11 +21,14 @@ use App\Bajet;
use App\BajetTahunan;
use App\Blacklist;
use App\Pelelong;
use App\Mohon;
use DB;
use Carbon\Carbon;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\Collection;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Http\Request;
class AdminPageController extends Controller
@@ -227,53 +230,114 @@ class AdminPageController extends Controller
->whereYear('bajettahunan.tahun', '=', $current->year)
->sum('nilaibajet');
$tebus_arrahn = Tebus::on($cawangan['mysql'])
->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
->selectRaw('SUM(tebus.bakiupah) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_tebus, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
->whereYear('t_tebus',$current->year)
->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',null],['t_tebus','<=',$current->toDateString()]])
->orderBy('t_tebus','asc')
->get()->toArray();
$advansur = Advansur::on($cawangan['mysql'])
->selectRaw('SUM(upahDibayar) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(tarikh, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(tarikh,'%Y%m')"))
->whereYear('tarikh',$current->year)
->where([['tarikh','<=',$current->toDateString()]])
->get()->toArray();
$ansuran = Transaction::on('mysql7')
->selectRaw('SUM(trans.bayaran_keuntungan) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
->whereYear('transaction.created_at',$current->year)
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->where('transaction.trans_type','=','A')
->where([['trans.tarikh_bayaran','<=',$current->toDateString(). ' 23:59:59']])
->where('trans.kodcaw','=',$request->kodcaw)
->get()->toArray();
$tebus_upah_tawarruq = Transaction::on('mysql7')
->selectRaw('SUM(trans.keuntungan_rebet) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
->whereYear('transaction.created_at',$current->year)
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->where('transaction.trans_type','!=','A')
->where([['trans.tarikh_bayaran','<=',$current->toDateString() . ' 23:59:59']])
->where('trans.kodcaw','=',$request->kodcaw)
->get()->toArray();
$lelongupahsimpan = Lelong::on($cawangan['mysql'])
->selectRaw('SUM(bakiupah) AS totalupahlelong')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_jual, "%Y-%m") as t_jual'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_jual,'%Y%m')"))
->whereYear('t_jual',$current->year)
// ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
->orderBy('t_jual','asc')
->get();
->selectRaw('SUM(bakiupah) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_jual, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_jual,'%Y%m')"))
->whereYear('t_jual',$current->year)
->orderBy('t_jual','asc')
->get()->toArray();
$totallelong = 0;
foreach($lelongupahsimpan as $index=>$lelong)
$totalall = 0;
$variable = ['lelongupahsimpan','ansuran','tebus_arrahn','advansur','tebus_upah_tawarruq'];
foreach($variable as $index => $var)
{
$totallelong += $lelong['totalupahlelong'];
foreach(${$var} as $indextemp => $temp)
{
$totalall += $temp['total'];
}
}
$tebus = Tebus::on($cawangan['mysql'])
->selectRaw('SUM(bakiupah) AS totalupahsimpan')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
->where(function($query) use ($current){
$query
->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()]])
->whereYear('t_tebus',$current->year);
})
->orWhere(function($query) use ($current){
$query
->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()]])
->whereYear('t_tebus',$current->year);
})
->orderBy('t_tebus','asc')
->get();
// $tebus = Tebus::on($cawangan['mysql'])
// ->selectRaw('SUM(bakiupah) AS totalupahsimpan')
// ->addSelect(DB::connection($cawangan['mysql'])
// ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
// ->groupBy(DB::connection($cawangan['mysql'])
// ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
// ->where(function($query) use ($current){
// $query
// ->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()]])
// ->whereYear('t_tebus',$current->year);
// })
// ->orWhere(function($query) use ($current){
// $query
// ->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()]])
// ->whereYear('t_tebus',$current->year);
// })
// ->orderBy('t_tebus','asc')
// ->get();
$totaltebus = 0;
foreach($tebus as $index=>$teb)
{
$totaltebus += $teb['totalupahsimpan'];
}
// $totaltebus = 0;
// foreach($tebus as $index=>$teb)
// {
// $totaltebus += $teb['totalupahsimpan'];
// }
$total = $totaltebus + $totallelong;
// $total = $totaltebus + $totallelong;
array_push($arrayKeuntungan,['bajet' => $bajetgroup,'total' => $total]);
array_push($arrayKeuntungan,['bajet' => $bajetgroup,'total' => $totalall]);
return response()->json($arrayKeuntungan);
@@ -829,47 +893,109 @@ class AdminPageController extends Controller
$lelongupahsimpan = Lelong::on($cawangan['mysql'])
->selectRaw('SUM(bakiupah) AS totalupahlelong')
->selectRaw('SUM(bakiupah) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_jual, "%Y-%m") as t_jual'))
->raw('DATE_FORMAT(t_jual, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_jual,'%Y%m')"))
->whereYear('t_jual',$current->year)
->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
->orderBy('t_jual','asc')
->get();
->get()->toArray();
$tebus = Tebus::on($cawangan['mysql'])
->selectRaw('SUM(bakiupah) AS totalupahsimpan')
$tebus_arrahn = Tebus::on($cawangan['mysql'])
->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
->selectRaw('SUM(tebus.bakiupah) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
->raw('DATE_FORMAT(t_tebus, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
->whereYear('t_tebus',$current->year)
->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
->orWhere([['jenistebus','=','A'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',null],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
->orderBy('t_tebus','asc')
->get();
->get()->toArray();
$advansur = Advansur::on($cawangan['mysql'])
->selectRaw('SUM(upahDibayar) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(tarikh, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(tarikh,'%Y%m')"))
->whereYear('tarikh',$current->year)
->where([['tarikh','<=',$current->toDateString()],['tarikh','>=',$monthly_date]])
->get()->toArray();
$ansuran = Transaction::on('mysql7')
->selectRaw('SUM(trans.bayaran_keuntungan) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
->whereYear('transaction.created_at',$current->year)
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->where('transaction.trans_type','=','A')
->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$current->toDateString(). ' 23:59:59']])
->where('trans.kodcaw','=',$request->kodcaw)
->get()->toArray();
$tebus_upah_tawarruq = Transaction::on('mysql7')
->selectRaw('SUM(trans.keuntungan_rebet) AS total')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
->whereYear('transaction.created_at',$current->year)
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->where('transaction.trans_type','!=','A')
->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$current->toDateString() . ' 23:59:59']])
->where('trans.kodcaw','=',$request->kodcaw)
->get()->toArray();
$variable = ['lelongupahsimpan','ansuran','tebus_arrahn','advansur','tebus_upah_tawarruq'];
foreach($array_totalup as $array_index=>$totalup){
foreach($lelongupahsimpan as $indexlelong=>$lelong_detail){
if($totalup['tarikh'] == $lelong_detail['t_jual']){
$total_lelong = $totalup['keuntungan'];
$total_lelong += $lelong_detail['totalupahlelong'];
$array_totalup[$array_index]['keuntungan'] = $total_lelong;
}
}
foreach($tebus as $indextebus=>$tebus_detail){
if($totalup['tarikh'] == $tebus_detail['t_tebus']){
$total_tebus = $array_totalup[$array_index]['keuntungan'];
$total_tebus += $tebus_detail['totalupahsimpan'];
$array_totalup[$array_index]['keuntungan'] = $total_tebus;
$array_totalup[$array_index]['bajetkeuntungan'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
foreach($variable as $index => $var)
{
foreach(${$var} as $indextemp => $temp)
{
if($totalup['tarikh'] == $temp['tarikh'])
{
$total_tebus = $array_totalup[$array_index]['keuntungan'];
$total_tebus += $temp['total'];
$array_totalup[$array_index]['keuntungan'] = $total_tebus;
$array_totalup[$array_index]['bajetkeuntungan'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
}
}
}
}
// foreach($tebus_upah_tawarruq as $indexloop=>$looptambahan)
// {
// if($totalup['tarikh'] == $looptambahan['tarikh']){
// $total = 0;
// $tebusarrahntotal = (count($tebus_arrahn) < $indexloop) ? $tebus_arrahn[$indexloop]['total'] : 0;
// $advansurtotal = (count($advansur) < $indexloop) ? $advansur[$indexloop]['total'] ? $advansur[$indexloop]['total'] : 0 : 0;
// $ansurantotal = (count($ansuran) < $indexloop) ? $ansuran[$indexloop]['total'] : 0;
// $tebustawarruqtotal = (count($lelongupahsimpan) < $indexloop) ? $lelongupahsimpan[$indexloop]['total'] : 0;
// $total = $looptambahan['total'] + $tebusarrahntotal + $advansurtotal + $ansurantotal + $tebustawarruqtotal;
// // $total_keuntungan = $array_totalup[$array_index]['keuntungan'];
// $total_keuntungan = $total;
// $array_totalup[$array_index]['keuntungan'] = $total_keuntungan;
// $array_totalup[$array_index]['bajetkeuntungan'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
// }
// }
$goals[0]['value'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
array_push($arrayKeuntungan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $array_totalup[$array_index]['keuntungan'],'goals' => (array) $goals]);
}
@@ -1505,4 +1631,58 @@ class AdminPageController extends Controller
return response()->json($detailslelong, 200);
}
public function paginate($items, $perPage = 5, $page = null, $options = [])
{
$page = $page ?: (Paginator::resolveCurrentPage() ?: 1);
$items = $items instanceof Collection ? $items : Collection::make($items);
return new LengthAwarePaginator($items->forPage($page, $perPage), $items->count(), $perPage, $page, $options);
}
public function listoperasi()
{
$harini = Carbon::now();
$harini = new Carbon;
$cawangan_all = Cawangan::on('mysql7')->get();
$arraykelulusan = [];
foreach($cawangan_all as $index=>$cawangan){
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('masalulus','=','')
->where('pelulus','=','operasi')
->get();
if(sizeof($kelulusan) != 0){
array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
}
}
$data = $this->paginate($arraykelulusan);
return response()->json($data,200);
}
public function listoperasikelulusan()
{
$harini = Carbon::now();
$harini = new Carbon;
$cawangan_all = Cawangan::on('mysql7')->get();
$arraykelulusan = [];
foreach($cawangan_all as $index=>$cawangan){
$kelulusan=Mohon::on($cawangan['mysql'])
->where('peloperasi','=','operasi')
->where('operasi','!=','')
->get();
if(sizeof($kelulusan) != 0){
array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
}
}
return response()->json($arraykelulusan,200);
}
}
app/Http/Controllers/GadaiController.php
+23 -7
View File
@@ -313,7 +313,7 @@ class GadaiController extends Controller
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
$upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
$upah_semasa = substr($upah_semasa_round, 0, -1);
// $upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
if(strpos($upah_semasa,',')){
$upah_semasa = str_replace(',','',$upah_semasa);
@@ -335,7 +335,7 @@ class GadaiController extends Controller
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_rebet_round = number_format($upahrebet_raw,2);
$upah_rebet = (float)substr($upah_rebet_round, 0, -1);
$upah_rebet = substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
@@ -3402,27 +3402,43 @@ class GadaiController extends Controller
return response()->json($dataKomoditi);
}
public function updateLelongTawarruq(){
$cawangan_all = Cawangan::on('mysql7')->get();
public function updateLelongTawarruq(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
foreach($cawangan_all as $index=>$cawangan){
// foreach($cawangan_all as $index=>$cawangan){
$gadai_all = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan','!=','bakihargajualan'],['hargajualan','!=',null]])->get();
foreach($gadai_all as $index=>$gadai){
$totalbayaran = Transaction::on('mysql7')->where('norujukan',$gadai['norujukan'])->sum('duit_masuk');
$totalbayaran = $gadai['hargajualan'] - $gadai['bakihargajualan'];
$upah6bln_raw = $gadai['bakiupah'];
$upah6bln_round = number_format($upah6bln_raw,2);
$upah6bln = (float)substr($upah6bln_round, 0, -1);
$upah6bln = substr($upah6bln_round, 0, -1);
$upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
if($totalbayaran >= $upah6bln){
Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
'lelong_tawarruq'=>0
]);
}else{
Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
'lelong_tawarruq'=>1
]);
}
}
// }
return response()->json('successful');
}
public function upah12kosong(){
$cawangan_all = Cawangan::on('mysql7')->get();
$sag = [];
foreach($cawangan_all as $index=>$cawangan){
$gadai = Gadai::on($cawangan['mysql'])->where('upah12',0)->get();
array_push($sag,['cawangan'=>$cawangan['details_caw'],'sag'=>$sag]);
}
return response()->json($sag);
}
public function updateTebusGadai(){
app/Http/Controllers/MarhunController.php
+1 -1
View File
@@ -127,7 +127,7 @@ class MarhunController extends Controller
$current = new Carbon();
$harga = HargaEmas::on('mysql7')->where('karat',$request->karat)->first();
$nilai_marhun = $request->berat_emas * $harga['harga'];
$nilai_marhun = $request->berat * $harga['harga'];
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
app/Http/Controllers/TebusController.php
+5 -5
View File
@@ -67,7 +67,7 @@ class TebusController extends Controller
if(strpos($upah_semasa_round,',')){
$upah_semasa_round = str_replace(',','',$upah_semasa_round);
}
$upah_semasa = (float)substr($upah_semasa_round, 0, -1);
$upah_semasa = substr($upah_semasa_round, 0, -1);
if(strpos($upah_semasa,',')){
$upah_semasa = str_replace(',','',$upah_semasa);
}
@@ -92,7 +92,7 @@ class TebusController extends Controller
if(strpos($upah_rebet_round,',')){
$upah_rebet_round = str_replace(',','',$upah_rebet_round);
}
$upah_rebet = (float)substr($upah_rebet_round, 0, -1);
$upah_rebet = substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
@@ -117,7 +117,7 @@ class TebusController extends Controller
if(strpos($upah_rebet_round,',')){
$upah_rebet_round = str_replace(',','',$upah_rebet_round);
}
$upah_rebet = (float)substr($upah_rebet_round, 0, -1);
$upah_rebet = substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
@@ -173,7 +173,7 @@ class TebusController extends Controller
$total_harga_tebus_round = round($total_harga_tebus,2);
$totalhargatebus = (float)substr($total_harga_tebus_round, 0, -1);
$totalhargatebus = substr($total_harga_tebus_round, 0, -1);
return response()->json($totalhargatebus);
}
@@ -363,7 +363,7 @@ class TebusController extends Controller
if(strpos($rebet_round,',')){
$rebet_round = str_replace(',','',$rebet_round);
}
$rebet = (float)substr($rebet_round, 0, -1);
$rebet = substr($rebet_round, 0, -1);
return $rebet;
}
app/Http/Controllers/TransactionOnlineController.php
+1 -1
View File
@@ -128,7 +128,7 @@ class TransactionOnlineController extends Controller
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_rebet_round = number_format($upahrebet_raw,2);
$upah_rebet = (float)substr($upah_rebet_round, 0, -1);
$upah_rebet = substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
routes/web.php
+4 -2
View File
@@ -544,6 +544,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('check/lelong/tawarruq',['uses'=>'GadaiController@updateLelongTawarruq']);
$router->get('update/sttebus/gadaian',['uses'=>'GadaiController@updateTebusGadai']);
$router->get('check/upah12/kosong',['uses'=>'GadaiController@upah12kosong']);
$router->get('calculate/akru/bycawangan',['uses'=>'GadaiController@calculateAkru']);
});
@@ -671,8 +673,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);
$router->put('notislelong/update/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong']);
$router->get('ListOperasi/Paginate',['uses'=>'AdminPageController@listoperasi']);
$router->get('ListOperasiKelulusan/Paginate',['uses'=>'AdminPageController@listoperasikelulusan']);
});