From 20942c90ba74f4379f9e79a8db1420b1d29b710f Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Sun, 13 Feb 2022 12:28:52 +0800 Subject: [PATCH 1/3] serahan (resit pembayaran, penyata, brg bidaan) --- app/Http/Controllers/LelongController.php | 2 - app/Http/Controllers/MarhunController.php | 2 + app/Http/Controllers/SerahanController.php | 80 +++++++ app/Http/Controllers/SimulasiController.php | 3 +- resources/views/includes/sidebar.blade.php | 17 +- resources/views/pdf/penyatabayaran.blade.php | 200 ++++++++++++++++++ resources/views/pdf/resitpembayaran.blade.php | 195 +++++++++++++++++ resources/views/pdf/senaraibid.blade.php | 106 ++++++++++ resources/views/serahan/pembayaran.blade.php | 140 ++++++++++++ routes/web.php | 13 ++ 10 files changed, 752 insertions(+), 6 deletions(-) create mode 100644 app/Http/Controllers/SerahanController.php create mode 100644 resources/views/pdf/penyatabayaran.blade.php create mode 100644 resources/views/pdf/resitpembayaran.blade.php create mode 100644 resources/views/pdf/senaraibid.blade.php create mode 100644 resources/views/serahan/pembayaran.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index d7faa044..933e232c 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -29,8 +29,6 @@ use App\Models\LelKarat_temp; use Carbon\Carbon; -use Carbon\Carbon; - class LelongController extends Controller { /** diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 1907ba44..c1148ad5 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -125,6 +125,8 @@ class MarhunController extends Controller } + + } \ No newline at end of file diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php new file mode 100644 index 00000000..74b5ceff --- /dev/null +++ b/app/Http/Controllers/SerahanController.php @@ -0,0 +1,80 @@ +middleware('auth'); + } + + /** + * Show the application dashboard. + * + * @return \Illuminate\Contracts\Support\Renderable + */ + public function pembayaran() + { + $lelong = Lelong::all(); + return view('serahan.pembayaran',compact('lelong')); + } + + public function penyatabayaran(Request $request) + { + $pdf = PDF::loadView('pdf.penyatabayaran')->setPaper('a4', 'landscape'); + + return $pdf->download('Penyata Bayaran.pdf'); + } + + public function resitpembayaran(Request $request) + { + $pdf = PDF::loadView('pdf.resitpembayaran')->setPaper('a4', 'landscape'); + + return $pdf->download('Resit Bayaran.pdf'); + } + + public function senaraibid(Request $request) + { + $pdf = PDF::loadView('pdf.senaraibid')->setPaper('a4', 'landscape'); + + return $pdf->download('Senarai Bidaan.pdf'); + } + + + + + + +} + \ No newline at end of file diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index aa431ee1..371a799a 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -637,8 +637,7 @@ class SimulasiController extends Controller 'total14K', 'total9K', 'simkarat', - 'simulasi_id', - 'databid'))->setPaper('a4', 'landscape'); + 'simulasi_id'))->setPaper('a4', 'landscape'); return $pdf->download('Simulasi Keseluruhan.pdf'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index b220e2d0..3ca1f7bc 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -52,14 +52,26 @@ --}} @endhasrole @hasrole('pengurus-cawangan') -
  • + +
  • + + +
    • + + {{--
  • -
    • + --}} + + @endhasrole @hasrole('jurulelong')
  • @@ -70,6 +82,7 @@
    • + @endhasrole @hasrole('operasi')
  • diff --git a/resources/views/pdf/penyatabayaran.blade.php b/resources/views/pdf/penyatabayaran.blade.php new file mode 100644 index 00000000..897f6391 --- /dev/null +++ b/resources/views/pdf/penyatabayaran.blade.php @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + +
    Ar-Rahn Kota BeludInvois
    Ground Floor, Lot 11, KKMPNo.Invois: :0002588
    Kota Belud, Sabah.Tarikh: 30/08/2021
    Tel : 088-979599 
    Faks : 088-255026Cawangan : Ar-Rahn Kota Belud
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     
    Nama :MOHD SAID BIN TAIB
    No.K/P:830519125399
    Alamat:KAMPUNG TAMAU KOTA BELUD
    No.Telefon:0193749495
    + + + + +
    PENYATA BAYARAN LELONGAN
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    BilNo. RujukanJenis BarangBerat(g) Harga Bidaan(RM)
    1.011232200714-00491- Cincin1.53346.00
    2.011232200723-00391- Cincin2.90647.00
    Jumlah Bayaran4.43993.00
    + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SENARAI BAYARAN MENGIKUT AKAUN
    BilCawangan Berat(g) Harga Jual(RM)Nama BankPemegang AkaunNo.Akaun
    ###################################
    ###################################
    Jumlah Bayaran#####
    *Sila Buat Pembayaran Mengikut Akaun
    + + + + + \ No newline at end of file diff --git a/resources/views/pdf/resitpembayaran.blade.php b/resources/views/pdf/resitpembayaran.blade.php new file mode 100644 index 00000000..767d8e4f --- /dev/null +++ b/resources/views/pdf/resitpembayaran.blade.php @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + +
    Cawangan (nama cawangan)Slip Serahan
    Alamat CawanganNo.Slip: B031710282
    Alamart Cawangan duaTarikh: 22/04/2022
    Tel : 0134863252 
    Faks : 09255345Cawangan : Ar rahn kota bharu
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     
    Nama :Nama Pelanggan
    No.K/P:No kp pelanggan
    Alamat:Alamat pelanggan
    No.Telefon:0134863252
    + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SENARAI SERAHAN BARANG GADAIAN YANG BERJAYA DILELONG
    BilNo. PaketNo. RujukanJenis BarangBerat(g) Harga Lelong(RM)
    ##############################
    ##############################
    Jumlah##########
    + + + + + + + + +

    PERHATIAN: Bahawa PEMBELI hendaklah mengaku bahawa identiti harta yang berjaya dibeli bersama-sama dengan keterangan yang dinyatakan oleh PLAINTIF PEMEGANG GADAIAN adalah seperti yang dicatatkan di dalam keterangan harta tersebut dan + setelah selesai proses pembayaran maka PEMBELI bertanggungjawab dan jika ada apa-apa masalah maka PEMBELI tidak berhak + membuat apa-apa tuntutan lagi.

    +

     

    +

     

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    ......................................................................
    Tandatangan KhazanahTandatangan Pembeli
    Nama:nama khazanahNama: nama user
     No.K/P: kp user
     Tarikh:
     Masa:
    +

     

    + + \ No newline at end of file diff --git a/resources/views/pdf/senaraibid.blade.php b/resources/views/pdf/senaraibid.blade.php new file mode 100644 index 00000000..d5703927 --- /dev/null +++ b/resources/views/pdf/senaraibid.blade.php @@ -0,0 +1,106 @@ + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN SENARAI BARANG LELONGAN PEMBIDA

    + +
    + + + + + +
    Cawangan:
    Tarikh:
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Bil.No. RujukanHarga Asas (RM)Nama Pembida Harga Bida(RM)Masa BidaLevel Bida
    ###############################
    ###############################
     Jumlah Keseluruhan##### #####  
    *Nota: Level Bida 1: Semifinal
               + Level Bida 2: Final
    + + diff --git a/resources/views/serahan/pembayaran.blade.php b/resources/views/serahan/pembayaran.blade.php new file mode 100644 index 00000000..51d431e5 --- /dev/null +++ b/resources/views/serahan/pembayaran.blade.php @@ -0,0 +1,140 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + @csrf + + + + + + + + + + + + + + + + + + {{-- @foreach ($lelong as $lel) --}} + + + + + + + + + + + + {{-- @endforeach --}} + + +
    Nama PembidaNo KpNo TelBil SuratJumlah Bidaan(RM)Penyata BayaranResit BayaranBidaan
    MOHD SAID BIN TAIB83051912539901937494952993.00 + {{-- @hasrole('jurulelong') + + @if(!$lel->masatamat_lelong) + + + + @elseif ($lel->sts_lelong == 2) + + @else + + @endif + + @endhasrole --}} +
    +
    +
    + +
    +
    + + +@endsection diff --git a/routes/web.php b/routes/web.php index 9aba1b59..e6e85072 100644 --- a/routes/web.php +++ b/routes/web.php @@ -122,4 +122,17 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::get('/pembida/{id}',['as'=>'pembida.show','uses'=>'PembidaController@show']); Route::get('/deletepembida/{id}',['as'=>'pembida.delete','uses'=>'PembidaController@delete']); Route::get('/sahkanpembida/{id}',['as'=>'pembida.sah','uses'=>'PembidaController@sah']); +}); + +Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () { + Route::get('/pembayaran',['as'=>'serahan.pembayaran','uses'=>'SerahanController@pembayaran']); + Route::get('/resitpembayaran',['as'=>'serahan.resitpembayaran','uses'=>'SerahanController@resitpembayaran']); + Route::get('/penyatabayaran',['as'=>'serahan.penyatabayaran','uses'=>'SerahanController@penyatabayaran']); + Route::get('/senaraibid',['as'=>'serahan.senaraibid','uses'=>'SerahanController@senaraibid']); + + + + + + }); \ No newline at end of file From 8bf1e2253bd003d580c059ee1f71685c42a6d202 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Sun, 13 Feb 2022 12:54:52 +0800 Subject: [PATCH 2/3] Update penyatabayaran.blade.php --- resources/views/pdf/penyatabayaran.blade.php | 45 ++++++++------------ 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/resources/views/pdf/penyatabayaran.blade.php b/resources/views/pdf/penyatabayaran.blade.php index 897f6391..7518b4d5 100644 --- a/resources/views/pdf/penyatabayaran.blade.php +++ b/resources/views/pdf/penyatabayaran.blade.php @@ -134,19 +134,17 @@ 4.43 993.00 - - + + + - - -

    - - - - +
    SENARAI BAYARAN MENGIKUT AKAUN
    +
    SENARAI BAYARAN MENGIKUT AKAUN
    + + @@ -159,28 +157,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + - + @@ -188,7 +178,8 @@ -
    Bil Cawangan
    ###################################
    ###################################1.Ar-Rahn Kota Belud4.43993.00Bank Muamalat Malaysia BerhadJoint Venture MVSB and PKB-Kota Belud 0301-0006119-71-3
    Jumlah Bayaran#####993.00
    *Sila Buat Pembayaran Mengikut Akaun
    + + From b88e4809694767e39c28aca395c2f56578c56b0a Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Mon, 14 Feb 2022 16:23:01 +0800 Subject: [PATCH 3/3] edit template resit --- resources/views/pdf/penyatabayaran.blade.php | 9 +- resources/views/pdf/resitpembayaran.blade.php | 59 +++-- resources/views/pdf/senaraibid.blade.php | 222 ++++++++++-------- 3 files changed, 152 insertions(+), 138 deletions(-) diff --git a/resources/views/pdf/penyatabayaran.blade.php b/resources/views/pdf/penyatabayaran.blade.php index 7518b4d5..d9623b8b 100644 --- a/resources/views/pdf/penyatabayaran.blade.php +++ b/resources/views/pdf/penyatabayaran.blade.php @@ -96,16 +96,13 @@ : 0193749495 - - - + - + +
    PENYATA BAYARAN LELONGAN
    - - diff --git a/resources/views/pdf/resitpembayaran.blade.php b/resources/views/pdf/resitpembayaran.blade.php index 767d8e4f..bd258ec2 100644 --- a/resources/views/pdf/resitpembayaran.blade.php +++ b/resources/views/pdf/resitpembayaran.blade.php @@ -50,15 +50,15 @@
    Bil No. Rujukan
    - + - + - + @@ -83,33 +83,30 @@ - + - + - + - +
    Cawangan (nama cawangan)Ar-Rahn Kota Belud Slip Serahan
    Alamat CawanganGround Floor, Lot 11, KKMP No.Slip: B031710282
    Alamart Cawangan duaKota Belud, Sabah. Tarikh: 22/04/2022
    Nama :Nama PelangganMOHD SAID BIN TAIB
    No.K/P :No kp pelanggan830519125399
    Alamat :Alamat pelangganKAMPUNG TAMAU KOTA BELUD
    No.Telefon :01348632520193749495
    - + + +
    RESIT BAYARAN DAN SERAHAN BARANG GADAIAN YANG BERJAYA DILELONG
    - -
    - - - - + @@ -123,26 +120,26 @@ - - - - - - + + + + + + - - - - - - + + + + + + - - + + @@ -164,12 +161,12 @@ - - + + - + diff --git a/resources/views/pdf/senaraibid.blade.php b/resources/views/pdf/senaraibid.blade.php index d5703927..736a72f4 100644 --- a/resources/views/pdf/senaraibid.blade.php +++ b/resources/views/pdf/senaraibid.blade.php @@ -1,106 +1,126 @@ - - -
    SENARAI SERAHAN BARANG GADAIAN YANG BERJAYA DILELONG
    Bil No. Paket
    ##############################1.25011232200714-00491-Cincin1.53346.00
    ##############################2.38011232200723-00391-Cincin2.90647.00
    Jumlah##########4.43993.00
    Tandatangan Pembeli
    Nama:nama khazanahNama: nama userNama:Nama: MOHD SAID BIN TAIB
     No.K/P: kp userNo.K/P: 830519125399
     
    - - - - - - - -

    PERMODALAN KELANTAN BERHAD

    LAPORAN SENARAI BARANG LELONGAN PEMBIDA

    - -
    - - - - - -
    Cawangan:
    Tarikh:
    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - + #customers { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size:12px; + border-collapse: collapse; + width: 100%; - - - - - - - - - - - - - - - - - - - - - - - + } + + #customers td, #customers th { + border: 0px solid; + padding: 1px; + border-bottom: 1px solid #ddd; + } + - - - - - -
    Bil.No. RujukanHarga Asas (RM)Nama Pembida Harga Bida(RM)Masa BidaLevel Bida
    ###############################
    ###############################
     Jumlah Keseluruhan##### #####  
    *Nota: Level Bida 1: Semifinal
               - Level Bida 2: Final
    + #customers th { + text-align: left; + table-layout:auto + color: black; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + padding: 5px; + border-bottom: 1px solid #ddd; + } + + #marhun { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size:11px; + border-collapse: collapse; + width: 100%; + } + + #marhun td, #marhun th { + border: 0px solid; + padding: 1px; + + } + + + #marhun th { + + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + + } + + +
    SENARAI BARANG LELONGAN DIBIDA OLEH PEMBIDA
    + + + + + + + + + + + + + + + + + + + + +
     
    Tarikh :
    Cawangan:
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    BilNo. RujukanHarga Asas(RM) + Nama PembidaHarga Bida(RM)Masa BidaLevel Bida
    1.011232200714-0049336.001. MOHD SAID BIN TAIB346.0010:30:50 AM2
    2.011232200723-0039637.001. MOHD SAID BIN TAIB647.0010:30:50 AM2

    + *Nota: Level Bida 1: Semifinal, Level Bida 2: Final
    + + + + + + + + + + + + + + \ No newline at end of file