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

fix last keuntungan_rebet

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-04-22 14:36:57 +08:00
parent 045b984a08
commit e4bb2b1fb6
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
-5
View File
@@ -736,9 +736,6 @@ class TebusController extends Controller
$dateSM = new Carbon('2021-04-21'); $dateSM = new Carbon('2021-04-21');
$dateSM->addDays(1); $dateSM->addDays(1);
$dateRM = new Carbon('2021-04-22');
$dateRM->addDays(1);
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
@@ -754,12 +751,10 @@ class TebusController extends Controller
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $dateRM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet'); ->sum('keuntungan_rebet');
$total = $keuntungan + $keuntunganreducing; $total = $keuntungan + $keuntunganreducing;
return response($total); return response($total);
config/database.php
+33
View File
@@ -16,6 +16,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql2' => [ 'mysql2' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -28,6 +29,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql3' => [ 'mysql3' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -40,6 +42,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql4' => [ 'mysql4' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -52,6 +55,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql5' => [ 'mysql5' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -64,6 +68,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql6' => [ 'mysql6' => [
@@ -77,6 +82,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql7' => [ 'mysql7' => [
@@ -90,6 +96,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql8' => [ 'mysql8' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -102,6 +109,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql9' => [ 'mysql9' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -114,6 +122,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql10' => [ 'mysql10' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -126,6 +135,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql11' => [ 'mysql11' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -138,6 +148,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql12' => [ 'mysql12' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -150,6 +161,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql13' => [ 'mysql13' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -162,6 +174,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql14' => [ 'mysql14' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -174,6 +187,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql15' => [ 'mysql15' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -186,6 +200,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql16' => [ 'mysql16' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -198,6 +213,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql17' => [ 'mysql17' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -210,6 +226,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql18' => [ 'mysql18' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -222,6 +239,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql19' => [ 'mysql19' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -234,6 +252,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql20' => [ 'mysql20' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -246,6 +265,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql21' => [ 'mysql21' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -258,6 +278,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql22' => [ 'mysql22' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -270,6 +291,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql23' => [ 'mysql23' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -282,6 +304,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql24' => [ 'mysql24' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -294,6 +317,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql25' => [ 'mysql25' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -306,6 +330,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql26' => [ 'mysql26' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -318,6 +343,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql27' => [ 'mysql27' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -330,6 +356,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql28' => [ 'mysql28' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -342,6 +369,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql29' => [ 'mysql29' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -354,6 +382,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql30' => [ 'mysql30' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -366,6 +395,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql31' => [ 'mysql31' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -378,6 +408,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql32' => [ 'mysql32' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -390,6 +421,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
'mysql33' => [ 'mysql33' => [
'driver' => 'mysql', 'driver' => 'mysql',
@@ -402,6 +434,7 @@ return [
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
], ],
], ],
]; ];