diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php
index edc6490..fe30305 100644
--- a/app/Http/Controllers/AkaunController.php
+++ b/app/Http/Controllers/AkaunController.php
@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Carbon\Carbon;
-use PDF;
+use Barryvdh\DomPDF\Facade as PDF;
use Maatwebsite\Excel\Excel;
use App\Models\Lejeram;
@@ -921,4 +921,172 @@ class AkaunController extends Controller
return $pdf->download('laporan_aging_' . $request->kodcaw .'_'. $tebus_date . '.pdf');
// return view('akaun.laporan_aging', compact('aging','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
}
+
+ public function cetakimbangdugaExtended(Request $request)
+ {
+
+ $auth_user = Auth::user();
+ $api_url = $request->hostname;
+
+ $current = Carbon::now();
+ $current = new Carbon();
+
+ $tarikh_cetak = $current->toDateString();
+
+ $tarikh_imbangan= $current->toDateString();
+ $tarikh_imbangan2= $current->toDateString();
+
+
+ $tarikh_cetak = $current->toDateString();
+
+
+ if($request->datetimepicker1 == null){
+ $tarikh_cetak = $current->toDateString();
+ }else
+ {
+ $split_date = explode('-',$request->datetimepicker1);
+ $tarikh_imbangan2 = $request->datetimepicker1;
+ }
+
+
+ $cawangan_info = Http::get($request->hostname . '/api/cawangan/'. $request->kodcaw)->json();
+ $cawangan=Http::get($request->hostname.'/api/cawangan/detail/'.$request->kodcaw)->json();
+ $cawangan_detail=$cawangan[0];
+
+ //Calculation Imbang Duga
+ $imbangduga = Http::get($request->hostname.'/api/CalculationPendahuluanSerahan/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ // $keuntungan = Http::get($request->hostname.'/api/KeuntunganArRahn/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ // $rebet = Http::get($request->hostname.'/api/RebetCalculation/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+
+ //Harta semasa
+ $pinjamandiberi = Http::get($request->hostname.'/api/PinjamanDiberi/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $pembiayaantawarruq = Http::get($request->hostname.'/api/PembiayaanDiberiTawarruq/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $tunaiditangan = Http::get($request->hostname.'/api/TunaiDiTangan/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $penghutangkaki = Http::get($request->hostname.'/api/PenghutangKakitangan/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $untungrugi = Http::get($request->hostname.'/api/UntungRugiCalculation/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $bayaranpendahuluan = Http::get($request->hostname.'/api/BayaranPendahuluan/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+
+ //Tanggungan Semasa
+ $panjar = Http::get($request->hostname.'/api/CalculationPanjar/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $bakilelong = Http::get($request->hostname.'/api/BakiLelongCalculation/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $wtd = Http::get($request->hostname.'/api/SerahBaki/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $cajlelong = Http::get($request->hostname.'/api/cajlelong/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $keuntungansebenar = Http::get($request->hostname.'/api/KeuntunganSebenar/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $cajperkhidmatan = Http::get($request->hostname.'/api/cajperkhidmatanterkumpul/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $hapuskira = Http::get($request->hostname.'/api/CalculationHapusKira/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+ $xtra = Http::get($request->hostname.'/api/Xtra/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+
+
+ //Perubahan Terbaru
+ $keun_sebenar = Http::get($request->hostname.'/admin/ig/keuntungansebenar' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+
+
+
+ //TunaiDitangan Sementara Upah
+ if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
+ {
+ $advansurharini = Http::get($request->hostname.'/api/advansurharini/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->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($request->kodcaw === '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);
+ $peruntukanhapuskira = ($xtra['phapuskira']);
+
+ }else{
+ $upahsimpanxtra = $xtra['upahsimpan'];
+ $bakilelongxtra = $xtra['bakilelong'];
+ $utgterkumpulxtra = $xtra['untungrugiterkumpul'];
+ $rugilelongxtra = -($xtra['kerugianlelong']);
+ $peruntukanhapuskira = ($xtra['phapuskira']);
+ }
+
+ //Terkumpul
+ $untungrugiterkumpul = Http::get($request->hostname. '/api/UntungRugiTerkumpul/'. $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
+
+ $hartasemasa = [];
+ // $hartasemasa = ['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/240','descpt' => 'Rebet 1','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]);
+
+ $totalhartasemasa = 0;
+ foreach($hartasemasa as $index => $hs)
+ {
+ $totalhartasemasa += $hs['amaun'];
+ }
+
+ $tanggungansemasa = [];
+
+ // $tanggungansemasa = ['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 2','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]);
+
+ $totaltanggungansemasa = 0;
+ foreach($tanggungansemasa as $index => $ts)
+ {
+ $totaltanggungansemasa += $ts['amaun'];
+ }
+
+ $untungrugifield = [];
+ array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan Sebenar', 'amaun' => $untungrugi]);
+
+
+ $totaluntungrugi = 0;
+ $totaluntungrugi = $totaltanggungansemasa + $untungrugi;
+
+ if(isset($request->jenis))
+ {
+ if($request->jenis == 'pdf')
+ {
+ $pdf = PDF::loadView('akaun.laporan_imbanduga-extended',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'))->setPaper('a4', 'potrait');
+ return $pdf->download('laporan_imbangduga_' . $request->kodcaw .'_'. $tarikh_imbangan2 . '.pdf');
+ }else{
+ return view('akaun.laporan_imbanduga=extended',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
+ }
+ }
+
+ // return view('akaun.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
+ }
}
diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue
index 70808e2..472ab45 100644
--- a/resources/js/Akaun/Home.vue
+++ b/resources/js/Akaun/Home.vue
@@ -109,6 +109,11 @@
Peti Besi
+
+
+ Imbang Duga Extend.
+
+
diff --git a/resources/js/Akaun/ImbangdugaExtended.vue b/resources/js/Akaun/ImbangdugaExtended.vue
new file mode 100644
index 0000000..451cd45
--- /dev/null
+++ b/resources/js/Akaun/ImbangdugaExtended.vue
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+ Laporan Imbang Duga Extended
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/js/routes.js b/resources/js/routes.js
index 2dbf542..9bae401 100644
--- a/resources/js/routes.js
+++ b/resources/js/routes.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
import VueRouter from 'vue-router'
import Lejeram from './Akaun/Lejeram'
import Imbangduga from './Akaun/Imbangduga'
+import ImbangdugaExtended from './Akaun/ImbangdugaExtended'
import Home from './Akaun/Home'
import Laporan from './Akaun/Laporan'
import Gadaian from './Akaun/Gadaian'
@@ -57,6 +58,7 @@ export default new VueRouter({
{ path: '/akaunhome', component: Home },
{ path: '/akaunhome/lejeram', component: Lejeram },
{ path: '/akaunhome/imbangduga', component: Imbangduga },
+ { path: '/akaunhome/imbangduga/extended', component: ImbangdugaExtended },
{ path: '/akaunhome/gadaian', component: Gadaian },
{ path: '/akaunhome/penebusan', component: Penebusan },
{ path: '/akaunhome/ansuran', component: Ansuran },
diff --git a/resources/views/akaun/laporan_imbangduga-extended.blade.php b/resources/views/akaun/laporan_imbangduga-extended.blade.php
new file mode 100644
index 0000000..dabf58b
--- /dev/null
+++ b/resources/views/akaun/laporan_imbangduga-extended.blade.php
@@ -0,0 +1,509 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | LAPORAN IMBANGAN DUGA CAWANGAN |
+
+
+
+
+
+
+
+
+| Tarikh Laporan | {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} | Tarikh Cetak | {{$tarikh_cetak}} |
+
+
+
+
+
+
+
+
+
+ | Kod GL |
+ Keterangan |
+ Amaun |
+
+
+
+ | HARTA SEMASA |
+ |
+ |
+
+
+ @foreach($hartasemasa as $index => $assets)
+
+ | {{ $assets['glcode'] }} |
+ {{ $assets['descpt'] }} |
+ {{ number_format($assets['amaun'],2) }} |
+
+ @endforeach
+
+
+ | JUMLAH |
+ |
+ {{ number_format($totalhartasemasa,2) }} |
+
+
+
+
+
+
+
+ | TANGGUNGAN SEMASA |
+ |
+ |
+
+
+ @foreach($tanggungansemasa as $index => $liabilities)
+
+ | {{ $liabilities['glcode'] }} |
+ {{ $liabilities['descpt'] }} |
+ {{ number_format($liabilities['amaun'],2) }} |
+
+ @endforeach
+
+
+ | JUMLAH |
+ |
+ {{ number_format($totaltanggungansemasa,2) }} |
+
+
+
+
+
+
+
+ | Untung Rugi |
+ |
+ |
+
+
+ @foreach($untungrugifield as $index => $untungrugi)
+
+ | {{ $untungrugi['glcode'] }} |
+ {{ $untungrugi['descpt'] }} |
+ {{ number_format($untungrugi['amaun'],2) }} |
+
+ @endforeach
+
+
+ | JUMLAH |
+ |
+ {{ number_format($totaluntungrugi,2) }} |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 0a2975d..8b824d4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -76,6 +76,7 @@ Route::get('/kelulusan',['as'=>'kelulusan','uses'=>'App\Http\Controllers\Kelulus
//Akaun
Route::get('/akaunhome/cetaklaporanlejeram',['as'=>'cetak.lejeram','uses'=>'App\Http\Controllers\AkaunController@viewlejeram'])->middleware(['roleChecker:admin,akaun,operasi']);
Route::get('/akaunhome/cetaklaporanimbangduga',['as'=>'cetak.imbangduga','uses'=>'App\Http\Controllers\AkaunController@cetakimbangduga'])->middleware(['roleChecker:admin,akaun,operasi']);
+Route::get('/akaunhome/cetaklaporanimbangdugaextended',['as'=>'cetak.imbangdugaExtended','uses'=>'App\Http\Controllers\AkaunController@cetakimbangdugaExtended'])->middleware(['roleChecker:admin,akaun,operasi']);
Route::get('/akaunhome/cetakgadaian',['as'=>'cetak.gadaian','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanGadai'])->middleware(['roleChecker:admin,akaun,operasi']);
Route::get('/akaunhome/cetakpenebusan',['as'=>'cetak.penebusan','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanPenebusan'])->middleware(['roleChecker:admin,akaun,operasi']);
Route::get('/akaunhome/cetakansuran',['as'=>'cetak.ansuran','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanAnsuran'])->middleware(['roleChecker:admin,akaun,operasi']);