From 7412a6f4cd7ace6ed2239e83059c3c2a3cb99fc1 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 22 Mar 2022 16:43:39 +0800 Subject: [PATCH 1/6] Update package-lock.json --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index ae7fa9b0..14252fc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "lelong", + "name": "lelong2", "lockfileVersion": 2, "requires": true, "packages": { From 79a8dcf50b3944652c0b27a7080c13fae3a89155 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:43:17 +0800 Subject: [PATCH 2/6] pdf senarai brg lelongan --- app/Http/Controllers/LelongController.php | 44 +++++++++++++++---- app/Http/Controllers/NotisController.php | 14 +++--- app/Http/Controllers/SimulasiController.php | 3 +- .../views/jananotis/senarainotis.blade.php | 12 ++--- .../views/lelong/senaraibrglelong.blade.php | 5 ++- resources/views/pdf/jananotis.blade.php | 7 ++- resources/views/pdf/listlelong.blade.php | 28 ++++++------ 7 files changed, 70 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 171296fe..a042c98e 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -719,18 +719,24 @@ class LelongController extends Controller public function senaraibrglelong($lelong_id){ - $lelong_id = $lelong_id; - $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); - - + $keuntungan=0; + + foreach($brglelong as $index1=>$upah) + { + + $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir'])-(($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); + $brglelong[$index1]['keuntungan'] = $keuntungan; + } - return view('lelong.senaraibrglelong',compact('brglelong','lelong_id')); + + + return view('lelong.senaraibrglelong',compact('brglelong','lelong_id','keuntungan')); } @@ -738,14 +744,34 @@ class LelongController extends Controller $lelong_id = $request->lelongid; - // $nilai_marhun = 0; - + $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) - ->get()->toArray(); + ->get(); + + $keuntungan=0; + $totharga_asas=0; + $totkeuntungan=0; + $totnilai_marhun=0; + $tot_pinjaman=0; - $pdf = PDF::loadView('pdf.listlelong',compact('brglelong')) + foreach($brglelong as $index1=>$upah) + { + $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir']) - (($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); + $brglelong[$index1]['keuntungan'] = $keuntungan; + + } + + $totharga_asas = $totharga_asas + ($upah->sum('hargaasas')); + $totkeuntungan = $totkeuntungan + ($brglelong->sum('keuntungan')); + $totnilai_marhun = $totnilai_marhun + ($upah->sum('nilaimarhun')); + $tot_pinjaman = $tot_pinjaman + ($upah->sum('pinjaman')); + + + + + $pdf = PDF::loadView('pdf.listlelong',compact('brglelong','totharga_asas','totkeuntungan','totnilai_marhun','tot_pinjaman')) ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Lelong.pdf'); diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index ceb92048..6700cbfa 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -57,20 +57,20 @@ class NotisController extends Controller $lelong_id = $lelong_id; - $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + $senarai = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); $bayaran=0; - foreach($payment as $index1=>$pay) + foreach($senarai as $index1=>$notis) { - $bayaran = $pay['hargajualan'] - $pay['bakihargajualan']; + $bayaran = $notis['hargajualan'] - $notis['bakihargajualan']; } - $payment[$index1]['payment'] = $payment; - $payment[$index1]['bayaran_keuntungan'] = $bayaran; + $senarai[$index1]['payment'] = $senarai; + $senarai[$index1]['bayaran_keuntungan'] = $bayaran; - return view('jananotis.senarainotis',compact('payment','lelong_id','bayaran')); + return view('jananotis.senarainotis',compact('senarai','lelong_id','bayaran')); } @@ -87,7 +87,7 @@ class NotisController extends Controller $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - $payment = Gadai::join('lelongbid','gadai.norujukan','=','lelongbid.norujukan') + $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->join('customer','gadai.nokp','=','customer.kpbaru') ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index c59d8d5c..32085359 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -667,7 +667,6 @@ class SimulasiController extends Controller ]); - $total_marhun = $total_marhun + sizeof($databid); $total_berat = $total_berat + $berat; $total_nmarhun = $total_nmarhun + $nilai_marhun; @@ -677,7 +676,7 @@ class SimulasiController extends Controller $total_cazlelong = $total_cazlelong + $cajlelong; $total_rugilelong = $total_rugilelong + $rugilelong; $total_bakilelong = $total_bakilelong + $bakilelong; - + } diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php index a7376fba..3627708f 100644 --- a/resources/views/jananotis/senarainotis.blade.php +++ b/resources/views/jananotis/senarainotis.blade.php @@ -30,14 +30,14 @@ - @foreach($payment as $pay) + @foreach($senarai as $notis) {{ $loop->iteration }} - {{ $pay['norujukan']}} - {{ $pay['jbg']}} - {{ $pay['nokp']}} - {{ $pay['pinjaman']}} - {{ $pay['bakiupah']}} + {{ $notis['norujukan']}} + {{ $notis['jbg']}} + {{ $notis['nokp']}} + {{ $notis['pinjaman']}} + {{ $notis['bakiupah']}} {{ $bayaran}} @endforeach diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php index 3d689086..1a3482c4 100644 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ b/resources/views/lelong/senaraibrglelong.blade.php @@ -21,7 +21,7 @@ No No Rujukan Harga Asas - Upah + Upah Keuntungan JBG Nilai Marhun Asal Pinjaman @@ -35,11 +35,12 @@ {{ $loop->iteration }} {{ $brg['norujukan']}} {{$brg['hargaasas']}} - {{$brg['upahsimpan']}} + {{ $brg['keuntungan'] }} {{ $brg['jbg']}} {{ $brg['nilaimarhun']}} {{ $brg['pinjaman']}} {{ $brg['marhun']}} + @endforeach diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php index b490c55a..f18dbfca 100644 --- a/resources/views/pdf/jananotis.blade.php +++ b/resources/views/pdf/jananotis.blade.php @@ -66,8 +66,11 @@

