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

Merge branch 'adminapi' into 'master'

Browse Source 
Adminapi

See merge request online-sistem1/api_arrahn!138
This commit is contained in:
hafifie rahman
2022-02-09 03:52:40 +00:00
parent 959b49d703 9eb095ebe0
commit 7dc42c9630
5 changed files with 335 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/BatchLel.php
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class BatchLel extends Model
{
protected $table = 'batchlel';
/**
* The attributes that are mass assignable.
*
* @var array
*/
// protected $fillable = [
// ];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
app/Http/Controllers/AdminPageController.php
+188 -61
View File
@@ -20,6 +20,7 @@ use App\TransaksiKeuntungan;
use App\Bajet;
use App\BajetTahunan;
use App\Blacklist;
use App\Pelelong;
use DB;
@@ -226,53 +227,109 @@ class AdminPageController extends Controller
->whereYear('bajettahunan.tahun', '=', $current->year)
->sum('nilaibajet');
$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();
$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();
$totallelong = 0;
$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 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();
$totalall = 0;
foreach($lelongupahsimpan as $index=>$lelong)
{
$totallelong += $lelong['totalupahlelong'];
$totalall += $lelong['total'] + $tebus_arrahn[$index]['total'] + $advansur[$index]['total'] + $ansuran[$index]['total'] + $tebus_upah_tawarruq[$index]['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);
@@ -828,47 +885,106 @@ 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();
// dd($array_totalup);
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($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($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($lelongupahsimpan as $indexloop=>$looptambahan)
{
if($totalup['tarikh'] == $looptambahan['tarikh']){
$total = 0;
$total = $looptambahan['total'] + $tebus_arrahn[$indexloop]['total'] + $advansur[$indexloop]['total'] + $ansuran[$indexloop]['total'] + $tebus_upah_tawarruq[$indexloop]['total'];
// $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]);
}
@@ -1490,7 +1606,18 @@ class AdminPageController extends Controller
));
return response()->json($updatetunai, 200);
}
public function UpdateNotisLelong($kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$detailslelong = Pelelong::on($cawangan['mysql'])->
update(array(
'para2'=>$request->content
));
return response()->json($detailslelong, 200);
}
}
app/Http/Controllers/LelongController.php
+87 -1
View File
@@ -2,7 +2,14 @@
namespace App\Http\Controllers;
use App\Customer;
use App\BatchLel;
use App\Pelelong;
use App\Daerah;
use App\Poskod;
use App\Negeri;
use App\Lelong;
use App\Transaction;
use App\Cawangan;
use App\Gadai;
use App\TuntutBaki;
@@ -17,7 +24,7 @@ use App\LelTebus;
use App\LelMarhun;
use Illuminate\Http\Request;
use DB;
use Carbon\Carbon;
class LelongController extends Controller
@@ -635,4 +642,83 @@ class LelongController extends Controller
}
}
public function getSenaraiLelongAktif($kodcaw){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$kodcaw)->first();
$lelong = Lelong::on($cawangan['mysql'])
->selectRaw('count(*) as total, batchno,t_lelong')
->where('t_lelong','>=',$current->toDateString())
->whereNull('t_jual')
->orderBy('t_lelong','desc')
->groupBy('batchno')
->get();
return response()->json($lelong);
}
public function getSenaraiBatchNoAktif($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$arraylelong = [];
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$lelong = Lelong::on($cawangan['mysql'])
->select('lelong.t_lelong','lelong.norujukan','gadai.jbg','gadai.nokp','gadai.pinjaman','gadai.bakiupah')
->leftJoin('gadai', 'gadai.norujukan', '=', 'Lelong.norujukan')
// ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
->where('batchno','=',$request->batchno)
->orderBy('gadai.t_gadai','asc')
->where('gadai.taglel','=', 1);
$batchlel = BatchLel::on($cawangan['mysql'])
->where('batchno','=',$request->batchno)
->get()->toArray();
$lelonglist = $lelong->get();
foreach($lelonglist as $index=>$lel)
{
$ansuran = Transaction::on('mysql7')
->where('norujukan','=', $lel['norujukan'])
->where([['trans_type','=','A'],['kodcaw','=',$kodcaw]])
->sum('duit_masuk');
$customer = Customer::on('mysql7')
->select('nama','telefon','telefon2','alamat1','alamat2','poskod','koddaerah')
->where('kpbaru','=',$lel['nokp'])
->orWhere('kplama','=',$lel['nokp'])
->get()->toArray();
$poskod = Poskod::on('mysql7')
->where('poskod','=',$customer[0]['poskod'])
->first();
$daerah = Daerah::on('mysql7')
->where('koddaerah','=',$poskod['koddaerah'])
->first();
$negeri = Negeri::on('mysql7')
->where('kodnegeri','=',$poskod['kodnegeri'])
->first();
array_push($arraylelong,['poskod'=>$customer[0]['poskod'],'negeri' => $negeri['negeri'],'daerah' => $daerah['namadaerah'],'alamat' => $customer[0]['alamat1'],'alamat2' => $customer[0]['alamat2'],'masa' => $batchlel[0]['masadari'],'tarikhlelong' => $lel['t_lelong'],'nama' => $customer[0]['nama'], 'telefon1' => $customer[0]['telefon'], 'telefon2' => $customer[0]['telefon2'], 'norujukan' => $lel['norujukan'], 'JBG' => $lel['jbg'], 'IC' => $lel['nokp'], 'Pembiayaan' => $lel['pinjaman'], 'upah6' => $lel['bakiupah'], 'bayaran' => $ansuran]);
}
return response()->json($arraylelong);
}
public function DetailsNotisLelong($kodcaw){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$detailslelong = Pelelong::on($cawangan['mysql'])->get();
return response()->json($detailslelong);
}
}
app/Pelelong.php
+27
View File
@@ -0,0 +1,27 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Pelelong extends Model
{
protected $table = 'pelelong';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
// protected $fillable = [
// ];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
routes/web.php
+7
View File
@@ -258,6 +258,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);
$router->get('gadai/JumlahagingBulanan/test/{kodcaw}/{tarikh}',['uses'=>'GadaiController@carian_Seluruh_AgingBulanan']);
//LELONG API
$router->get('senaraibatch/aktif/{kodcaw}',['uses'=>'LelongController@getSenaraiLelongAktif']);
$router->get('senaraibatch/laporan/{kodcaw}',['uses'=>'LelongController@getSenaraiBatchNoAktif']);
$router->get('details/notislelong/{kodcaw}',['uses'=>'LelongController@DetailsNotisLelong']);
//API BARU
$router->get('Dashboard_all/{kodcaw}',['uses'=>'GadaiController@dashboardall']);
$router->get('VaultController/{kodcaw}',['uses'=>'VaultController@list']);
@@ -663,6 +669,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']);
$router->post('DeleteBlacklist',['uses'=>'AdminPageController@DeleteBlackList']);
$router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);
$router->put('notislelong/update/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong']);