diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index da029fc..fd8b4c6 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2479,6 +2479,13 @@ class KhazanahController extends Controller
public function cetak_lejer_am(Request $request)
{
+ $auth_user = Auth::user();
+ $api_url = config('api.url');
+
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+ $cawangan_detail=$cawangan[0];
+
//new glcode 2021-02-22
$GL_Code_BayaranOnline="1000/210";
$GL_CodeUntungSebenar="1000/213";
@@ -2512,120 +2519,128 @@ class KhazanahController extends Controller
//Calculation Imbang Duga
$imbangduga = Http::get(config('api.url').'/api/CalculationPendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+ #$keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
$rebet = Http::get(config('api.url').'/api/RebetCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
//Harta semasa
$pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+
$pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruqLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+
+ $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+
+ // $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
$untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+
$bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
//Tanggungan Semasa
$panjar = Http::get(config('api.url').'/api/CalculationPanjarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+
$bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $wtd = Http::get(config('api.url').'/api/SerahBakiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $cajlelong = Http::get(config('api.url').'/api/cajlelongLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+
+ // $wtd = Http::get(config('api.url').'/api/SerahBakiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+ // $cajlelong = Http::get(config('api.url').'/api/cajlelongLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
$keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpulLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKiraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $xtra = Http::get(config('api.url').'/api/XtraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+
+ // $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpulLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+ // $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKiraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+ // $xtra = Http::get(config('api.url').'/api/XtraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
//TunaiDitangan Sementara Upah
- if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
- {
- $advansurharini = Http::get(config('api.url').'/api/advansurhariniLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini);
- }else{
- $totaltunaiditangan = $tunaiditangan;
- }
+ // if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
+ // {
+ // $advansurharini = Http::get(config('api.url').'/api/advansurhariniLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+ // $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini);
+ // }else{
+ // $totaltunaiditangan = $tunaiditangan;
+ // }
- $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0;
- //1Stop Special Case
- if($auth_user['cawangan'] === '1STOP')
- {
- $jualan1stop = floatval(129857.00);
- $belian1stop = floatval(122446.50);
- $utgterkumpulxtra = floatval(6727.10);
- $rugilelongxtra = floatval(10079.30);
- $bakilelongxtra = floatval(123.20);
- $cajlelongxtra = floatval(25.50);
- $upahsimpanxtra = floatval(4894.40);
+ // $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0;
+ // //1Stop Special Case
+ // if($auth_user['cawangan'] === '1STOP')
+ // {
+ // $jualan1stop = floatval(129857.00);
+ // $belian1stop = floatval(122446.50);
+ // $utgterkumpulxtra = floatval(6727.10);
+ // $rugilelongxtra = floatval(10079.30);
+ // $bakilelongxtra = floatval(123.20);
+ // $cajlelongxtra = floatval(25.50);
+ // $upahsimpanxtra = floatval(4894.40);
- }else{
- $upahsimpanxtra = $xtra['upahsimpan'];
- $bakilelongxtra = $xtra['bakilelong'];
- $utgterkumpulxtra = $xtra['untungrugiterkumpul'];
- $rugilelongxtra = -($xtra['kerugianlelong']);
- $peruntukanhapuskira = ($xtra['phapuskira']);
- }
+ // }else{
+ // $upahsimpanxtra = $xtra['upahsimpan'];
+ // $bakilelongxtra = $xtra['bakilelong'];
+ // $utgterkumpulxtra = $xtra['untungrugiterkumpul'];
+ // $rugilelongxtra = -($xtra['kerugianlelong']);
+ // $peruntukanhapuskira = ($xtra['phapuskira']);
+ // }
//Terkumpul
- $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpulLejer/'. $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+ // $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpulLejer/'. $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
- $hartasemasa = [];
- // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
+ $Debit = [];
+ // $Debit = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
- if($totaltunaiditangan > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]);
- if($pembiayaantawarruq > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
- if($penghutangkaki > 0) array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
- //array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
- if($keuntungan > 0) array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
- if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
- if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
- if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
- if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
- if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
- if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
- if($peruntukanhapuskira > 0) array_push($hartasemasa,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]);
- if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
+ array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['totalkeluar']]);
+ // if($pembiayaantawarruq > 0) array_push($Debit,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
+ // // if($penghutangkaki > 0) array_push($Debit,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
+ // //array_push($Debit,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
+ // if($keuntungan > 0) array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
+ // if($bayaranpendahuluan > 0) array_push($Debit,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
+ // if($rebet > 0) array_push($Debit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
+ // if($imbangduga['serahan'] > 0) array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
+ // if($pinjamandiberi['pinjamankoop'] > 0) array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
+ // if($pinjamandiberi['emaspalsu'] > 0) array_push($Debit,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
+ // if($imbangduga['pindahkekpkb'] > 0) array_push($Debit,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
+ // if($peruntukanhapuskira > 0) array_push($Debit,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]);
+ // if($belian1stop > 0) array_push($Debit,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
- $totalhartasemasa = 0;
- foreach($hartasemasa as $index => $hs)
- {
- $totalhartasemasa += $hs['amaun'];
- }
+ // $totalhartasemasa = 0;
+ // foreach($hartasemasa as $index => $hs)
+ // {
+ // $totalhartasemasa += $hs['amaun'];
+ // }
- $tanggungansemasa = [];
+ $Kredit = [];
- // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
+ // // $Kredit = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
- if($keuntungan > 0) array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
- if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
- if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
- if($imbangduga['pendahuluan'] > 0) array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
- if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
- if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
- if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
- if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
- if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
- if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
- if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
- if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
- if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
- if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]);
- if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]);
- if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]);
- if($rugilelongxtra != 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
- if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
- if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
- if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
+ array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['totalmasuk']]);
+ // if($keuntungan > 0) array_push($Kredit,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
+ // if($keuntungansebenar > 0) array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
+ // if($rebet > 0) array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
+ // if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
+ // if($panjar['bds'] > 0) array_push($Kredit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
+ // if($panjar['perubatan'] > 0) array_push($Kredit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
+ // if($panjar['keraian'] > 0) array_push($Kredit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
+ // if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
+ // if($bakilelong['rugilelong'] != 0) array_push($Kredit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
+ // if($wtd > 0) array_push($Kredit,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
+ // if($cajlelong > 0) array_push($Kredit,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
+ // if($untungrugiterkumpul > 0) array_push($Kredit,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
+ // if($cajperkhidmatan > 0) array_push($Kredit,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
+ // if($cajlelongxtra > 0) array_push($Kredit,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]);
+ // if($upahsimpanxtra > 0) array_push($Kredit,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]);
+ // if($bakilelongxtra > 0) array_push($Kredit,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]);
+ // if($rugilelongxtra != 0) array_push($Kredit,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
+ // if($utgterkumpulxtra > 0) array_push($Kredit,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
+ // if($jualan1stop > 0) array_push($Kredit,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
+ // if($hapuskira > 0) array_push($Kredit,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
- $totaltanggungansemasa = 0;
- foreach($tanggungansemasa as $index => $ts)
- {
- $totaltanggungansemasa += $ts['amaun'];
- }
+ // $totaltanggungansemasa = 0;
+ // foreach($tanggungansemasa as $index => $ts)
+ // {
+ // $totaltanggungansemasa += $ts['amaun'];
+ // }
- $untungrugifield = [];
- array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]);
+ // $untungrugifield = [];
+ // array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]);
- $totaluntungrugi = 0;
- $totaluntungrugi = $totaltanggungansemasa + $untungrugi;
+ // $totaluntungrugi = 0;
+ // $totaluntungrugi = $totaltanggungansemasa + $untungrugi;
- return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','data','debit','kredit'));
+ return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','Debit','Kredit'));
}
public function laporan_tuntutbaki(Request $request)
diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php
index 220b8ea..c9276a8 100644
--- a/resources/views/print/laporan_lejer_am.blade.php
+++ b/resources/views/print/laporan_lejer_am.blade.php
@@ -331,60 +331,21 @@
| KOD GL | KETERANGAN | DEBIT | KREDIT | JUMLAH | -|
|---|---|---|---|---|---|
| KOD GL | +KETERANGAN | +DEBIT | +KREDIT | +JUMLAH | +{{ $var['glcode']}} | {{$var['descpt']}} | {{$var['debit']}} | {{$var['kredit']}} | - -@if($var['hariini'] >0 ) -{{ - - $var['hariini'] - }} - - - - | -@else -- - -( {{ number_format(abs($var['hariini']),2)}} ) - - - - | - - @endif - - -@endforeach -
| JUMLAH: | @foreach($debit as $db=>$vr) {{ number_format($vr['totalDebit'],2)}} @endforeach - - | @foreach($kredit as $db=>$vr) {{ number_format($vr['totalKredit'],2)}} @endforeach | -- - -@foreach($kredit as $db=>$vr) -@foreach($debit as $db2=>$vr2) - -{{ number_format($vr['totalKredit'] -$vr2['totalDebit'] ,2) }} -@endforeach - @endforeach - - - - - | - - - -||
| KOD GL | +KETERANGAN | +DEBIT | +KREDIT | +JUMLAH | +|