From 306c43c310ce275a1a89746f2eb97302ac9d7cfd Mon Sep 17 00:00:00 2001 From: fifi97 <46933637+fifi97@users.noreply.github.com> Date: Wed, 2 Feb 2022 02:59:36 +0800 Subject: [PATCH] fix notisLelong --- app/Http/Controllers/KhazanahController.php | 8 +- app/Http/Controllers/LelongController.php | 6 +- .../views/homepage/khazanah/home.blade.php | 2 +- .../views/khazanah/laporan/index.blade.php | 3 +- .../views/khazanah/laporan/lelongan.blade.php | 6 ++ resources/views/khazanah/lelong.blade.php | 90 +++++++++++++++++-- resources/views/print/notislelong.blade.php | 47 +++++----- 7 files changed, 122 insertions(+), 40 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 648d07c..bbf648d 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1581,7 +1581,7 @@ class KhazanahController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $senaraibatch = Http::get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'])->json(); - return view('khazanah.laporan.lelongan',compact('cawangan_info','api_url','senaraibatch')); + return view('lelongan.lelongan',compact('cawangan_info','api_url','senaraibatch')); } public function cetaklaporanLelongan(Request $request){ @@ -1612,12 +1612,14 @@ class KhazanahController extends Controller }else if($request->jeniscetakan === 'pdf'){ $lelong = Http::get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json(); + $notislelong = Http::get(config('api.url'). '/api/details/notislelong/'. $auth_user['cawangan'])->json(); $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]; - - $pdf=PDF::loadView('print.notislelong', compact('cawangan_info','api_url','cawangan_detail','lelong','tarikh_cetak'))->setPaper('A4','potrait'); + // return view('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak')); + + $pdf=PDF::loadView('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak'))->setPaper('A4','potrait'); return $pdf->download('notislelong_'.$tarikh_cetak.'.pdf'); // return $pdf->stream('notislelong_'.$tarikh_cetak.'.pdf'); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index b785ae0..7e35f88 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -38,10 +38,12 @@ class LelongController extends Controller } public function lelong(){ - $api_url = config('api.url'); $auth_user = Auth::user(); + $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('khazanah.lelong',compact('cawangan_info','api_url')); + $senaraibatch = Http::get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'])->json(); + + return view('khazanah.lelong',compact('cawangan_info','api_url','senaraibatch')); } public function resittuntutbaki($norujukan){ diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index d2252af..e3a2147 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -203,7 +203,7 @@ Capaian
- Lelong + Lelong
Perbelanjaan diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index 8b857ba..b4094f1 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -20,7 +20,8 @@ Gadaian
- Lelongan + {{-- Lelongan --}} + Lelongan
Pelanggan Baru diff --git a/resources/views/khazanah/laporan/lelongan.blade.php b/resources/views/khazanah/laporan/lelongan.blade.php index d087f02..5984e56 100644 --- a/resources/views/khazanah/laporan/lelongan.blade.php +++ b/resources/views/khazanah/laporan/lelongan.blade.php @@ -23,6 +23,7 @@
+ @if(sizeof($senaraibatch) !== 0) @@ -49,6 +50,11 @@ @endforeach
+ @else + + @endif
diff --git a/resources/views/khazanah/lelong.blade.php b/resources/views/khazanah/lelong.blade.php index 87fbe69..0d88dda 100644 --- a/resources/views/khazanah/lelong.blade.php +++ b/resources/views/khazanah/lelong.blade.php @@ -2,16 +2,68 @@ @section('content')
-
+
-
{{ __('Lelong') }}
+ + +
+
+
+
+
+
+
+
+
+ + @if(sizeof($senaraibatch) !== 0) + + + + + + + + + + + + @foreach($senaraibatch as $index=>$sb) + + + + + + + + @endforeach + +
No.Batch No.Bilangan AktifTarikh LelongAction
{{ $loop->iteration }}{{ $sb['batchno'] }}{{ $sb['total'] }}{{ $sb['t_lelong'] }} + Cetak + Excel + PDF +
+ @else + + @endif + +
+
+
+
+ +
+
+
-
-
Tarikh Lelong
-
- -
@@ -20,5 +72,27 @@
-@endsection \ No newline at end of file +@endsection + diff --git a/resources/views/print/notislelong.blade.php b/resources/views/print/notislelong.blade.php index c891656..f38a8e5 100644 --- a/resources/views/print/notislelong.blade.php +++ b/resources/views/print/notislelong.blade.php @@ -7,7 +7,7 @@ #header td, #customers th { - padding:4px; + padding-left:4px; font-size:12px; } @@ -19,7 +19,7 @@ /* padding-top: 12px; padding-bottom: 12px; */ text-align: left; - padding:4px; + /* padding:4px; */ color:black; } @@ -130,28 +130,28 @@ {{ $cawangan_detail['namacaw'] }} - {{ $cawangan_detail['alamat1'] }} + {{ $cawangan_detail['alamat1'] }} - {{ $cawangan_detail['alamat2'] }} + {{ $cawangan_detail['alamat2'] }} - {{ ' No Tel : '. $cawangan_detail['notel'] . ' No Faks : '. $cawangan_detail['nofaks'] }} + {{ ' No Tel : '. $cawangan_detail['notel'] . ' No Faks : '. $cawangan_detail['nofaks'] }} -

+
- - - + - - + + - - - + + + - - - + + +
TARIKH CETAK + TARIKH CETAK :@php + :@php $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); $datez = $myDateTime->format('d-m-Y'); echo($datez); @@ -167,24 +167,22 @@ : {{ $lel['norujukan'] }} NO TELEFON:NO TELEFON: {{ $lel['telefon1'] }}
KEPADA:{{ $lel['nama'] }}
{{ strtoupper($lel['alamat']) }}
{{ ' ' . $lel['poskod'] . ' ' . strtoupper($lel['daerah']) . ' ' . strtoupper($lel['negeri'])}}		KEPADA:{{ $lel['nama'] }}
{{ strtoupper($lel['alamat']) }} {!! ($lel['alamat2'] === null || $lel['alamat2'] === '') ? '' : '
' . strtoupper($lel['alamat2']) !!}
{{ ' ' . $lel['poskod'] . ' ' . strtoupper($lel['daerah']) . ' ' . strtoupper($lel['negeri'])}}		 NO K/P: {{ $lel['IC'] }}NO K/P: {{ $lel['IC'] }}
-
-

Tuan/Puan,

LELONGAN BARANGAN GADAIAN SECARA TENDER PADA @php @@ -229,14 +227,13 @@ @endphp:-

{{-- Customise Ayat pelelong--}} -

1. Tebus sepenuhnya

+ {{-- {!! nl2br(e($notislelong[0]['para2'])) !!} --}} + @php echo $notislelong[0]['para2']; @endphp + {{--

1. Tebus sepenuhnya

2. Tebus gadai semula

-

2. Bayar upah sepenuhnya dan tempoh akan dilanjutkan sehingga 12 bulan bagi tempoh gadaian.

-
+

2. Bayar upah sepenuhnya dan tempoh akan dilanjutkan sehingga 12 bulan bagi tempoh gadaian.

--}} {{-- Customise Ayat pelelong --}} -

Sekiranya tuan/puan masih tidak berurusan sehingga tarikh dinyatakan, maka pihak kami berhak menjual secara lelongan awam barang gadaian tersebut.

- *Permohonan tangguh lelong adalah tidak dibenarkan. -
+ {{--

Sekiranya tuan/puan masih tidak berurusan sehingga tarikh dinyatakan, maka pihak kami berhak menjual secara lelongan awam barang gadaian tersebut.

--}}

Notis:

Sila bawa bersama Surat Akaun Gadai (SAG) untuk sebarang urusan.