No Rujukan: {{$notis['norujukan']}}
- Kepada:{{ $notis['nama'] }}
{{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '
' . strtoupper($notis['alamat2']) !!}
{{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['koddaerah']) . ' ' . strtoupper($notis['kodnegeri'])}} -
+ Kepada:{{ $notis['nama'] }}
{{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '
' + . strtoupper($notis['alamat2']) !!}
{{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['koddaerah']) . ' ' . strtoupper($notis['kodnegeri'])}} + +

+

No Telefon: {{$notis['telefon']}}
No K/P: {{$notis['kpbaru']}}

diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index e19288ee..f5944d48 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -105,29 +105,27 @@ tr:nth-child(even) { {{ $loop->iteration }} {{ $brg['norujukan'] }} - {{ ($brg['norujukan']) }} {{ number_format($brg['hargaasas'], 2, '.', ',') }} - {{ number_format($brg['upahsimpan'], 2, '.', ',') }} - - + {{ number_format($brg['keuntungan'], 2, '.', ',') }} + {{ $brg['jbg'] }} {{ number_format($brg['nilaimarhun'], 2, '.', ',') }} {{ number_format($brg['pinjaman'], 2, '.', ',') }} {{ ($brg['marhun']) }} @endforeach - + + + JUMLAH KESELURUHAN + {{ number_format($totharga_asas, 2, '.', ',') }} + {{ number_format($totkeuntungan, 2, '.', ',') }} + + {{ number_format($totnilai_marhun, 2, '.', ',') }} + {{ number_format($tot_pinjaman, 2, '.', ',') }} + + + - {{-- - Jumlah Keseluruhan - - {{ number_format($total_berat, 2, '.', ',') }} - {{ number_format($total_nmarhun, 2, '.', ',') }} - {{ number_format($total_pinjaman, 2, '.', ',') }} - {{ number_format($total_upah, 2, '.', ',') }} - {{ number_format($total_hargaasas, 2, '.', ',') }} - {{ number_format($total_cazlelong, 2, '.', ',') }} - --}} From af7ac037d93234d07078c2ce75c3b1956151f3a0 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Sun, 10 Apr 2022 10:43:09 +0800 Subject: [PATCH 3/6] laporan senarai pembida, pdf senarai lelongan --- app/Http/Controllers/LelongController.php | 61 ++++- app/Http/Controllers/SimulasiController.php | 4 +- composer.json | 1 + composer.lock | 221 +++++++++++++++++- resources/views/includes/sidebar.blade.php | 23 +- .../views/lelong/laporanbidaanindex.blade.php | 73 ++++++ .../views/lelong/laporanlelong.blade.php | 1 - .../views/lelong/lelongtaklaku.blade.php | 44 ++-- .../views/lelong/senaraibrglelong.blade.php | 18 +- .../views/lelong/senarailapbidaan.blade.php | 113 +++++++++ resources/views/lelong/showlelong.blade.php | 62 ++--- resources/views/pdf/listlelong.blade.php | 14 +- resources/views/pdf/marhundetails.blade.php | 28 ++- .../views/simulasi/showsimulasi.blade.php | 67 +++--- routes/web.php | 38 +-- storage/debugbar/.gitignore | 2 + 16 files changed, 616 insertions(+), 154 deletions(-) create mode 100644 resources/views/lelong/laporanbidaanindex.blade.php create mode 100644 resources/views/lelong/senarailapbidaan.blade.php create mode 100644 storage/debugbar/.gitignore diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index a042c98e..acefb60d 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -240,6 +240,7 @@ class LelongController extends Controller $lelong->cajlelong = $simulasi->cajlelong; $lelong->save(); + foreach($simkarat as $simulasikarat) { $lelkarat = new LelKarat; @@ -409,7 +410,7 @@ class LelongController extends Controller { $karat->karat = $karat->karat; $karat->keterangan = $karat->keterangan; - $karat->harga = $request->harga[$index]; + // $karat->harga = $request->harga[$index]; $karat->harga2 = $request->harga2[$index]; $karat->save(); } @@ -731,6 +732,7 @@ class LelongController extends Controller $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir'])-(($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); $brglelong[$index1]['keuntungan'] = $keuntungan; + } @@ -744,6 +746,9 @@ class LelongController extends Controller $lelong_id = $request->lelongid; + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->where('lelong.id', $lelong_id) + ->get(); $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) @@ -755,12 +760,14 @@ class LelongController extends Controller $totnilai_marhun=0; $tot_pinjaman=0; + + foreach($brglelong as $index1=>$upah) { $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir']) - (($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); $brglelong[$index1]['keuntungan'] = $keuntungan; - + } $totharga_asas = $totharga_asas + ($upah->sum('hargaasas')); @@ -768,20 +775,54 @@ class LelongController extends Controller $totnilai_marhun = $totnilai_marhun + ($upah->sum('nilaimarhun')); $tot_pinjaman = $tot_pinjaman + ($upah->sum('pinjaman')); - - - $pdf = PDF::loadView('pdf.listlelong',compact('brglelong','totharga_asas','totkeuntungan','totnilai_marhun','tot_pinjaman')) - ->setPaper('a4', 'potrait'); + $pdf = PDF::loadView('pdf.listlelong',compact('brglelong','totharga_asas','totkeuntungan','totnilai_marhun','tot_pinjaman','lelong_id','lelongid')) + ->setPaper('a4', 'potrait'); - return $pdf->download('Senarai Lelong.pdf'); - - - + return $pdf->download('Senarai Lelong.pdf'); + } + public function lapbidaan (Request $request){ + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->get(); + + return view('lelong.laporanbidaanindex',compact('lelongid')); + } + + + public function senarailapbidaan ($lelong_id){ + + $arraydetails = []; + + $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->select('lelongbid_id','norujukan','hargaasas') + ->where('lelongbid.lelong_id','=',$lelong_id) + ->groupBy('lelongbid_id') + ->get() + ->toArray(); + + foreach($laporanpembida as $laporan) + { + $details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id']) + ->orderBy('hargabida','desc') + ->orderBy('masa_bidaan','asc') + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + return view('lelong.senarailapbidaan', compact('arraydetails')); + + + + } + + } \ No newline at end of file diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 32085359..e023c621 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -92,7 +92,7 @@ class SimulasiController extends Controller $simkarat->simulasi_id = $simulasi->id; $simkarat->karat = $item->karat; $simkarat->keterangan = $item->keterangan; - $simkarat->harga = ($hargaasas + ($item->dariharga916))/2.72; //gram + $simkarat->harga = ($hargaasas + ($item->dariharga916)); //gram $simkarat->harga2 = $hargaasas + ($item->dariharga916); //rial $simkarat->save(); } @@ -487,7 +487,7 @@ class SimulasiController extends Controller { $karat->karat = $karat->karat; $karat->keterangan = $karat->keterangan; - $karat->harga = $request->harga[$index]; + // $karat->harga = $request->harga[$index]; $karat->harga2 = $request->harga2[$index]; $karat->save(); } diff --git a/composer.json b/composer.json index d4d20a88..96ebe155 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,7 @@ "spatie/laravel-permission": "^5.3" }, "require-dev": { + "barryvdh/laravel-debugbar": "^3.6", "facade/ignition": "^2.5", "fakerphp/faker": "^1.9.1", "laravel/sail": "^1.0.1", diff --git a/composer.lock b/composer.lock index 3ec90ca5..c9394a68 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2e5f0f0a7cad0c224615bb48a86d6a1b", + "content-hash": "1f26af21cdf299942137e16bdee7fbea", "packages": [ { "name": "asm89/stack-cors", @@ -7225,6 +7225,91 @@ } ], "packages-dev": [ + { + "name": "barryvdh/laravel-debugbar", + "version": "v3.6.7", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298", + "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298", + "shasum": "" + }, + "require": { + "illuminate/routing": "^6|^7|^8|^9", + "illuminate/session": "^6|^7|^8|^9", + "illuminate/support": "^6|^7|^8|^9", + "maximebf/debugbar": "^1.17.2", + "php": ">=7.2", + "symfony/debug": "^4.3|^5|^6", + "symfony/finder": "^4.3|^5|^6" + }, + "require-dev": { + "mockery/mockery": "^1.3.3", + "orchestra/testbench-dusk": "^4|^5|^6|^7", + "phpunit/phpunit": "^8.5|^9.0", + "squizlabs/php_codesniffer": "^3.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.6-dev" + }, + "laravel": { + "providers": [ + "Barryvdh\\Debugbar\\ServiceProvider" + ], + "aliases": { + "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar" + } + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Barryvdh\\Debugbar\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "PHP Debugbar integration for Laravel", + "keywords": [ + "debug", + "debugbar", + "laravel", + "profiler", + "webprofiler" + ], + "support": { + "issues": "https://github.com/barryvdh/laravel-debugbar/issues", + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7" + }, + "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2022-02-09T07:52:32+00:00" + }, { "name": "doctrine/instantiator", "version": "1.4.0", @@ -7794,6 +7879,72 @@ }, "time": "2021-11-05T08:25:44+00:00" }, + { + "name": "maximebf/debugbar", + "version": "v1.18.0", + "source": { + "type": "git", + "url": "https://github.com/maximebf/php-debugbar.git", + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "shasum": "" + }, + "require": { + "php": "^7.1|^8", + "psr/log": "^1|^2|^3", + "symfony/var-dumper": "^2.6|^3|^4|^5|^6" + }, + "require-dev": { + "phpunit/phpunit": "^7.5.20 || ^9.4.2", + "twig/twig": "^1.38|^2.7|^3.0" + }, + "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "DebugBar\\": "src/DebugBar/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/maximebf/php-debugbar", + "keywords": [ + "debug", + "debugbar" + ], + "support": { + "issues": "https://github.com/maximebf/php-debugbar/issues", + "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0" + }, + "time": "2021-12-27T18:49:48+00:00" + }, { "name": "mockery/mockery", "version": "1.4.4", @@ -9734,6 +9885,74 @@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "symfony/debug", + "version": "v4.4.37", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "5de6c6e7f52b364840e53851c126be4d71e60470" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470", + "reference": "5de6c6e7f52b364840e53851c126be4d71e60470", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "psr/log": "^1|^2|^3" + }, + "conflict": { + "symfony/http-kernel": "<3.4" + }, + "require-dev": { + "symfony/http-kernel": "^3.4|^4.0|^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to ease debugging PHP code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/debug/tree/v4.4.37" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:41:36+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.1", diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index a768e1e7..d8812d1a 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -86,10 +86,7 @@
  • Senarai Lelong
    • -
  • - Laporan Senarai Lelong -
    • - + @endhasrole @hasrole('operasi') @@ -113,10 +110,7 @@
  • Senarai Lelong Tak Laku
    • -
  • - Laporan Senarai Lelong -
    • - +
  • @@ -142,6 +136,19 @@
    • +
  • + + + +
    • @endhasrole @hasrole('account') {{--
  • diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php new file mode 100644 index 00000000..1d88ddfe --- /dev/null +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -0,0 +1,73 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + + + + + + + + + + + + + + @foreach ($lelongid as $bid) + + + + + + + + @endforeach + + +
    Lelong IDCawanganTarikh LelongAction
    {{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }} + +
    +
    +
    + +
    +
    + + +@endsection diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index cc9309d9..b92c11dd 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -31,7 +31,6 @@ {{ $bid->caw_name}} {{ $bid->tarikh_lelong }} - {{-- --}} diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index d3780795..6b5d4604 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -10,7 +10,7 @@

    {{ $message }}

    @endif -
    + @@ -110,36 +110,20 @@ "lengthChange": false, "pageLength": 15, dom: 'Bfrtip', - // buttons: [ - // { - // className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw', - // text: '', - // titleAttr: 'Tambah Cawangan', - // action: function ( e, dt, node, config ) { - // // alert( 'Button activated' ); - // // console.log('hye'); - - // $('#myModal').modal("show"); - // $('#myModal').on('shown.bs.modal', function () { - // $('#rolename').trigger('focus') - // }) - // } - // }, - // { - // className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - // titleAttr: 'Export to CSV', - // text: '', - // action: function ( e, dt, node, config ) { - // $("#exportform").submit(); - // } - // } - // ] + buttons: [ + + { + className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + titleAttr: 'Export to CSV', + text: '', + action: function ( e, dt, node, config ) { + $("#exportform").submit(); + } + } + ] }); - // $('.addcaw').tooltip(); - // $('.export').tooltip(); - // // $( '.dt-buttons').addClass('btn-group'); - // $( '.addcaw').removeClass('dt-button'); - // $( '.export').removeClass('dt-button'); + $('.export').tooltip(); + $( '.export').removeClass('dt-button'); @endsection diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php index 1a3482c4..502444d3 100644 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ b/resources/views/lelong/senaraibrglelong.blade.php @@ -32,14 +32,14 @@ @foreach($brglelong as $brg) - - - - - - - - + + + + + + + + @endforeach @@ -78,7 +78,7 @@ buttons: [ - { + { className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', titleAttr: 'Download to PDF', text: '', diff --git a/resources/views/lelong/senarailapbidaan.blade.php b/resources/views/lelong/senarailapbidaan.blade.php new file mode 100644 index 00000000..bb94a9b7 --- /dev/null +++ b/resources/views/lelong/senarailapbidaan.blade.php @@ -0,0 +1,113 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + {{-- --}} + @csrf + + {{-- --}} + +
    {{ $loop->iteration }} {{ $brg['norujukan']}}{{$brg['hargaasas']}}{{ $brg['keuntungan'] }}{{ $brg['jbg']}}{{ $brg['nilaimarhun']}}{{ $brg['pinjaman']}}{{ $brg['marhun']}}{{ $loop->iteration }} {{ $brg['norujukan']}}{{$brg['hargaasas']}}{{ $brg['keuntungan'] }}{{ $brg['jbg']}}{{ $brg['nilaimarhun']}}{{ $brg['pinjaman']}}{{ $brg['marhun']}}
    + + + + + + + + + + + + @foreach ($arraydetails as $laporan) + + + + + + + + + + + + + @endforeach + + + + + {{-- + --}} + + +
    NoNo RujukanHarga AsasNama PembidaHarga BidaMasa Bida
    {{ $loop->iteration }}{{ $laporan['laporan']['norujukan']}}{{ $laporan['laporan']['hargaasas']}} + @foreach($laporan['details'] as $details) + {{ $details['nama_bidder']}}
    + @endforeach +     		+ @foreach($laporan['details'] as $details) + {{ $details['hargabida']}}
    + @endforeach +     		+ @foreach($laporan['details'] as $details) + {{ $details['masa_bidaan']}}
    + @endforeach +
    JUMLAH KESELURUHAN{{ number_format($tot_hargaasas, 2, '.', ',') }}
    +
    + Kembali +
    + + + + + +@endsection diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 30292945..a8ced8f0 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -172,7 +172,7 @@ Karat Keterangan Harga - Harga + {{-- Harga --}} @@ -181,7 +181,7 @@ {{$karat->karat}} {{$karat->keterangan}} {{$karat->harga2}} - {{$karat->harga}} + {{-- {{$karat->harga}} --}} @endforeach @@ -243,14 +243,14 @@ $("td.input").each(function(index) { // console.log(index) var la = $(this).html(); - if(index%2 ==0 ) //even-0-2-4 - { + // if(index%2 ==0 ) //even-0-2-4 + // { $(this).html(""); - } - else //odd-1-3-5-7 - { - $(this).html(""); - } + // } + // else //odd-1-3-5-7 + // { + // $(this).html(""); + // } }) $("#hideform").show(); @@ -274,35 +274,35 @@ let jeniskarat = $(e).data('jeniskarat'); - let maxcolumn = 2; + // let maxcolumn = 2; let count = 0; let indexarray = 0; $("td.input").each(function(index) { if(hargaasasbaru) { $('#btnsimpan').prop('disabled', false) - if(index%2 == 0) - { - let harga1 = parseInt(hargaasasbaru); - let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']); + // if(index%2 == 0) + // { + let harga1 = parseFloat(hargaasasbaru); + let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']); let newhargaasas = harga1 + (harga2); count++; $('#harga2'+index).val(newhargaasas.toFixed(2)); - } - else - { - let harga1 = parseInt(hargaasasbaru); - let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']); - let newhargaasas = (harga1 + (harga2))/2.72;; - count++; - $('#harga'+index).val(newhargaasas.toFixed(2)); - } + // } + // else + // { + // let harga1 = parseFloat(hargaasasbaru); + // let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']); + // let newhargaasas = (harga1 + (harga2))/2.72;; + // count++; + // $('#harga'+index).val(newhargaasas.toFixed(2)); + // } - if(count == maxcolumn) - { - count = 0; + // if(count == maxcolumn) + // { + // count = 0; indexarray++; - } + // } } else { @@ -312,11 +312,11 @@ { $('#harga2'+index).val(dummy.toFixed(2)); } - else - { + // else + // { - $('#harga'+index).val(dummy.toFixed(2)); - } + // $('#harga'+index).val(dummy.toFixed(2)); + // } } }) diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index f5944d48..08af691f 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -80,7 +80,19 @@ tr:nth-child(even) { -

    + + +
    + + + @foreach ($lelongid as $tarikh) + + + @endforeach + +
    Lelong ID: {{$lelong_id}}Tarikh Lelong: {{ $tarikh->tarikh_lelong }}
    + +
    diff --git a/resources/views/pdf/marhundetails.blade.php b/resources/views/pdf/marhundetails.blade.php index 2419e9cd..c39ca0c6 100644 --- a/resources/views/pdf/marhundetails.blade.php +++ b/resources/views/pdf/marhundetails.blade.php @@ -85,14 +85,14 @@ tr:nth-child(even) { - + - + - + @@ -128,14 +128,12 @@ tr:nth-child(even) { - + - - {{-- --}} @endforeach @foreach ($arraycaw as $index=>$caw) @@ -147,8 +145,6 @@ tr:nth-child(even) { - - {{-- --}} @endforeach
    NoNo Rujukan No Rujukan Jenis Marhun Karat Berat(gm) Harga(RM)Nilai Marhun(RM)Nilai Marhun(RM) Harga Asas(RM)NotaNota
    Jumlah {{ number_format($marhun['berat'], 2, '.', ',') }} {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} {{ number_format($marhun['hargaasas'], 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }}
    {{ number_format($total_nmarhun, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }}
    @@ -159,3 +155,19 @@ tr:nth-child(even) { +@foreach ($laporanpembida as $laporan) + + {{ $loop->iteration }} + {{ $laporan['norujukan'] }} + @foreach ($laporan['details'] as $item) + {{ $item['nilaimarhun'] }}
    + @endforeach + @foreach ($laporan['details'] as $item) + {{ $item['nama_bidder'] }}
    + @endforeach + @foreach ($laporan['details'] as $item) + {{ $item['hargabida'] }}
    + @endforeach + @foreach ($laporan['details'] as $item) + {{ $item['masa_bidaan'] }}
    + @endforeach \ No newline at end of file diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 22e3f250..2809c818 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -168,7 +168,6 @@ Karat Keterangan Harga - Harga @@ -177,7 +176,7 @@ {{$karat->karat}} {{$karat->keterangan}} {{$karat->harga2}} - {{$karat->harga}} + {{-- --}} @endforeach @@ -234,14 +233,14 @@ $("td.input").each(function(index) { // console.log(index) var la = $(this).html(); - if(index%2 ==0 ) //even-0-2-4 - { + // if(index%2 ==0 ) //even-0-2-4 + // { $(this).html(""); - } - else //odd-1-3-5-7 - { - $(this).html(""); - } + // } + // else //odd-1-3-5-7 + // { + // $(this).html(""); + // } }) $("#hideform").show(); @@ -264,49 +263,49 @@ let jeniskarat = $(e).data('jeniskarat'); - let maxcolumn = 2; + // let maxcolumn = 2; let count = 0; let indexarray = 0; $("td.input").each(function(index) { if(hargaasasbaru) { $('#btnsimpan').prop('disabled', false) - if(index%2 == 0) - { - let harga1 = parseInt(hargaasasbaru); - let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']); + // if(index%2 == 0) + // { + let harga1 = parseFloat(hargaasasbaru); + let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']); let newhargaasas = harga1 + (harga2); count++; $('#harga2'+index).val(newhargaasas.toFixed(2)); - } - else - { - let harga1 = parseInt(hargaasasbaru); - let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']); - let newhargaasas = (harga1 + (harga2))/2.72;; - count++; - $('#harga'+index).val(newhargaasas.toFixed(2)); - } + // } + // else + // { + // let harga1 = parseFloat(hargaasasbaru); + // let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']); + // let newhargaasas = (harga1 + (harga2));; + // count++; + // $('#harga2'+index).val(newhargaasas.toFixed(2)); + // } - if(count == maxcolumn) - { - count = 0; + // if(count == maxcolumn) + // { + // count = 0; indexarray++; - } + // } } else { $('#btnsimpan').prop('disabled', true) let dummy =0; - if(index%2 == 0) - { + // if(index%2 == 0) + // { $('#harga2'+index).val(dummy.toFixed(2)); - } - else - { + // } + // else + // { - $('#harga'+index).val(dummy.toFixed(2)); - } + // $('#harga'+index).val(dummy.toFixed(2)); + // } } }) diff --git a/routes/web.php b/routes/web.php index 2dfb140b..c2328241 100644 --- a/routes/web.php +++ b/routes/web.php @@ -78,27 +78,25 @@ Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], functio Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:pendaftaranbatch']], function () { - Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); - Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']); - Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']); - Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']); - Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); - Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); - Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); - Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); - Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); - Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); - Route::get('/laporansenarailelong',['as'=>'lelong.laporansenarailelong','uses'=>'LelongController@laporansenarailelong']); - Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); - Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); + Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); + Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']); + Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']); + Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']); + Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); + Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); + Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); + Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); + Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); + Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/laporansenarailelong',['as'=>'lelong.laporansenarailelong','uses'=>'LelongController@laporansenarailelong']); + Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); + Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); + Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); + Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); + Route::get('/lapbidaan', ['as'=>'lelong.lapbidaan','uses'=>'LelongController@lapbidaan']); + Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']); - - - - Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); - Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); - }); Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () { @@ -205,3 +203,5 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f }); + + diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/storage/debugbar/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From a41155d076cf41e94aa2cbf5b0898e564b7fee8f Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Mon, 11 Apr 2022 15:18:00 +0800 Subject: [PATCH 4/6] pdf(senarai laporan bidaan, senarai lelong tak laku) --- app/Http/Controllers/LelongController.php | 95 +++++++- app/Http/Controllers/NotisController.php | 3 +- .../views/excel/listnotis_excel.blade.php | 5 +- .../views/jananotis/senarainotis.blade.php | 13 +- .../views/lelong/lelongtaklaku.blade.php | 223 +++++++++--------- .../views/lelong/senaraibrglelong.blade.php | 4 +- .../views/lelong/senarailapbidaan.blade.php | 23 +- .../views/pdf/pdflelongtaklaku.blade.php | 162 +++++++++++++ .../views/pdf/pdfsenarailapbidaan.blade.php | 153 ++++++++++++ routes/web.php | 2 + 10 files changed, 542 insertions(+), 141 deletions(-) create mode 100644 resources/views/pdf/pdflelongtaklaku.blade.php create mode 100644 resources/views/pdf/pdfsenarailapbidaan.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index acefb60d..992ebec0 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -627,7 +627,54 @@ class LelongController extends Controller $lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku); } - return view('lelong.lelongtaklaku',compact('lelongtaklaku')); + return view('lelong.lelongtaklaku',compact('lelongtaklaku','lelong_id')); + } + + public function pdflelongtaklaku (Request $request){ + + $lelong_id = $request->lelongid; + + $infolelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->get(); + + $lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') + ->where('status_jual', 0) + ->where('lelongbid.lelong_id', $lelong_id) + ->whereNull('t_jual') + ->select( + 'lelongbid.norujukan', + 'lelongbid.t_lelong', + 'lelongbid.kodcaw', + 'cawangan.caw_name', + 'lelongbid.pinjaman', + 'lelongbid.berat', + 'lelongbid.nilaimarhun', + 'lelongbid.hargaasas', + 'lelongbid.upahsimpan', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.status_jual', + ) + ->get(); + + foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){ + + $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('status_jual', '=', 1) + ->whereNull('t_jual') + ->get(); + + $lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku); + } + + + $pdf = PDF::loadView('pdf.pdflelongtaklaku',compact('lelongtaklaku','lelong_id','infolelong')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Lelong Tak Laku.pdf'); } public function senaraipemenang($lelong_id){ @@ -787,6 +834,8 @@ class LelongController extends Controller public function lapbidaan (Request $request){ + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->get(); @@ -797,7 +846,8 @@ class LelongController extends Controller public function senarailapbidaan ($lelong_id){ - $arraydetails = []; + + $arraydetails = []; $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') ->select('lelongbid_id','norujukan','hargaasas') @@ -816,12 +866,51 @@ class LelongController extends Controller array_push($arraydetails,['laporan' => $laporan,'details' => $details]); } - return view('lelong.senarailapbidaan', compact('arraydetails')); + return view('lelong.senarailapbidaan', compact('arraydetails','lelong_id')); } + Public function pdfsenarailapbidaan (Request $request){ + + $lelong_id = $request->lelongid; + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->get(); + + + $arraydetails = []; + + $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->select('lelongbid_id','norujukan','hargaasas') + ->where('lelongbid.lelong_id','=',$lelong_id) + ->groupBy('lelongbid_id') + ->get() + ->toArray(); + + foreach($laporanpembida as $laporan) + { + $details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id']) + ->orderBy('hargabida','desc') + ->orderBy('masa_bidaan','asc') + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + + + $pdf = PDF::loadView('pdf.pdfsenarailapbidaan',compact('arraydetails','lelong_id','lelongid')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Nama Bidaan Pembida.pdf'); + + + } + } diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index 6700cbfa..ec60ff87 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -136,11 +136,12 @@ class NotisController extends Controller if($request->type == 'excel') { return view('excel.listnotis_excel',compact('payment','caw','lelong_id','bayaran')); + } else { $pdf = PDF::loadView('pdf.listnotis',compact('payment','caw','lelong_id','bayaran')) - ->setPaper('a4', 'landscape'); + ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Notis.pdf'); } diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php index 8e985d83..ae18f3b8 100644 --- a/resources/views/excel/listnotis_excel.blade.php +++ b/resources/views/excel/listnotis_excel.blade.php @@ -94,11 +94,12 @@ diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php index 3627708f..89a91cc1 100644 --- a/resources/views/jananotis/senarainotis.blade.php +++ b/resources/views/jananotis/senarainotis.blade.php @@ -38,7 +38,7 @@ {{ $notis['nokp']}} {{ $notis['pinjaman']}} {{ $notis['bakiupah']}} - {{ $bayaran}} + {{ $bayaran}} @endforeach @@ -55,6 +55,7 @@ "columnDefs": [ { "targets": 0, + "target": '_blank', "orderable": false }, { @@ -71,18 +72,20 @@ buttons: [ { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + className: 'btn btn-outline-success pl-4 pr-4 btn-sm export', + target: "_blank", titleAttr: 'Export to Excel', - text: '', + text: 'EXCEL', action: function ( e, dt, node, config ) { $('#typedonwload').val('excel'); $("#exportpdf").submit(); + // window.open("_blank"); } }, { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export', titleAttr: 'Export to PDF', - text: '', + text: 'PDF', action: function ( e, dt, node, config ) { $('#typedonwload').val('pdf'); $("#exportpdf").submit(); diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index 6b5d4604..851d4a61 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -1,129 +1,126 @@ @extends('layouts.app') @section('content') -
    + @if ($message = Session::get('success')) -
    -

    {{ $message }}

    -
    - @endif - - - - - - - - - - - - - - - - - - - - - - - - - @foreach ($lelongtaklaku as $leltaklaku) - - - - - - - - - - - - - baki, '-') !== false) - { - $rugi = $leltaklaku->baki; - } - else { - $baki = $leltaklaku->baki; - } - ?> - - - @if($leltaklaku->status_jual == 0) - - @endif - - - - - @endforeach - - +
    +

    {{ $message }}

    +
    + @endif + + @csrf + + + +
    NoTarikh LelongNo RujukanNama CawanganBilanganPinjaman (RM)Berat (gm)Nilai Marhun (RM)Harga Asas (RM)Upah Simpan (RM)Caj Lelong (RM)Rugi Lelong (RM)Baki Lelong (RM)Status Lelong (RM)Status Laporan Lelong (RM)Action
    {{ $loop->iteration }}{{ $leltaklaku->t_lelong }}{{ $leltaklaku->norujukan }}{{ $leltaklaku->caw_name }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }}{{ $leltaklaku->berat }}{{ $leltaklaku->nilaimarhun }}{{ $leltaklaku->hargaasas }}{{ $leltaklaku->upahsimpan }}{{ $leltaklaku->cajlelong }}{{$rugi}}{{$baki}}TIDAK LAKU - - - -
    + + + + + + + + + + + + + + + + + + + + + @foreach ($lelongtaklaku as $leltaklaku) + + + + + + + + + + + + + baki, '-') !== false) + { + $rugi = $leltaklaku->baki; + } + else { + $baki = $leltaklaku->baki; + } + ?> + + + @if($leltaklaku->status_jual == 0) + + @endif + + + + @endforeach + + +
    NoTarikh LelongNo RujukanNama CawanganBilanganPinjaman (RM)Berat (gm)Nilai Marhun (RM)Harga Asas (RM)Upah Simpan (RM)Caj Lelong (RM)Rugi Lelong (RM)Baki Lelong (RM)Status Lelong (RM)Action
    {{ $loop->iteration }}{{ $leltaklaku->t_lelong }}{{ $leltaklaku->norujukan }}{{ $leltaklaku->caw_name }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }}{{ $leltaklaku->berat }}{{ $leltaklaku->nilaimarhun }}{{ $leltaklaku->hargaasas }}{{ $leltaklaku->upahsimpan }}{{ $leltaklaku->cajlelong }}{{$rugi}}{{$baki}}TIDAK LAKU + +
    - -
    - Kembali +
    + Kembali +
    +
    + + + + ] + + }); + + $('.export').tooltip(); + $( '.export').removeClass('dt-button'); + + + + @endsection diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php index 502444d3..31c4aed7 100644 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ b/resources/views/lelong/senaraibrglelong.blade.php @@ -80,8 +80,8 @@ { className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - titleAttr: 'Download to PDF', - text: '', + // titleAttr: 'Download to PDF', + text: 'PDF', action: function ( e, dt, node, config ) { $("#exportform").submit(); } diff --git a/resources/views/lelong/senarailapbidaan.blade.php b/resources/views/lelong/senarailapbidaan.blade.php index bb94a9b7..b920a256 100644 --- a/resources/views/lelong/senarailapbidaan.blade.php +++ b/resources/views/lelong/senarailapbidaan.blade.php @@ -10,10 +10,10 @@

    {{ $message }}

    @endif - {{--
    --}} + @csrf - {{-- --}} + @@ -22,8 +22,8 @@ - - + + @@ -48,19 +48,12 @@ {{ $details['masa_bidaan']}}
    @endforeach - - - + @endforeach - - - {{-- - --}} - - +
    No Rujukan Harga Asas Nama PembidaHarga BidaMasa BidaHarga Bidaan(RM)Masa Bidaan
    JUMLAH KESELURUHAN{{ number_format($tot_hargaasas, 2, '.', ',') }}
    Kembali @@ -90,9 +83,9 @@ { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export', titleAttr: 'Download to PDF', - text: '', + text: 'PDF', action: function ( e, dt, node, config ) { $("#exportform").submit(); } diff --git a/resources/views/pdf/pdflelongtaklaku.blade.php b/resources/views/pdf/pdflelongtaklaku.blade.php new file mode 100644 index 00000000..9729edf4 --- /dev/null +++ b/resources/views/pdf/pdflelongtaklaku.blade.php @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN SENARAI BIDAAN PEMBIDA
    + + + +
    + + + @foreach ($infolelong as $info) + + + + @endforeach + + +
    Lelong ID: {{$lelong_id}}Cawangan:{{ $info->caw_name}}Tarikh Lelong:{{ $info->tarikh_lelong}}
    + +
    + + + + + + + + + + + + + + + + + > + + + + + @foreach ($lelongtaklaku as $leltaklaku) + + + + + + + + + + + baki, '-') !== false) + { + $rugi = $leltaklaku->baki; + } + else { + $baki = $leltaklaku->baki; + } + ?> + + + + @endforeach + + +
    NoNo RujukanBilanganPinjaman(RM)Berat(gm)Nilai Marhun(RM)Harga Asas(RM)Upah Simpan(RM)Caj Lelong(RM)Rugi Lelong(RM)Baki Lelong(RM)
    {{ $loop->iteration }}{{ $leltaklaku->norujukan }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }}{{ $leltaklaku->berat }}{{ $leltaklaku->nilaimarhun }}{{ $leltaklaku->hargaasas }}{{ $leltaklaku->upahsimpan }}{{ $leltaklaku->cajlelong }}{{$rugi}}{{$baki}}
    + + + + + + + + + diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php new file mode 100644 index 00000000..b9ca7764 --- /dev/null +++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN SENARAI BIDAAN PEMBIDA
    + + + +
    + + + @foreach ($lelongid as $info) + + + + @endforeach + + +
    Lelong ID: {{$lelong_id}}Cawangan:{{ $info->caw_name}}Tarikh Lelong:{{ $info->tarikh_lelong}}
    + +
    + + + + + + + + + + + + + + + @foreach ($arraydetails as $laporan) + + + + + + + + + + + @endforeach + + +
    NoNo RujukanHarga Asas(RM)Nama PembidaHarga Bidaan(RM)Masa Bidaan
    {{ $loop->iteration }}{{ $laporan['laporan']['norujukan']}}{{ $laporan['laporan']['hargaasas']}} + @foreach($laporan['details'] as $details) + {{ $details['nama_bidder']}}
    + @endforeach +     		+ @foreach($laporan['details'] as $details) + {{ $details['hargabida']}}
    + @endforeach +     		+ @foreach($laporan['details'] as $details) + {{ $details['masa_bidaan']}}
    + @endforeach +
    + + + + + + + + + diff --git a/routes/web.php b/routes/web.php index c2328241..6bf71fae 100644 --- a/routes/web.php +++ b/routes/web.php @@ -84,6 +84,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']); Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); + Route::post('/pdflelongtaklaku',['as'=>'lelong.pdflelongtaklaku','uses'=>'LelongController@pdflelongtaklaku']); Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); @@ -95,6 +96,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); Route::get('/lapbidaan', ['as'=>'lelong.lapbidaan','uses'=>'LelongController@lapbidaan']); Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']); + Route::post('/pdfsenarailapbidaan',['as' =>'lelong.pdfsenarailapbidaan','uses'=>'LelongController@pdfsenarailapbidaan']); }); From 0090307e3556f5241bf2be08f7079454f9e94b51 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 12 Apr 2022 11:38:59 +0800 Subject: [PATCH 5/6] jumlah keseluruhan lelong tak laku, pdf lelong tk laku --- app/Http/Controllers/LelongController.php | 53 +++++++++++++-- .../views/lelong/lelongtaklaku.blade.php | 31 ++++++++- .../views/pdf/pdflelongtaklaku.blade.php | 64 ++++++++++++++----- 3 files changed, 124 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 992ebec0..3641d8c0 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -596,6 +596,15 @@ class LelongController extends Controller public function lelongtaklaku($lelong_id){ + $total_pinjaman = 0; + $total_berat = 0; + $total_nmarhun = 0; + $total_hargaasas = 0; + $total_upahsimpan = 0; + $total_cajlelong = 0; + $total_bakirugi = 0; + + $lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') ->where('status_jual', 0) ->where('lelongbid.lelong_id', $lelong_id) @@ -626,14 +635,32 @@ class LelongController extends Controller $lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku); } + + $total_pinjaman = $total_pinjaman + ($lelongtaklaku->sum('pinjaman')); + $total_berat = $total_berat + ($lelongtaklaku->sum('berat')); + $total_nmarhun = $total_nmarhun + ($lelongtaklaku->sum('nilaimarhun')); + $total_hargaasas = $total_hargaasas + ($lelongtaklaku->sum('hargaasas')); + $total_upahsimpan = $total_upahsimpan + ($lelongtaklaku->sum('upahsimpan')); + $total_cajlelong = $total_cajlelong + ($lelongtaklaku->sum('cajlelong')); + $total_bakirugi = $total_bakirugi + ($lelongtaklaku->sum('baki')); - return view('lelong.lelongtaklaku',compact('lelongtaklaku','lelong_id')); + return view('lelong.lelongtaklaku',compact('lelongtaklaku','lelong_id','total_pinjaman', + 'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi')); } public function pdflelongtaklaku (Request $request){ $lelong_id = $request->lelongid; + + $total_pinjaman = 0; + $total_berat = 0; + $total_nmarhun = 0; + $total_hargaasas = 0; + $total_upahsimpan = 0; + $total_cajlelong = 0; + $total_bakirugi = 0; + $infolelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) @@ -659,7 +686,7 @@ class LelongController extends Controller ) ->get(); - foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){ + foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){ $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') ->where('lelongbid.lelong_id', $lelong_id) @@ -667,12 +694,27 @@ class LelongController extends Controller ->whereNull('t_jual') ->get(); + + $lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku); + } + $total_pinjaman = $total_pinjaman + ($lelongtaklaku->sum('pinjaman')); + $total_berat = $total_berat + ($lelongtaklaku->sum('berat')); + $total_nmarhun = $total_nmarhun + ($lelongtaklaku->sum('nilaimarhun')); + $total_hargaasas = $total_hargaasas + ($lelongtaklaku->sum('hargaasas')); + $total_upahsimpan = $total_upahsimpan + ($lelongtaklaku->sum('upahsimpan')); + $total_cajlelong = $total_cajlelong + ($lelongtaklaku->sum('cajlelong')); + $total_bakirugi = $total_bakirugi + ($lelongtaklaku->sum('baki')); + - $pdf = PDF::loadView('pdf.pdflelongtaklaku',compact('lelongtaklaku','lelong_id','infolelong')) - ->setPaper('a4', 'potrait'); + // dd($total_pinjaman); + + + $pdf = PDF::loadView('pdf.pdflelongtaklaku',compact('lelongtaklaku','lelong_id','infolelong','total_pinjaman', + 'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi')) + ->setPaper('a4', 'landscape'); return $pdf->download('Senarai Lelong Tak Laku.pdf'); } @@ -907,11 +949,8 @@ class LelongController extends Controller ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Nama Bidaan Pembida.pdf'); - } - - } \ No newline at end of file diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index 851d4a61..3de4216b 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -73,6 +73,35 @@ @endforeach + + + JUMLAH KESELURUHAN + {{ number_format($total_pinjaman, 2, '.', ',') }} + {{ number_format($total_berat, 2, '.', ',') }} + {{ number_format($total_nmarhun, 2, '.', ',') }} + {{ number_format($total_hargaasas, 2, '.', ',') }} + {{ number_format($total_upahsimpan, 2, '.', ',') }} + {{ number_format($total_cajlelong, 2, '.', ',') }} + total_bakirugi, '-') !== false) + { + $total_baki = $total_bakirugi; + + } + else { + $total_rugi = $total_bakirugi; + + } + ?> + {{number_format($total_rugi, 2, '.', ',')}} + {{number_format($total_baki, 2, '.', ',')}} + + + + +
    @@ -97,7 +126,7 @@ "info": false, "lengthChange": false, - "pageLength": 15, + "pageLength": 999999999, dom: 'Bfrtip', buttons: [ diff --git a/resources/views/pdf/pdflelongtaklaku.blade.php b/resources/views/pdf/pdflelongtaklaku.blade.php index 9729edf4..ce74b892 100644 --- a/resources/views/pdf/pdflelongtaklaku.blade.php +++ b/resources/views/pdf/pdflelongtaklaku.blade.php @@ -75,13 +75,13 @@ tr:nth-child(even) { - +
    - +

    PERMODALAN KELANTAN BERHAD
    LAPORAN SENARAI BIDAAN PEMBIDALAPORAN SENARAI LELONG TAK LAKU
    @@ -106,23 +106,23 @@ tr:nth-child(even) { - No - No Rujukan - Bilangan + No + No Rujukan + Bilangan Pinjaman(RM) - Berat(gm) - Nilai Marhun(RM) - Harga Asas(RM) - Upah Simpan(RM) - Caj Lelong(RM) - Rugi Lelong(RM) - Baki Lelong(RM) + Berat(gm) + Nilai Marhun(RM) + Harga Asas(RM) + Upah Simpan(RM) + Caj Lelong(RM) + Rugi Lelong(RM) + Baki Lelong(RM) > - @foreach ($lelongtaklaku as $leltaklaku) + @foreach ($lelongtaklaku as $leltaklaku) {{ $loop->iteration }} {{ $leltaklaku->norujukan }} @@ -146,11 +146,43 @@ tr:nth-child(even) { ?> {{$rugi}} {{$baki}} - - @endforeach + + + + + @endforeach + + + + + Jumlah Keseluruhan + {{ number_format($total_pinjaman, 2, '.', ',') }} + {{ number_format($total_berat, 2, '.', ',') }} + {{ number_format($total_nmarhun, 2, '.', ',') }} + {{ number_format($total_hargaasas, 2, '.', ',') }} + {{ number_format($total_upahsimpan, 2,'.',',') }} + {{ number_format($total_cajlelong, 2,'.',',') }} + total_bakirugi, '-') !== false) + { + $total_baki = $total_bakirugi; + + } + else { + $total_rugi = $total_bakirugi; + + } + ?> + {{number_format($total_rugi, 2, '.', ',')}} + {{number_format($total_baki, 2, '.', ',')}} + + - + + From 0158fa195da11831639992a24c56d01117873a03 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 13 Apr 2022 10:45:01 +0800 Subject: [PATCH 6/6] update lap lelong full --- app/Http/Controllers/LelongController.php | 69 ++++++++++- resources/views/includes/sidebar.blade.php | 13 +- resources/views/lelong/laplelong.blade.php | 117 ++++++++++++++++++ .../views/lelong/laplelongindex.blade.php | 73 +++++++++++ .../views/lelong/laporanbidaanindex.blade.php | 2 +- .../views/lelong/senaraibrglelong.blade.php | 18 ++- .../views/lelong/senarailapbidaan.blade.php | 2 +- routes/web.php | 15 ++- 8 files changed, 287 insertions(+), 22 deletions(-) create mode 100644 resources/views/lelong/laplelong.blade.php create mode 100644 resources/views/lelong/laplelongindex.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 3641d8c0..6617f9d2 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -795,7 +795,7 @@ class LelongController extends Controller } - public function laporansenarailelong(Request $request){ + public function lapbrglelongindex (Request $request){ // $user = Auth::user(); @@ -815,19 +815,28 @@ class LelongController extends Controller ->get()->toArray(); $keuntungan=0; - + $total_hargaasas = 0; + $total_upahkeuntungan = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + foreach($brglelong as $index1=>$upah) { - + $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir'])-(($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); $brglelong[$index1]['keuntungan'] = $keuntungan; - + + $total_hargaasas = $total_hargaasas + $upah['hargaasas']; + $total_upahkeuntungan = $total_upahkeuntungan + $keuntungan; + $total_nmarhun = $total_nmarhun + $upah['nilaimarhun']; + $total_pinjaman = $total_pinjaman + $upah['pinjaman']; + } - return view('lelong.senaraibrglelong',compact('brglelong','lelong_id','keuntungan')); + return view('lelong.senaraibrglelong',compact('brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman')); } @@ -874,7 +883,7 @@ class LelongController extends Controller } - public function lapbidaan (Request $request){ + public function lapbidaanpembidaindex (Request $request){ @@ -951,6 +960,54 @@ class LelongController extends Controller return $pdf->download('Senarai Nama Bidaan Pembida.pdf'); } + + Public function laplelongindex (Request $request){ + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->get(); + + return view('lelong.laplelongindex',compact('lelongid')); + + + } + + Public function laplelong ($lelong_id){ + + + $total_nmarhun = 0; + $total_pembiayaan = 0; + $total_upahsimpan = 0; + $total_cajlelong = 0; + $total_hargalelong = 0; + $total_bakirugi = 0; + $total_hargaasas = 0; + + $laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id','=',$lelong_id) + ->where('lelongbidder.status_bidder','=','1') + ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan', + 'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder') + ->get()->toArray(); + + foreach($laporanlelong as $index1=>$laplelong) + { + + $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; + $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; + $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan']; + $total_cajlelong = $total_cajlelong + $laplelong['cajlelong']; + $total_hargalelong = $total_hargalelong $laplelong['hargabida']; + $total_bakirugi = $total_bakirugi + $laplelong['baki']; + $total_hargaasas = $total_hargaasas + $laplelong['hargaasas']; + + } + + + return view('lelong.laplelong', compact('laporanlelong','lelong_id','total_nmarhun')); + + + } } \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d8812d1a..7994b3f1 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -139,13 +139,18 @@
  • +
    • diff --git a/resources/views/lelong/laplelong.blade.php b/resources/views/lelong/laplelong.blade.php new file mode 100644 index 00000000..4c4b1e48 --- /dev/null +++ b/resources/views/lelong/laplelong.blade.php @@ -0,0 +1,117 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + @csrf + + + + + + + + + + + + + + + + + + + + + @foreach ($laporanlelong as $laporan) + + + + + + + + + + + + + + + + @endforeach + + + + + + + {{-- + + + --}} + + + + + + +
    NoNo RujukanNilai MarhunPembiayaanUpah SimpanCaj LelongHarga LelongBaki RugiHarga AsasNama Pembeli
    {{ $loop->iteration }}{{ $laporan['norujukan']}}{{ $laporan['nilaimarhun']}}{{ $laporan['pinjaman']}}{{ $laporan['upahsimpan']}}{{ $laporan['cajlelong']}}{{ $laporan['hargabida']}}{{ $laporan['baki']}}{{ $laporan['hargaasas']}}{{ $laporan['nama_bidder']}}
    JUMLAH KESELURUHAN{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_upahkeuntungan, 2, '.', ',') }}{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}
    +
    + Kembali +
    +
    +
    +
    + + +@endsection diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php new file mode 100644 index 00000000..7d38fb82 --- /dev/null +++ b/resources/views/lelong/laplelongindex.blade.php @@ -0,0 +1,73 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + + @foreach ($lelongid as $bid) + + + + + + + + @endforeach + + +
    Lelong IDCawanganTarikh LelongAction
    {{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }} + +
    + +
    + +
    +
    + + +@endsection diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php index 1d88ddfe..3d2a68e5 100644 --- a/resources/views/lelong/laporanbidaanindex.blade.php +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -31,7 +31,7 @@ {{ $bid->caw_name}} {{ $bid->tarikh_lelong }} - + @endforeach diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php index 31c4aed7..bb269bbf 100644 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ b/resources/views/lelong/senaraibrglelong.blade.php @@ -46,13 +46,19 @@ - {{-- JUMLAH KESELURUHAN - {{ number_format($tot_hargaasas, 2, '.', ',') }} --}} + JUMLAH KESELURUHAN + {{ number_format($total_hargaasas, 2, '.', ',') }} + {{ number_format($total_upahkeuntungan, 2, '.', ',') }} + + {{ number_format($total_nmarhun, 2, '.', ',') }} + {{ number_format($total_pinjaman, 2, '.', ',') }} + +
    - Kembali + Kembali
    @@ -73,14 +79,14 @@ "info": false, "lengthChange": false, - "pageLength": 15, + "pageLength": 999999999, dom: 'Bfrtip', buttons: [ { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - // titleAttr: 'Download to PDF', + className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export', + titleAttr: 'Download to PDF', text: 'PDF', action: function ( e, dt, node, config ) { $("#exportform").submit(); diff --git a/resources/views/lelong/senarailapbidaan.blade.php b/resources/views/lelong/senarailapbidaan.blade.php index b920a256..74687603 100644 --- a/resources/views/lelong/senarailapbidaan.blade.php +++ b/resources/views/lelong/senarailapbidaan.blade.php @@ -56,7 +56,7 @@
    - Kembali + Kembali
    diff --git a/routes/web.php b/routes/web.php index 6bf71fae..300581f3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -89,15 +89,22 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); - Route::get('/laporansenarailelong',['as'=>'lelong.laporansenarailelong','uses'=>'LelongController@laporansenarailelong']); - Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); - Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); - Route::get('/lapbidaan', ['as'=>'lelong.lapbidaan','uses'=>'LelongController@lapbidaan']); + + + Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']); + Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); + Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); + + Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']); Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']); Route::post('/pdfsenarailapbidaan',['as' =>'lelong.pdfsenarailapbidaan','uses'=>'LelongController@pdfsenarailapbidaan']); + Route::get('/laplelongindex',['as' =>'lelong.laplelongindex','uses'=>'LelongController@laplelongindex']); + Route::get('/laplelong/{lelong_id}',['as' =>'lelong.laplelong','uses'=>'LelongController@laplelong']); + + });