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

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

Browse Source
This commit is contained in:
e.arrahn
2021-08-30 17:26:07 +08:00
parent e8afa41a37 3444309806
commit b547d4366c
11 changed files with 219 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Blacklist.php
+27
View File
@@ -0,0 +1,27 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Blacklist extends Model
{
protected $table = 'senhitam';
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 = [];
}
app/Http/Controllers/CustomerController.php
+31 -10
View File
@@ -9,6 +9,7 @@ use App\Gadai;
use App\Lelong;
use App\Cawangan;
use App\Poskod;
use App\Blacklist;
use Illuminate\Http\Request;
use Carbon\Carbon;
@@ -63,6 +64,23 @@ class CustomerController extends Controller
return response()->json($customer);
}
public function showOneCustomerByICAdmin(Request $request){
// $cawangan_all = Cawangan::on('mysql7')->get();
// $customer_all = [];
// foreach($cawangan_all as $index=>$cawangan){
$customer = Customer::on('mysql7')
->where('kplama','=',$request->ic)
->orWhere('kpbaru','=',$request->ic)
->first();
// if($customer != null){
// array_push($customer_all,$customer);
// }
// }
return response()->json($customer);
}
public function showOneCustomerByICMobile($ic){
$cawangan_all = Cawangan::on('mysql7')->get();
@@ -373,13 +391,7 @@ class CustomerController extends Controller
}
public function customerUpdateKaunter($nokp,Request $request){
// $cawangan_all = Cawangan::on('mysql7')->get();
// foreach($cawangan_all as $index=>$cawangan){
// $customer = Customer::on($cawangan['mysql'])
// ->where('kplama','=',$nokp)
// ->orWhere('kpbaru','=',$nokp)
// ->first();
// if($customer != null){
$poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
$customer_update = Customer::on('mysql7')
->where('kplama','=',$nokp)
@@ -389,10 +401,12 @@ class CustomerController extends Controller
'telefon2' => $request->telefon2,
'kodbank' => $request->kodbank,
'noakaun' => $request->noakaun,
'nota' => $request->nota
'nota' => $request->nota,
'alamat1' => $request->alamat,
'poskod' => $request->poskod,
'koddaerah' => $poskod['koddaerah'],
'kodnegeri' => $poskod['kodnegeri']
));
// }
// }
return response()->json($customer_update, 200);
}
@@ -686,4 +700,11 @@ class CustomerController extends Controller
}
return response()->json(number_format($jumlahBakiLelong,2));
}
public function blacklistCustomer(Request $request){
$blacklist = Blacklist::where('nokp',$request->nokp)->first();
return response()->json($blacklist);
}
}
app/Http/Controllers/GadaiController.php
+16 -29
View File
@@ -625,51 +625,39 @@ class GadaiController extends Controller
//Gadai Terkumpul
$gadai = Gadai::on($cawangan['mysql'])
->where('sttebus','=','')
// ->where('sttebus','=','')
->whereNull('hargajualan')
->whereYear('t_gadai','=',$current->year)
->sum('pinjaman');
$gadaitawarruq = Gadai::on($cawangan['mysql'])
->where('sttebus','=','')
// ->where('sttebus','=','')
->whereNotNull('hargajualan')
->whereYear('t_gadai','=',$current->year)
->sum('pinjaman');
// //Tebus Terkumpul
// $tebus = Tebus::on($cawangan['mysql'])
// ->where('jenistebus','=','T')
// ->whereNull('hargajualan')
// ->whereYear('t_tebus','=',$current->year)
// ->sum('pinjaman');
$tebus = Tebus::on($cawangan['mysql'])
->leftJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
->whereNull('gadai.hargajualan')
->whereYear('tebus.t_tebus','=',$current->year)
->sum('tebus.pinjaman');
// $tebustawarruq = Tebus::on($cawangan['mysql'])
// ->where('jenistebus','=','T')
// ->whereNotNull('hargajualan')
// ->whereYear('t_tebus','=',$current->year)
// ->sum('pinjaman');
$tebus = Gadai::on($cawangan['mysql'])
->where('sttebus','=','T')
->whereNull('hargajualan')
->whereYear('t_gadai','=',$current->year)
->sum('pinjaman');
$tebustawarruq = Gadai::on($cawangan['mysql'])
->where('sttebus','=','T')
->whereNotNull('hargajualan')
->whereYear('t_gadai','=',$current->year)
->sum('pinjaman');
$tebustawarruq = Tebus::on($cawangan['mysql'])
->leftJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
->whereNotNull('gadai.hargajualan')
->whereYear('tebus.t_tebus','=',$current->year)
->sum('tebus.pinjaman');
$gadvar = $gadai + $gadaitawarruq;
$tebvar = $tebus + $tebustawarruq;
//Variasi
$variasi = $gadai - $tebus;
$variasi = $gadvar - $tebvar;
//Outstanding
$outstanding = Gadai::on($cawangan['mysql'])
->where('sttebus','=','')
->orderBy('t_gadai','desc')
->sum('pinjaman');
array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
@@ -853,7 +841,6 @@ class GadaiController extends Controller
$gadai = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
->where('t_gadai','=',$request->tarikh)
->where('sttebus','=','')
->orderBy('t_gadai')
->get();
@@ -2401,7 +2388,7 @@ class GadaiController extends Controller
$tarikhtawarruq = '2021-06-29';
break;
case '011231':
$tarikhtawarruq = '2021-06-24';
$tarikhtawarruq = '2021-06-23';
break;
case '011232':
$tarikhtawarruq = '2021-06-28';
app/Http/Controllers/KelulusanController.php
+1 -1
View File
@@ -118,7 +118,7 @@ class KelulusanController extends Controller
}
}
else
else if($pengesahan == 'operasi')
{
if($request->pembatalan == null)
{
app/Http/Controllers/LelongController.php
+32 -1
View File
@@ -212,6 +212,12 @@ class LelongController extends Controller
if($kodcaw == '011412')
$rugitotal -= 7248.4;
if($kodcaw == '020303')
{
$bakilelong -= 542.6;
$rugitotal += 0.01;
}
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
return response()->json($arraylelong,200);
@@ -431,7 +437,7 @@ class LelongController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$lelong = Lelong::on($cawangan['mysql'])
->select('tuntutbaki.batchno','tuntutbaki.tarikh','tuntutbaki.bakipjm','tuntutbaki.bakiupah','tuntutbaki.recno','lelong.t_lelong','tuntutbaki.norujukan','customer.nama','customer.kpbaru','tuntutbaki.hargajual','tuntutbaki.jumlah','tuntutbaki.cajlelong','lelong.pinjaman')
->select('tuntutbaki.batchno','tuntutbaki.nowakil','tuntutbaki.tarikh','tuntutbaki.bakipjm','tuntutbaki.bakiupah','tuntutbaki.recno','lelong.t_lelong','tuntutbaki.norujukan','customer.nama','customer.kpbaru','tuntutbaki.hargajual','tuntutbaki.jumlah','tuntutbaki.cajlelong','lelong.pinjaman')
->where('lelong.norujukan','=',$norujukan)
->whereNotNull('lelong.trkhtuntut')
->leftJoin('tuntutbaki', 'tuntutbaki.norujukan', '=', 'lelong.norujukan')
@@ -511,4 +517,29 @@ class LelongController extends Controller
return response()->json($lelong,200);
}
public function checkSerahLelong(Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$lelong = Lelong::on($cawangan['mysql'])
->where('norujukan', '=', $request->norujukan)
->where('t_lelong', '=', $current->toDateString())
->first();
if($lelong)
{
if($lelong['lel1stop'] == 1)
{
return response(1);
}else{
return response(0);
}
}else{
return response(0);
}
}
}
app/Http/Controllers/PanjarController.php
-1
View File
@@ -154,7 +154,6 @@ class PanjarController extends Controller
if($kodcaw == 'APM')
{
$perubatan = $perubatan - 10;
$baikidanselenggara = $baikidanselenggara - 10;
}
$arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
app/Http/Controllers/TebusController.php
+53 -3
View File
@@ -506,7 +506,7 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tebus = Tebus::on($cawangan['mysql'])
->select('tebus.t_tebus', 'gad.t_gadai','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->join('online_arrahn.customer as cust', function($join)
{
@@ -541,7 +541,13 @@ class TebusController extends Controller
->where('t_tebus','=',$request->tarikh)
->whereNotNull('hargajualan');
$totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
$tebustawarruqansuran = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('t_tebus','=',$request->tarikh)
->whereNotNull('hargajualan')
->where('hargajualan','<>','bakihargajualan');
$totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
$bilpenebusantawarruq = $tebustawarruq->count();
$totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
$totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
@@ -615,6 +621,20 @@ class TebusController extends Controller
return response()->json($wakil,200);
}
public function FirstWakil($kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$wakil = Wakil::on($cawangan['mysql'])
->orderBy('nowakil','desc')
->first();
if($wakil['nowakil'])
return response($wakil['nowakil']);
else
return response(0);
}
public function getWakil($kodcaw,$icno){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -1041,7 +1061,6 @@ class TebusController extends Controller
$penghutangkaki = imbangdugalama::on($cawangan['mysql'])
->sum('penghutang');
return response()->json($penghutangkaki,200);
}
@@ -1211,4 +1230,35 @@ class TebusController extends Controller
return response($rebet);
}
public function getUpahLamaToday($kodcaw,$norujukan)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->where('tarikh','=',$current->toDateString())
->orderBy('tarikh','desc')
->get();
if(sizeof($listadvansur) > 0)
return response(1);
else
return response(0);
}
public function removeUpahLamaToday($kodcaw,$norujukan)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$removed = Advansur::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
if($removed)
return response(1);
else
return response(0);
}
}
app/Http/Controllers/TransactionController.php
+7
View File
@@ -96,4 +96,11 @@ class TransactionController extends Controller
return response()->json($transaction);
}
public function getTransactionByRujukanAll($norujukan){
$transaction = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->get();
return response()->json($transaction);
}
}
app/Http/Controllers/TunaiController.php
+38
View File
@@ -214,6 +214,17 @@ class TunaiController extends Controller
return response()->json($addtunai);
}
public function getAddTunaiDate($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$addtunai=AddTunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$request->tarikh]])->get();
return response()->json($addtunai);
}
public function getAddTunaibyKodlaluan($kodcaw,Request $request)
{
@@ -272,6 +283,20 @@ class TunaiController extends Controller
return response()->json($requestteller);
}
public function getRequestTellerLaporanSerahanBerkala($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$requestteller=RequestTeller::on('mysql7')
->where([['kodcaw','=',$kodcaw],['update','=',1],['serahan','>',0],['kodlaluan','=',$request->teller],['tarikh','=',$current->toDateString()]])
->orderBy('recno','desc')
->first();
return response()->json($requestteller);
}
public function getRequestTellerByDate($kodcaw,Request $request)
{
@@ -361,6 +386,19 @@ class TunaiController extends Controller
return response()->json($tunai);
}
public function GetTellerWork($kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$teller = Tunai::on($cawangan['mysql'])
->select('kodlaluan')
->whereRaw('LENGTH(kodlaluan) > 14')
->distinct()
->get();
return response()->json($teller);
}
}
app/Http/Controllers/VaultController.php
+1 -1
View File
@@ -395,7 +395,7 @@ class VaultController extends Controller
//Sebelum Tawarruq
if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915')
if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915' || $kodcaw == '020303')
{
$serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb)
routes/web.php
+13
View File
@@ -45,6 +45,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('customers/laporan/{kodcaw}/{tarikh}',['uses'=>'CustomerController@getLaporanCustomers']);
$router->get('customers/latest/{kodcaw}',['uses'=>'CustomerController@getLatestCustomer']);
$router->put('customers/information/update/admin', ['uses' => 'CustomerController@customerUpdateAdmin']);
$router->get('admin/customers/nokp/search',['uses'=>'CustomerController@showOneCustomerByICAdmin']);
$router->get('customer/blacklist',['uses'=>'CustomerController@blacklistCustomer']);
//Gadai API
$router->get('gadai',['uses'=>'GadaiController@showAllGadais']);
@@ -72,6 +74,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('check/serah/gadai',['uses'=>'GadaiController@checkSerahGadaian']);
$router->get('check/serah/tebus',['uses'=>'TebusController@checkSerahTebus']);
$router->get('check/serah/lelong',['uses'=>'LelongController@checkSerahLelong']);
$router->get('gadai/serah_marhun/khazanah/{kodcaw}',['uses'=>'GadaiController@serahMarhunKhazanah']);
$router->get('gadai/serah_marhun/khazanah/petibesi/{kodcaw}',['uses'=>'GadaiController@serahPetiBesi']);
@@ -182,7 +185,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('transaction/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan']);
$router->get('transaction/one/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanOne']);
$router->get('transaction/id/{id}',['uses'=>'TransactionController@getTransactionByid']);
$router->get('transaction/norujukan/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanAll']);
$router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']);
$router->get('transaksi_keuntungan/{norujukan}',['uses'=>'TransaksiKeuntunganController@getTransaksiKeuntunganByRujukan']);
@@ -221,6 +226,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('advansurdetailsrange/{kodcaw}',['uses'=>'TebusController@advansurdetailsRange']);
$router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
$router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);
$router->get('upahlamatoday/{kodcaw}/{norujukan}',['uses'=>'TebusController@getUpahLamaToday']);
$router->post('removeupahlamatoday/{kodcaw}/{norujukan}',['uses'=>'TebusController@removeUpahLamaToday']);
//POLIS API
$router->get('polis/get/',['uses'=>'PolisController@getPolis']);
@@ -260,6 +267,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('getPastTunai/{kodcaw}',['uses' =>'TunaiController@getTunaiPast']);
$router->get('GetLatestTunai/{kodcaw}',['uses' =>'TunaiController@getLatestTunai']);
$router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
$router->get('getAddTunaiDate/{kodcaw}/',['uses' =>'TunaiController@getAddTunaiDate']);
$router->get('getAddTunai/{kodcaw}/kodlaluan/',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
$router->get('getAddTunaiLatest/{kodcaw}',['uses' =>'TunaiController@getAddTunaibyKodlaluanLatest']);
$router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
@@ -301,6 +309,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']);
$router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);
$router->get('requestTeller/getlaporan/{kodcaw}',['uses' => 'TunaiController@getRequestTellerLaporanSerahan']);
$router->get('requestTeller/getlaporanberkala/{kodcaw}',['uses' => 'TunaiController@getRequestTellerLaporanSerahanBerkala']);
$router->get('requestTeller/get/{kodcaw}/date',['uses' => 'TunaiController@getRequestTellerByDate']);
$router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
$router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']);
@@ -315,6 +324,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//API WAKIL
$router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
$router->get('firstwakil/{kodcaw}',['uses' => 'TebusController@FirstWakil']);
$router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);
$router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']);
$router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']);
@@ -385,6 +395,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
//NAMA PENGGUNA TAMBAH KODLALUAN
$router->get('get/pengguna/{kodcaw}',['uses'=>'TransactionController@GetPengguna']);
//NAMA SETIAP TELLER DALAM TUNAI
$router->get('get/tellerwork/{kodcaw}',['uses'=>'TunaiController@GetTellerWork']);
//IMBANG DUGA//
//Dua-Dua Table