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

server

Browse Source
This commit is contained in:
e.arrahn
2021-07-15 16:27:51 +08:00
parent 050b79f9ca fe6616418f
commit 7d4562c628
7 changed files with 57 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+24 -3
View File
@@ -921,7 +921,6 @@ class GadaiController extends Controller
$dateans = new Carbon($request->tarikh);
$ansuran = Transaction::on('mysql7')
->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller')
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -2525,7 +2524,7 @@ class GadaiController extends Controller
$gadai = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$tarikhtawarruq]])
->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]])
->sum('pinjaman');
@@ -2572,7 +2571,6 @@ class GadaiController extends Controller
->where('gadai.tagpalsu','=',0)
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gadai.sttebus','=','T'],['gadai.hargajualan','<>','NULL']])
->sum('teb.pinjaman');
$rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
@@ -2690,6 +2688,29 @@ class GadaiController extends Controller
return response($transaksi);
}
public function LaporanAuditAktif($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$datetawarruq = new Carbon('2021-04-14');
$datemula = new Carbon($request->mula);
$datemula->addDays(1);
$datehingga = new Carbon($request->hingga);
$datehingga->addDays(1);
$current = Carbon::now();
$current = new Carbon();
$transaksi = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->sum('bayaran_pembiayaan');
return response($transaksi);
}
public function LaporanAuditAktif($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
config/database.php
+33
View File
@@ -16,6 +16,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql2' => [
'driver' => 'mysql',
@@ -28,6 +29,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql3' => [
'driver' => 'mysql',
@@ -40,6 +42,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql4' => [
'driver' => 'mysql',
@@ -52,6 +55,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql5' => [
'driver' => 'mysql',
@@ -64,6 +68,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
@@ -78,6 +83,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
@@ -92,6 +98,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql8' => [
'driver' => 'mysql',
@@ -104,6 +111,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql9' => [
@@ -117,6 +125,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql10' => [
'driver' => 'mysql',
@@ -129,6 +138,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql11' => [
'driver' => 'mysql',
@@ -141,6 +151,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql12' => [
@@ -154,6 +165,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql13' => [
'driver' => 'mysql',
@@ -166,6 +178,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql14' => [
'driver' => 'mysql',
@@ -178,6 +191,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql15' => [
@@ -191,6 +205,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql16' => [
'driver' => 'mysql',
@@ -203,6 +218,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql17' => [
@@ -216,6 +232,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql18' => [
'driver' => 'mysql',
@@ -228,6 +245,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql19' => [
'driver' => 'mysql',
@@ -240,6 +258,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql20' => [
'driver' => 'mysql',
@@ -252,6 +271,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql21' => [
'driver' => 'mysql',
@@ -264,6 +284,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql22' => [
@@ -277,6 +298,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql23' => [
'driver' => 'mysql',
@@ -289,6 +311,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql24' => [
@@ -302,6 +325,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql25' => [
@@ -315,6 +339,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql26' => [
'driver' => 'mysql',
@@ -327,6 +352,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql27' => [
'driver' => 'mysql',
@@ -339,6 +365,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql28' => [
@@ -352,6 +379,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql29' => [
'driver' => 'mysql',
@@ -364,6 +392,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql30' => [
'driver' => 'mysql',
@@ -376,6 +405,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql31' => [
'driver' => 'mysql',
@@ -388,6 +418,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql32' => [
'driver' => 'mysql',
@@ -400,6 +431,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql33' => [
'driver' => 'mysql',
@@ -412,6 +444,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
],
];
storage/app/.gitignore
Executable → Regular
View File
storage/framework/cache/.gitignore
Executable → Regular
View File
storage/framework/cache/data/.gitignore
Executable → Regular
View File
storage/framework/views/.gitignore
Executable → Regular
View File
storage/logs/.gitignore
Executable → Regular
View File