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

Add krk changes to prod

Browse Source
This commit is contained in:
Afiq Hamzah
2026-01-19 16:41:10 +08:00
parent eae7a0e91a
commit 0ac42331d4
7 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+2 -2
View File
@@ -4050,11 +4050,11 @@ class AdminPageController extends Controller
'tarikh' => $request->tarikh, 'tarikh' => $request->tarikh,
'kodcaw' => $kodcaw, 'kodcaw' => $kodcaw,
]); ]);
$exception_case = $this->AkruKeuntunganSebenar($requestData); $exception_case = $this->AkruKeuntunganSebenar($requestData)->getData();
} }
$backdate_keun_sebenar += isset($get_imbangduga['keun_sebenar']) ? $get_imbangduga['keun_sebenar'] : 0; $backdate_keun_sebenar += isset($get_imbangduga['keun_sebenar']) ? $get_imbangduga['keun_sebenar'] : 0;
$backdate_keun_sebenar += $exception_case; $backdate_keun_sebenar += (float) ($exception_case ?? 0);
$recentDate->subYear()->startOfYear(); $recentDate->subYear()->startOfYear();
} }
app/Http/Controllers/MarhunController.php
+2 -2
View File
@@ -203,7 +203,7 @@ class MarhunController extends Controller
$marhun = Marhun::on($cawangan['mysql']) $marhun = Marhun::on($cawangan['mysql'])
->select('marhun.norujukan','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai','marhun.tag_permata', 'marhun.berat_batu_permata') ->select('marhun.norujukan','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai','marhun.tag_permata', 'marhun.berat_batu_permata')
->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan') ->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan')
->rightJoin('online_arrahn.customer as customer', 'customer.kpbaru','=','gadai.nokp') ->rightJoin('master_krk.customer as customer', 'customer.kpbaru','=','gadai.nokp')
->where('marhun.t_gadai','=',$tarikh) ->where('marhun.t_gadai','=',$tarikh)
->orderBy('marhun.t_gadai') ->orderBy('marhun.t_gadai')
->get(); ->get();
@@ -221,7 +221,7 @@ class MarhunController extends Controller
$marhun = Marhun::on($cawangan['mysql']) $marhun = Marhun::on($cawangan['mysql'])
->select('marhun.norujukan','gadai.sttebus','gadai.pinjaman','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai') ->select('marhun.norujukan','gadai.sttebus','gadai.pinjaman','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai')
->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan') ->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan')
->rightJoin('online_arrahn.customer as customer', 'customer.kpbaru','=','gadai.nokp') ->rightJoin('master_krk.customer as customer', 'customer.kpbaru','=','gadai.nokp')
->where('marhun.t_gadai','<=',$tarikh) ->where('marhun.t_gadai','<=',$tarikh)
->whereYear('marhun.t_gadai','=',$current->year) ->whereYear('marhun.t_gadai','=',$current->year)
->where('gadai.sttebus','=','') ->where('gadai.sttebus','=','')
app/Services/Reports/ImbangDugaService.php
+2 -1
View File
@@ -377,7 +377,8 @@ class ImbangDugaService
return $transaction->trans_type !== 'A'; return $transaction->trans_type !== 'A';
})->sum('keuntungan_rebet'); })->sum('keuntungan_rebet');
$total = $total_ansuran + $total_tebus + $get_imbangduga['keun_sebenar']; $backdate_keun_sebenar = isset($get_imbangduga['keun_sebenar']) ? $get_imbangduga['keun_sebenar'] : 0;
$total = $total_ansuran + $total_tebus + $backdate_keun_sebenar;
return $total; return $total;
} }
app/Services/Reports/RingkasanHarianService.php
+1 -1
View File
@@ -1322,7 +1322,7 @@ class RingkasanHarianService
return floatval($totalSerahan); return floatval($totalSerahan);
} }
return floatval(0); return floatval($serahanpkbTawarruq);
} }
composer.json
+1 -1
View File
@@ -9,7 +9,7 @@
"auth0/auth0-php": "^7.4", "auth0/auth0-php": "^7.4",
"doctrine/dbal": "2.13.5", "doctrine/dbal": "2.13.5",
"laravel/lumen-framework": "^7.0", "laravel/lumen-framework": "^7.0",
"laravel/tinker": "^2.8", "laravel/tinker": "^2.9",
"rap2hpoutre/laravel-log-viewer": "^1.7", "rap2hpoutre/laravel-log-viewer": "^1.7",
"spatie/laravel-ray": "^1.33" "spatie/laravel-ray": "^1.33"
}, },
composer.lock
Generated
+14 -17
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2a35e67752107934701ceea957a4fd34", "content-hash": "fd818732ff1c4578859e2cd033cf5114",
"packages": [ "packages": [
{ {
"name": "auth0/auth0-php", "name": "auth0/auth0-php",
@@ -2541,25 +2541,25 @@
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
"version": "v2.8.2", "version": "v2.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/tinker.git", "url": "https://github.com/laravel/tinker.git",
"reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3" "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/b936d415b252b499e8c3b1f795cd4fc20f57e1f3", "url": "https://api.github.com/repos/laravel/tinker/zipball/502e0fe3f0415d06d5db1f83a472f0f3b754bafe",
"reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3", "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0", "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0", "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"php": "^7.2.5|^8.0", "php": "^7.2.5|^8.0",
"psy/psysh": "^0.10.4|^0.11.1", "psy/psysh": "^0.11.1|^0.12.0",
"symfony/var-dumper": "^4.3.4|^5.0|^6.0" "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "~1.3.3|^1.4.2", "mockery/mockery": "~1.3.3|^1.4.2",
@@ -2567,13 +2567,10 @@
"phpunit/phpunit": "^8.5.8|^9.3.3" "phpunit/phpunit": "^8.5.8|^9.3.3"
}, },
"suggest": { "suggest": {
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)." "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": {
"dev-master": "2.x-dev"
},
"laravel": { "laravel": {
"providers": [ "providers": [
"Laravel\\Tinker\\TinkerServiceProvider" "Laravel\\Tinker\\TinkerServiceProvider"
@@ -2604,9 +2601,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/laravel/tinker/issues", "issues": "https://github.com/laravel/tinker/issues",
"source": "https://github.com/laravel/tinker/tree/v2.8.2" "source": "https://github.com/laravel/tinker/tree/v2.9.0"
}, },
"time": "2023-08-15T14:27:00+00:00" "time": "2024-01-04T16:10:04+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@@ -8396,5 +8393,5 @@
"php": "^7.2.5" "php": "^7.2.5"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.3.0" "plugin-api-version": "2.2.0"
} }
config/tennant_master.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php <?php
return [ return [
'database' => env('TENNANT_MASTER_DB','master_erahn') 'database' => env('TENNANT_MASTER_DB','master_krk')
]; ];