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 into apiaku

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-08-08 10:45:51 +08:00
parent 96a0246552 2d5a62cb1c
commit 224fc469cb
7 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+10 -4
View File
@@ -529,11 +529,17 @@ class GadaiController extends Controller
public function barcodeScan($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'semakbarcode'=>'Lulus'
));
$dahscan = Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['semakbarcode','Lulus']])->first();
return response()->json($gadai,200);
if($dahscan){
return response()->json('scanned');
}else{
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update([
'semakbarcode'=>'Lulus'
]);
return response()->json('success');
}
}
public function checkSerahGadaian(Request $request){
app/Http/Controllers/LaporanController.php
+2 -2
View File
@@ -58,7 +58,7 @@ class LaporanController extends Controller
//b
$bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count();
$bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->where('pinjaman','>',0)->count();
$bilangan_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->count();
$bilangan_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->count();
$bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','=',$request->tarikh],['kodcaw',$request->kodcaw]])->count();
@@ -256,7 +256,7 @@ class LaporanController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$laporan_terkumpul = [];
$gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir]]);
$gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir]])->where('pinjaman','>',0);
$tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
$ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
app/Http/Controllers/LelongController.php
+13 -13
View File
@@ -249,12 +249,12 @@ class LelongController extends Controller
}
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
// ->where(function($query) use ($tarikhbaru){
// $query->whereNull('trkhtuntut')
// ->orWhere('trkhtuntut','>',$tarikhbaru);
// })
->where('baki','>=',0)
->sum('baki');
}
@@ -263,13 +263,13 @@ class LelongController extends Controller
->sum('bayaran');
$rugilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru)
{
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
//->where(function($query) use ($tarikhbaru)
//{
// $query->whereNull('t_jual')
// ->orWhere('t_jual','>',$tarikhbaru);
//})
->where('baki','<',0)
->sum('baki');
app/Http/Controllers/PanjarController.php
-7
View File
@@ -195,13 +195,6 @@ class PanjarController extends Controller
->sum('bayaran');
if($kodcaw == 'APM')
{
$perubatan = $perubatan - 10;
$baikidanselenggara = $baikidanselenggara - 10;
}
$arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
return response()->json($arraycalculation);
app/Http/Controllers/TebusController.php
+10 -3
View File
@@ -580,10 +580,17 @@ class TebusController extends Controller
public function tagterimaupdate($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$dahscan = Tebus::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['tagterima',1]])->first();
$update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'tagterima' => 1
));
if($dahscan){
return response()->json('scanned');
}else{
$update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'tagterima' => 1
));
return response()->json('success');
}
}
public function checkSerahTebus(Request $request){
app/Http/Controllers/TransactionOnlineController.php
+1 -1
View File
@@ -75,7 +75,7 @@ class TransactionOnlineController extends Controller
GlDetail::on($cawangan['mysql'])->create([
'kodcaw' => $transaction['kodcaw'],
'tarikh' => $current->toDateString(),
'tarikh' => Carbon::parse($transaction['paid_at'])->format('Y-m-d'),
'dtacct' => '1000/010',
'ktacct' => '1000/020',
'descpt' => 'SERAHAN BAYAR ONLINE - ' . $transaction['norujukan'],
config/database.php
-33
View File
@@ -16,7 +16,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql2' => [
'driver' => 'mysql',
@@ -29,7 +28,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql3' => [
'driver' => 'mysql',
@@ -42,7 +40,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql4' => [
'driver' => 'mysql',
@@ -55,7 +52,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql5' => [
'driver' => 'mysql',
@@ -68,7 +64,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
@@ -83,7 +78,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
@@ -98,7 +92,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql8' => [
'driver' => 'mysql',
@@ -111,7 +104,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql9' => [
@@ -125,7 +117,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql10' => [
'driver' => 'mysql',
@@ -138,7 +129,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql11' => [
'driver' => 'mysql',
@@ -151,7 +141,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql12' => [
@@ -165,7 +154,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql13' => [
'driver' => 'mysql',
@@ -178,7 +166,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql14' => [
'driver' => 'mysql',
@@ -191,7 +178,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql15' => [
@@ -205,7 +191,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql16' => [
'driver' => 'mysql',
@@ -218,7 +203,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql17' => [
@@ -232,7 +216,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql18' => [
'driver' => 'mysql',
@@ -245,7 +228,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql19' => [
'driver' => 'mysql',
@@ -258,7 +240,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql20' => [
'driver' => 'mysql',
@@ -271,7 +252,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql21' => [
'driver' => 'mysql',
@@ -284,7 +264,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql22' => [
@@ -298,7 +277,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql23' => [
'driver' => 'mysql',
@@ -311,7 +289,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql24' => [
@@ -325,7 +302,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql25' => [
@@ -339,7 +315,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql26' => [
'driver' => 'mysql',
@@ -352,7 +327,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql27' => [
'driver' => 'mysql',
@@ -365,7 +339,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql28' => [
@@ -379,7 +352,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql29' => [
'driver' => 'mysql',
@@ -392,7 +364,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql30' => [
'driver' => 'mysql',
@@ -405,7 +376,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql31' => [
'driver' => 'mysql',
@@ -418,7 +388,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql32' => [
'driver' => 'mysql',
@@ -431,7 +400,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql33' => [
'driver' => 'mysql',
@@ -444,7 +412,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
],
];