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

merge

Browse Source
This commit is contained in:
Afiq Zakwan Hamdan
2021-04-20 14:11:23 +08:00
parent 101a52b525 95a51fbd21
commit eda96aca11
8 changed files with 239 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+13 -11
View File
@@ -1962,16 +1962,16 @@ class GadaiController extends Controller
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
->sum('pinjaman');
$gadaibaru = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
// $gadaibaru = Gadai::on($cawangan['mysql'])
// ->where('tagpalsu','=',0)
// ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
// ->sum('pinjaman');
$rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
// $rekod_pinjamandiberi;
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
@@ -1985,10 +1985,12 @@ class GadaiController extends Controller
if($request->tarikh > '2021-04-13'){
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
// ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
->where('tagpalsu','=',0)
// ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
->sum('pinjaman');
}
return response()->json($rekod_pinjamandiberi);
app/Http/Controllers/TebusController.php
+44
View File
@@ -467,6 +467,19 @@ class TebusController extends Controller
return response()->json($wakil_create ,201);
}
public function UbahWakil($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$wakil = $request->nowakil;
$update_wakil = Tebus::on($cawangan['mysql'])->where('norujukan','=',$request->norujukan)->update(array(
"nowakil" => $wakil
));
return response()->json($update_wakil ,201);
}
public function listhistorypenebusan($kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -488,6 +501,37 @@ class TebusController extends Controller
return response()->json($listadvansur,200);
}
public function SenaraiAdvansur($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('teller','=',$request->kodlaluan)
->where('tarikh','=',$current->toDateString())
->orderBy('tarikh','desc')
->get();
return response()->json($listadvansur,200);
}
public function getAdvansurByKodlaluan($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql'])
->where('teller','=',$request->kodlaluan)
->where('tarikh','=',$current->toDateString())
->sum('upahdibayar');
return response()->json($listadvansur,200);
}
public function createAdvansur($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
app/Http/Controllers/TransactionController.php
+14
View File
@@ -3,6 +3,9 @@
namespace App\Http\Controllers;
use App\Transaction;
use App\Pengguna;
use App\Cawangan;
use Illuminate\Http\Request;
use Carbon\Carbon;
@@ -68,4 +71,15 @@ class TransactionController extends Controller
return response()->json($transaction);
}
public function GetPengguna($kodcaw,Request $request)
{
$namateller = $request->namateller;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$pengguna=Pengguna::on($cawangan['mysql'])
->where('nama','=',$namateller)->limit(1)->get();
return response()->json($pengguna);
}
}
app/Http/Controllers/TransaksiKeuntunganController.php
+3 -1
View File
@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
use App\TransaksiKeuntungan;
use Illuminate\Http\Request;
use Carbon\Carbon;
use DB;
class TransaksiKeuntunganController extends Controller
{
@@ -33,7 +35,7 @@ class TransaksiKeuntunganController extends Controller
public function createTransaksiKeuntungan(Request $request){
$transaksi = TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $request->norujukan,
'bayaran_keuntungan' => $request->bayaran_keuntungan,
'bayaran_keuntungan' =>$request->bayaran_keuntungan,
'tarikh_bayaran'=> $request->tarikh_bayaran,
'tempoh'=> $request->tempoh,
'kodcaw'=> $request->kodcaw
app/Pengguna.php
+54
View File
@@ -0,0 +1,54 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Pengguna extends Model
{
protected $table = 'pengguna';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'kodcaw',
'kodlaluan',
'katalaluan',
'taraf',
'nama',
'kplama',
'kpbaru',
'pinjmax',
'limittunait',
'limittunaip',
'status',
't_luput',
'flag',
'created_by',
'last_modified_by',
't_daftar',
'date_created',
'pinjmaxxtra',
'pengganti',
'khazanahtemp',
'ppo',
'settingtetap',
'autoberat',
'perubatan',
'tagperubatan',
'pptetap',
'kktetap',
'mmtetap',
'tellertetap'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
composer.lock
Generated
+96 -1106
View File
File diff suppressed because it is too large Load Diff
config/database.php
+3 -10
View File
@@ -17,7 +17,6 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql2' => [
'driver' => 'mysql',
'host' => env('DB_HOST_2'),
@@ -30,7 +29,6 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql3' => [
'driver' => 'mysql',
'host' => env('DB_HOST_3'),
@@ -42,9 +40,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql4' => [
'driver' => 'mysql',
'host' => env('DB_HOST_4'),
@@ -57,7 +53,6 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql5' => [
'driver' => 'mysql',
'host' => env('DB_HOST_5'),
@@ -96,7 +91,6 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql8' => [
'driver' => 'mysql',
'host' => env('DB_HOST_8'),
@@ -112,7 +106,7 @@ return [
'mysql9' => [
'driver' => 'mysql',
'host' => env('DB_HOST_9'),
'port' => env('DB_PORT'),
'port' => env('DB_PORT_9'),
'database' => env('DB_DATABASE_9'),
'username' => env('DB_USERNAME_9'),
'password' => env('DB_PASSWORD_9'),
@@ -121,7 +115,6 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql10' => [
'driver' => 'mysql',
'host' => env('DB_HOST_10'),
@@ -134,7 +127,6 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql11' => [
'driver' => 'mysql',
'host' => env('DB_HOST_11'),
@@ -412,4 +404,5 @@ return [
'strict' => false,
],
],
];
];
routes/web.php
+12 -3
View File
@@ -164,6 +164,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']);
$router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); // new added 20210413
$router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); // new added 20210413
//OTP API
$router->post('otp/generateotp/{nokp}',['uses'=>'OtpController@createOtp']);
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
@@ -177,9 +181,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']);
//ANSURAN API
//ANSURAN UPAH API
$router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
$router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
$router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
$router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
$router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
$router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
//LAPORAN API
@@ -255,7 +261,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
$router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);
$router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']);
$router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']);
$router->post('createwakil/{kodcaw}/{icno}',['uses' => 'TebusController@createWakil']);
//update tagterima Tebus
@@ -320,6 +326,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']); //transaction kira sum all bayaran online cawangan
//NAMA PENGGUNA TAMBAH KODLALUAN
$router->get('get/pengguna/{kodcaw}',['uses'=>'TransactionController@GetPengguna']);
//IMBANG DUGA//
//Dua-Dua Table