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

Merge branch 'hafiza-ali'

Browse Source
This commit is contained in:
afiq
2021-02-03 12:20:30 +08:00
parent 578e55263e ad95a84593
commit a7174d173f
8 changed files with 254 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/BankMaster.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class BankMaster extends Model
{
protected $connection = 'mysql7';
protected $table = 'bank';
protected $primaryKey = 'BANKCODE';
/**
* The attributes that are mass assignable.
*
* @var array
*/
// protected $fillable = [
// ];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
app/Customer.php
+43
View File
@@ -3,9 +3,11 @@
namespace App;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder;
class Customer extends Model
{
protected $table = 'customer';
public $timestamps = false;
/**
@@ -13,6 +15,8 @@ class Customer extends Model
*
* @var array
*/
protected $primaryKey = ['kplama','kpbaru'];
public $incrementing = false;
protected $fillable = [
'ahli',
'kodcaw',
@@ -65,4 +69,43 @@ class Customer extends Model
* @var array
*/
// protected $hidden = [];
/**
* Set the keys for a save update query.
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
protected function setKeysForSaveQuery(Builder $query)
{
$keys = $this->getKeyName();
if(!is_array($keys)){
return parent::setKeysForSaveQuery($query);
}
foreach($keys as $keyName){
$query->where($keyName, '=', $this->getKeyForSaveQuery($keyName));
}
return $query;
}
/**
* Get the primary key value for a save query.
*
* @param mixed $keyName
* @return mixed
*/
protected function getKeyForSaveQuery($keyName = null)
{
if(is_null($keyName)){
$keyName = $this->getKeyName();
}
if (isset($this->original[$keyName])) {
return $this->original[$keyName];
}
return $this->getAttribute($keyName);
}
}
app/GlDetail.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace App;
use Illuminate\Database\Eloquent\Model;
class AnsRugi extends Model
class GlDetail extends Model
{
protected $table = 'gldetail';
public $timestamps = false;
app/Http/Controllers/CustomerController.php
+110 -1
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\BankMaster;
use App\Customer;
use App\Gadai;
use App\Lelong;
@@ -217,6 +218,8 @@ class CustomerController extends Controller
array_push($sttebus_, array(
'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
));
@@ -226,6 +229,8 @@ class CustomerController extends Controller
{
array_push($sttebus_T, array(
'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
));
@@ -235,6 +240,8 @@ class CustomerController extends Controller
{
array_push($sttebus_L, array(
'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
));
@@ -418,4 +425,106 @@ class CustomerController extends Controller
return response('Deleted Successfully', 200);
}
}
public function akaunBankMobile($nokp)
{
$array_cust = [];
$cawangan_all = Cawangan::on('mysql7')->get();
foreach($cawangan_all as $cawangan)
{
$customer = Customer::on($cawangan['mysql'])
->where('kplama','=',$nokp)
->orWhere('kpbaru','=',$nokp)
->rightJoin('online_arrahn.bank', 'bank.id', '=', 'customer.kodbank')
->first();
if(!empty($customer))
{
$customer_detail['noakaun'] = $customer['noakaun'];
$customer_detail['namabank'] = $customer['name'];
$customer_detail['kodbank'] = $customer['id'];
return response()->json($customer_detail);
}
else
{
return $array_cust;
}
}
}
public function bankListMobile()
{
$bank_array = [];
$cawangan_all = Cawangan::on('mysql7')->get();
foreach($cawangan_all as $cawangan)
{
$bank = BankMaster::get();
if(!empty($bank))
{
//loop each array
foreach($bank as $banklist)
{
array_push($bank_array, array(
'kodbank' => $banklist->id,
'namabank' => $banklist->name,
));
}
return response()->json($bank_array);
}
else
{
return response()->json('Data Not Found');
}
}
}
public function insertAkaunBankMobile(Request $request)
{
$cawangan_all = Cawangan::on('mysql7')->get();
foreach($cawangan_all as $index=>$cawangan)
{
$customer = Customer::on($cawangan['mysql'])
->where('kplama','=',$request->nokp)
->orWhere('kpbaru','=',$request->nokp)
->first();
if(!empty($customer))
{
$customer->kodbank = $request->kodbank;
$customer->noakaun = $request->noakaun;
$customer->save();
}
}
return response()->json($customer, 200);
}
public function jumlahPembiayaanMobile($nokp){
$cawangan_all = Cawangan::on('mysql7')->get();
$jumlahPembiayaan = 0;
foreach($cawangan_all as $index=>$cawangan){
$gadai = Gadai::on($cawangan['mysql'])->where([['nokp','=',$nokp],['sttebus','=','']])->sum('pinjaman');
$jumlahPembiayaan += $gadai;
}
return response()->json(number_format($jumlahPembiayaan,2));
}
public function jumlahBakiLelongMobile($nokp){
$cawangan_all = Cawangan::on('mysql7')->get();
$jumlahBakiLelong = 0;
foreach($cawangan_all as $index=>$cawangan){
$bakilelong = Gadai::on($cawangan['mysql'])
->where('nokp','=',$nokp)
->where('sttebus','=','L')
->where('baki', 'not like', '-%')
->where('tagtbaki','=','1')
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->sum('baki');
$jumlahBakiLelong += $bakilelong;
}
return response()->json(number_format($jumlahBakiLelong,2));
}
}
app/Http/Controllers/TunaiController.php
+26 -8
View File
@@ -132,7 +132,7 @@ class TunaiController extends Controller
}
public function getCurrentTunai($kodcaw,$kodlaluan)
public function getCurrentTunai($kodcaw,Request $request)
{
$current = Carbon::now();
@@ -141,7 +141,7 @@ class TunaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tunai=Tunai::on($cawangan['mysql'])
->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$kodlaluan]])
->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
->orderBy('tarikh','desc')
->first();
return response()->json($tunai);
@@ -205,16 +205,16 @@ class TunaiController extends Controller
return response()->json($requestteller);
}
public function updateRequestTeller($kodcaw,$kodlaluan,Request $request)
public function updateRequestTeller($kodcaw,Request $request)
{
$requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$kodlaluan],['update','=',0]])->update(array(
$requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array(
'update' => 1
) );
}
public function createRequestTeller($kodcaw,$kodlaluan,Request $request)
public function createRequestTeller($kodcaw,Request $request)
{
$current = Carbon::now();
@@ -224,9 +224,27 @@ class TunaiController extends Controller
'tarikh' => $current->toDateString(),
'kodcaw' => $kodcaw,
'kodlaluan'=> $kodlaluan,
'modal'=>$request->modal,
'serahan'=>$request->serahan,
'kodlaluan' => $request->kodlaluan,
'modal' => $request->modal,
'serahan' => $request->serahan,
'bd1' => $request->bd1,
'bd5' => $request->bd5,
'bd10' => $request->bd10,
'bd20' => $request->bd20,
'bd50' => $request->bd50,
'bd100' => $request->bd100,
'txtring1' => $request->txtring1,
'txtring5' => $request->txtring5,
'txtring10' => $request->txtring10,
'txtring20' => $request->txtring20,
'txtring50' => $request->txtring50,
'txtring100' => $request->txtring100,
'txtring1000' => $request->txtring1000,
'txtsen1' => $request->txtsen1,
'txtsen5' => $request->txtsen5,
'txtsen10' => $request->txtsen10,
'txtsen20' => $request->txtsen20,
'txtsen50' => $request->txtsen50,
'update' => '0'
]);
app/Http/Controllers/VaultController.php
+28
View File
@@ -5,6 +5,7 @@ use App\Vault;
use App\Cawangan;
use App\Tunai;
use App\AddTunai;
use App\GlDetail;
use Illuminate\Http\Request;
use Carbon\Carbon;
@@ -92,4 +93,31 @@ class VaultController extends Controller
return response()->json($vaultcreate,201);
}
//GLDETAIL ONLINE
public function creategldetailonline($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gldetail=GlDetail::on($cawangan['mysql'])->create([
'kodcaw' => $request->kodcaw,
'tarikh' => $current->toDateString(),
'dtacct' => '1000/020',
'ktacct' => '1000/010',
'descpt' => 'SERAHAN BAYAR ONLINE',
'acttype' => 'A',
'fracttype' => 'A',
'amaun' => $request->amaun,
'teller' => 'ONLINE',
'terima' => '*'
]);
return response()->json($gldetail,201);
}
}
app/RequestTeller.php
+2 -1
View File
@@ -13,7 +13,8 @@ class RequestTeller extends Model
*
* @var array
*/
protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','kodcaw'];
protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','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.
routes/web.php
+15 -7
View File
@@ -190,13 +190,14 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
$router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
$router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']);
$router->get('GetCurrentTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getCurrentTunai']);
$router->get('GetCurrentTunai/{kodcaw}',['uses' =>'TunaiController@getCurrentTunai']);
$router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
$router->get('getAddTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
$router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
$router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']);
$router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit
$router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit
$router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); //Gldetail Online
//API PANJAR KHAZANAH
@@ -220,9 +221,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']);
//API REQUEST TELLER
$router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']);
$router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']);
$router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);
$router->put('requestTeller/update/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@updateRequestTeller']);
$router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
//API WAKIL
$router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
@@ -262,25 +263,32 @@ $router->group(['prefix'=>'e-arrahn'], function () use ($router){
$router->group(['prefix'=>'mobile'], function () use ($router){
$router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByICMobile']);
$router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
//utama
$router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']);
$router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']);
$router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']);
$router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']);
$router->get('akaun-bank/{nokp}',['uses'=>'CustomerController@akaunBankMobile']);
$router->get('bank-listing',['uses'=>'CustomerController@bankListMobile']);
$router->post('insert/akaun-bank',['uses'=>'CustomerController@insertAkaunBankMobile']);
$router->get('gadai/norujukan/jumlahPembiayaan/{nokp}',['uses'=>'CustomerController@jumlahPembiayaanMobile']);
$router->get('gadai/norujukan/jumlahBakiLelong/{nokp}',['uses'=>'CustomerController@jumlahBakiLelongMobile']);
//gadaian
$router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);
$router->get('customers/{ic}/gadaitebuslelong/{kodcaw}',['uses'=>'CustomerController@gadaiTebusLelongByCawanganMobile']);
$router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
$router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
//profile
$router->post('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
//register
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
$router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
$router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
$router->post('send-email', ['uses' => 'CustomerController@sendEmail']);
});