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

fix skit2

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-04-11 17:36:00 +08:00
parent b6c43f480d
commit 73d7587ce4
4 changed files with 1684 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.DS_Store
Vendored
BIN
View File
Binary file not shown.
app/Http/Controllers/TebusController.php
+13 -10
View File
@@ -17,6 +17,7 @@ use App\Lelong;
use App\HapusKira;
use App\Parameter;
use App\Panjar;
use App\HargaEmas;
use Illuminate\Http\Request;
@@ -76,13 +77,12 @@ class TebusController extends Controller
->where('norujukan','=',$norujukan)
->first();
// $totalnmhargasemasa = $request->tnmhargasemasa;
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
$array_recno_marhun = $request->array_recno;
$margin_pembiayaan = round(($gadai_data['bakipjm']/$gadai_data['nilaimarhun'])*100,2);
// $margin_pembiayaan = round(($gadai_data['bakipjm']/$request->hargasemasa)*100,2);
$nilai_marhun = $gadai_data['nilaimarhun'];
$total_harga_tebus = 0;
@@ -217,11 +217,13 @@ class TebusController extends Controller
$rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
$rebet_round = number_format($rebet_raw,2);
if(strpos($rebet_round,',')){
$rebet_round = str_replace(',','',$rebet_round);
}
$rebet = (float)substr($rebet_round, 0, -1);
$rebet = (float)substr($rebet_round, 0, -1);
return $rebet;
}
@@ -496,12 +498,12 @@ class TebusController extends Controller
$keuntungansebelumtawarruq = 0;
$keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->where('t_tebus','>=','2021-03-14')
->whereYear('t_tebus','=',$current->year)
->whereNotNull('rebate')
->sum('rebate');
// $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh)
// ->where('t_tebus','>=','2021-03-14')
// ->whereYear('t_tebus','=',$current->year)
// ->whereNotNull('rebate')
// ->sum('rebate');
$keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
@@ -528,7 +530,8 @@ class TebusController extends Controller
$keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
$keuntunganselepastawarruq = $keuntunganselepastawarruqrebate + $keuntunganselepastawarruqupah;
$keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
$total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
composer.lock
Generated
+1655 -785
View File
File diff suppressed because it is too large Load Diff
config/database.php
+16 -12
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' => [
@@ -29,6 +30,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql3' => [
@@ -42,6 +44,8 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql4' => [
@@ -55,6 +59,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql5' => [
@@ -68,6 +73,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql6' => [
@@ -81,6 +87,7 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql7' => [
@@ -94,19 +101,9 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql8' => [
'driver' => 'mysql',
'host' => env('DB_HOST_8'),
'port' => env('DB_PORT'),
'database' => env('DB_DATABASE_8'),
'username' => env('DB_USERNAME_8'),
'password' => env('DB_PASSWORD_8'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql9' => [
'driver' => 'mysql',
'host' => env('DB_HOST_9'),
@@ -118,7 +115,9 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql10' => [
'driver' => 'mysql',
'host' => env('DB_HOST_10'),
@@ -130,7 +129,9 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
'mysql11' => [
'driver' => 'mysql',
'host' => env('DB_HOST_11'),
@@ -142,6 +143,9 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'),
],
],
];