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

Merged in bugfix/restore-2025-01-14 (pull request #251)

Browse Source 
from server date 2025-01-14
This commit is contained in:
Muhd hafifie
2025-01-14 15:10:13 +00:00
parent 09af89a249 1aee7390a6
commit 94f64e53ab
10 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+36 -6
View File
@@ -17,6 +17,7 @@ use App\AddTunai;
use App\TuntutBaki;
use App\Advansur;
use App\AkruNet;
use App\AkruNetPecahan;
use App\TransaksiKeuntungan;
use App\Bajet;
use App\BajetTahunan;
@@ -3183,9 +3184,11 @@ class AdminPageController extends Controller
// $total = $sum_keuntungan + $sum_bayaran + $summation_ansuran;
$lastDayPreviousMonth = $tarikh->subMonthsNoOverflow()->endOfMonth()->toDateString();
$get_imbangduga = imbangdugabackup::on($cawangan['mysql'])->where('tarikh',$lastDayPreviousMonth)->first();
$get_imbangduga = optional($get_imbangduga)->toArray() ?? [];
if(Carbon::parse($lastDayPreviousMonth)->year == Carbon::now()->year){
$get_imbangduga = imbangdugabackup::on($cawangan['mysql'])->where('tarikh',$lastDayPreviousMonth)->first();
$get_imbangduga = optional($get_imbangduga)->toArray() ?? [];
}
$collection_trans = Transaction::on('mysql7')
->leftJoin('transaksi_keuntungan as trans', function ($join) {
@@ -3676,11 +3679,11 @@ class AdminPageController extends Controller
$keuntungansebenar = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
$previousYear = Carbon::now()->subYears(1);
$previousYear = Carbon::parse($request->tarikh)->subYears();
$get_norujukan = Gadai::on($cawangan['mysql'])
->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','>=','2022')->whereYear('t_gadai','<=',$previousYear)->where('sttebus','<>','')->pluck('norujukan');
->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','>=','2022')->whereYear('t_gadai','<=','2023')->where('sttebus','<>','')->pluck('norujukan');
$sum_keun = Transaction::on('mysql7')
->selectRaw("trans.norujukan,SUM(CASE WHEN (transaction.trans_type) <> 'A' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran")
@@ -3696,11 +3699,38 @@ class AdminPageController extends Controller
$total_keuntungan_sebenar = $sum_keuntungan + $sum_bayaran;
$backdate_keun_sebenar = 0;
$recentDate = Carbon::now()->subYear();
while ($recentDate->year > 2023) {
$exception_case = 0;
$lastDayOfYear = $recentDate->endOfYear()->toDateString();
$get_imbangduga = imbangdugabackup::on($cawangan['mysql'])->where('tarikh', $lastDayOfYear)->first();
$get_imbangduga = optional($get_imbangduga)->toArray() ?? [];
if(empty($get_imbangduga)){
$requestData = new Request([
'tarikh' => $request->tarikh,
'kodcaw' => $kodcaw,
]);
$exception_case = $this->AkruKeuntunganSebenar($requestData);
}
$backdate_keun_sebenar += isset($get_imbangduga['keun_sebenar']) ? $get_imbangduga['keun_sebenar'] : 0;
$backdate_keun_sebenar += $exception_case;
$recentDate->subYear()->startOfYear();
}
$total_keuntungan_sebenar = $sum_keuntungan + $sum_bayaran + $backdate_keun_sebenar;
$available_akru = AkruNet::on($cawangan['mysql'])
->where('tahun','<=',$previousYear->year)
->sum('jumlah');
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq + $available_akru + $total_keuntungan_sebenar) + $parameter;
$akru_ujrah = AkruNetPecahan::on($cawangan['mysql'])->where('tahun','<=',$previousYear->year)->sum('pend_akru_ujrah');
$akru_1percent = AkruNetPecahan::on($cawangan['mysql'])->where('tahun','<=',$previousYear->year)->sum('pend_akru_1persen');
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq + $available_akru + $total_keuntungan_sebenar + $akru_ujrah + $akru_1percent) + $parameter;
if($kodcaw == '011229')
$total -= 45390.37;
app/Http/Controllers/LogController.php
+1 -1
View File
@@ -97,7 +97,7 @@ class LogController extends Controller
return response()->json($logsession);
return response()->json($logoutsession);
}
app/Http/Controllers/PolisController.php
+16 -6
View File
@@ -108,12 +108,22 @@ class PolisController extends Controller
return response()->json(['error' => 'Invalid kodcaw'], 403);
}
$polis = Polis::on($cawangan['mysql'])
->where('komen1','=',$request->alasan)
// ->where('tarikh','=',$request->tarikh)
->whereBetween('tarikh', [$request->tarikh_mula, $request->tarikh_akhir])
->get();
if($request->alasan == 'all'){
$polis = Polis::on($cawangan['mysql'])
->select('gadai.sttebus','gadai.t_update','gadai.norujukan','gadai.nokp','polis.komen1','polis.komen2','polis.tarikh','polis.teller','polis.caj','polis.kodnegeri','polis.koddaerah','polis.tebus')
->join('gadai','gadai.norujukan','=','polis.norujukan')
->whereBetween('polis.tarikh', [$request->tarikh_mula, $request->tarikh_akhir])
->get();
}else{
$polis = Polis::on($cawangan['mysql'])
->select('gadai.sttebus','gadai.t_update','gadai.norujukan','gadai.nokp','polis.komen1','polis.komen2','polis.tarikh','polis.teller','polis.caj','polis.kodnegeri','polis.koddaerah','polis.tebus')
->join('gadai','gadai.norujukan','=','polis.norujukan')
->where('komen1','=',$request->alasan)
// ->where('tarikh','=',$request->tarikh)
->whereBetween('polis.tarikh', [$request->tarikh_mula, $request->tarikh_akhir])
->get();
}
return response()->json($polis);
}
app/Http/Controllers/Reports/BalanceSheetsController.php
+2 -2
View File
@@ -31,8 +31,8 @@ class BalanceSheetsController extends Controller
}
public function updateIGBalanceSheets(Request $request){
$cawangan = Cawangan::on('mysql7')->where('zone','<>',1)->get();
$date = Carbon::now()->month($request->month);
$cawangan = Cawangan::on('mysql7')->where('version','v2')->get();
$date = Carbon::create($request->year)->month($request->month);
$lastDay = (clone $date)->endOfMonth();
try{
app/Http/Controllers/Reports/RingkasanHarianController.php
+5 -2
View File
@@ -16,9 +16,12 @@ class RingkasanHarianController extends Controller
$reportRingkasanHarianService = new ReportRingkasanHarianService($kod_cawangan, $request);
$reportKawalanStokService = new KawalanStokService($kod_cawangan, $request);
$ringkasan_report = $reportRingkasanHarianService->getLaporanCawangan()->getContent();
$ringkasan_kawalan = $reportKawalanStokService->getLaporanCawangan()->getContent();
$reports = [
'reportRingkasanHarian' => $reportRingkasanHarianService->getLaporanCawangan(),
'reportKawalanStok' => $reportKawalanStokService->getLaporanCawangan(),
'reportRingkasanHarian' => json_decode($ringkasan_report),
'reportKawalanStok' => json_decode($ringkasan_kawalan),
];
return response()->json($reports);
app/Http/Controllers/TransactionOnlineController.php
+1 -1
View File
@@ -438,7 +438,7 @@ class TransactionOnlineController extends Controller
} else {
$onepercent = new OnePercentServices();
$keuntungan = $onepercent->kiraanKeuntunganSebenar($gadai['bakipjm'], $gadai['nilaimarhun'], $gadai['kadarupah'], $margin_semasa);
$keuntungan = $onepercent->kiraanKeuntunganRebet($gadai['bakipjm'], $gadai['nilaimarhun'], $gadai['kadarupah'], $gadai['margin_semasa']);
$ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'], $gadai['kadarupah'], $gadai['percentpinj']);
$onepercentasal = $gadai['pinjaman'] * (1 / 100);
app/Services/Miscellaneous/PanjarServices.php
+2 -2
View File
@@ -181,7 +181,7 @@ class PanjarServices
if($bakiakhir <= 0) throw new \Exception('Custom Exception: Amaun Baki Akhir Cannot Be Zero');
if($totalpanjar < 0) throw new \Exception('Custom Exception: Amaun Panjar Cannot Be Zero');
Vault::on($cawangan['mysql'])->where('kodcaw','=', $cawangan['kodcaw'])->latest('tarikh')->update(array(
Vault::on($cawangan['mysql'])->where('kodcaw','=', $cawangan['kodcaw'])->where('tarikh','=',$current->toDateString())->update(array(
'totpanjar' => $totalpanjar,
'bakiakhir'=>$bakiakhir,
'bakieod'=>$bakiakhir
@@ -330,7 +330,7 @@ class PanjarServices
if($bakiakhir <= 0) throw new \Exception('Custom Exception: Amaun Baki Akhir Cannot Be Zero');
if($totalpanjar < 0) throw new \Exception('Custom Exception: Amaun Panjar Cannot Be Zero');
Vault::on($cawangan['mysql'])->where('kodcaw','=', $cawangan['kodcaw'])->latest('tarikh')->update(array(
Vault::on($cawangan['mysql'])->where('kodcaw','=', $cawangan['kodcaw'])->where('tarikh','=',$current->toDateString())->update(array(
'totpanjar' => $totalpanjar,
'bakiakhir'=>$bakiakhir,
'bakieod'=>$bakiakhir
app/Services/Reports/OnePercentService.php
+3 -1
View File
@@ -302,7 +302,9 @@ class OnePercentService
$ujrah_current = $result_audit_current->sum('ujrah');
}
/* B */
$result_audit_previous = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate);
$year_sebelum = $date_sebelum->format('Y');
$year_publish = ($month_sekarang == 1) ? $year_sebelum : $year_generate;
$result_audit_previous = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_publish);
$onepercent_previous = $result_audit_previous->sum('utgonepercent');
$ujrah_previous = $result_audit_previous->sum('ujrah');
app/Services/Reports/RingkasanHarianService.php
+2 -1
View File
@@ -821,7 +821,8 @@ class RingkasanHarianService
'011233' => '2021-06-28',
];
return $tarikhTawarruq[Str::upper($this->kodCawangan)];
$defaultDate = '2021-01-01';
return $tarikhTawarruq[Str::upper($this->kodCawangan)] ?? $defaultDate;
}
private function getOutstandingImbangDuga()
app/Support/v2/GadaiV2.php
+1 -1
View File
@@ -244,7 +244,7 @@ class GadaiV2
$margin_semasa = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
$keuntungan = $onepercent->kiraanKeuntunganSebenar($gadai['bakipjm'],$gadai['nilaimarhun'],$gadai['kadarupah'],$margin_semasa);
$keuntungan = $onepercent->kiraanKeuntunganRebet($gadai['bakipjm'],$gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['margin_semasa']);
$ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['percentpinj']);
$onepercentasal = $gadai['pinjaman'] * (1/100);