Merge branch 'amirah'

2022-03-01 11:40:05 +08:00
parent 9f71ad4622 ac6f1d8ca4
commit d6bf58cfff
3 changed files with 95 additions and 47 deletions
@@ -6,9 +6,7 @@ use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
 use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
 use App\Models\User;
-use PDF;
 use App\Models\Cawangan;
 use App\Models\LelongBidder;
 use App\Models\Lelong;
@@ -16,6 +14,10 @@ use App\Models\CawanganLelong;
 use App\Models\LelongBid;
 use App\Models\Payment;
 use App\Models\Resit;
+use App\Models\Gadai;
+use Carbon\Carbon;
+use PDF;
+use DateTime;


 class NotisController extends Controller
@@ -79,24 +81,28 @@ class NotisController extends Controller

        $lelong_id = $lelong_id;

-        $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-        // -join('customer','gadai.')
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        $payment = Gadai::join('lelongbid','gadai.norujukan','=','lelongbid.norujukan')
+        ->join('customer','gadai.nokp','=','customer.kpbaru')
        ->where('lelongbid.lelong_id', $lelong_id)
-        ->get()->toArray();      
+        ->get()->toArray();  

        $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
        ->where('cawangan.caw_code','=',$user->kodcaw)
        ->where('cawangan_lelong.lelong_id', $lelong_id)
-
        ->get();
+
  
        $lelong = Lelong::where('id', $lelongid)->get();

  
-        // return view ('pdf.jananotis',compact('payment','lelong_id','lelongid','caw'));
+        // return view ('pdf.jananotis',compact('payment','lelong_id','lelongid','caw','tarikh_cetak'));

-        $pdf = PDF::loadView('pdf.jananotis',compact('payment','lelong_id','lelongid','caw'))
+        $pdf = PDF::loadView('pdf.jananotis',compact('payment','lelong_id','lelongid','caw','tarikh_cetak'))
        ->setPaper('a4', 'potrait');
       
       return $pdf->download('Penjanaan Notis.pdf');
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddPara2ToCawanganTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('cawangan', function (Blueprint $table) {
+            $table->integer('para2'); 
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('cawangan', function (Blueprint $table) {
+            $table->dropColumn('para2');
+        });
+    }
+}
@@ -2,24 +2,18 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>

-
-
 .letter{
    font-family:'Times New Roman', Times, serif;
    
 }
-
-
-  
+ 
 .row::after {
  content: "";
  clear: both;
  display: table;
-    
-    
+   
 }

-
 .first-prgph{
  
    float: left;
@@ -32,8 +26,6 @@
  width: 30%;
  padding-left: 50px;
 }
-
-
 .page-break {
    page-break-before: always;
 }
@@ -46,30 +38,38 @@

 <body>

-        <div class = "letter"> 
-@foreach ($payment as $notis)
+    <div class = "letter"> 
+    @foreach ($payment as $notis)

-            <div class="row">
-                <div class="first-prgph">
-                    <img src="http://lelongrpt.test/img/icon_pkb.png" alt="PKB LOGO" width="100" height="100">
-                </div>      
-
-                <div class="first-prgph1">
-                <p> {{$caw['caw_name']}}<br>
-                    {{$caw['alamat1']}}<br>
-                    {{$caw['alamat2']}}<br>
-                    No Tel: {{$caw['notel']}}<br>
-                    No Faks: {{$caw['nofaks']}}
-                <p>
-                </div>
+        <div class="row">
+            <div class="first-prgph">
+                <img src="http://lelongrpt.test/img/icon_pkb.png" alt="PKB LOGO" width="100" height="100">
+            </div>      

+            <div class="first-prgph1">
+            <p> {{$caw['caw_name']}}<br>
+                {{$caw['alamat1']}}<br>
+                {{$caw['alamat2']}}<br>
+                No Tel: {{$caw['notel']}}<br>
+                No Faks: {{$caw['nofaks']}}
+            </p><br>
            </div>
+            <br>
+        </div>

-                {{-- No Rujukan: {{$surat['norujukan']}}<br> --}}
-                No Rujukan:{{$notis['norujukan']}} <br>
-                Kepada: <br>
-                No Telefon: <br>
-                No K/P: 
+            <p>
+                Tarikh Cetak: @php 
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+                    $datez = $myDateTime->format('d-m-Y');
+                    echo($datez);
+                @endphp           
+            </p>
+            <p>
+                No Rujukan: {{$notis['norujukan']}} <br>
+                Kepada:{{ $notis['nama'] }}<br> {{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['alamat2']) !!} <br> {{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['koddaerah']) . ' ' . strtoupper($notis['kodnegeri'])}}</td>
+                <br>
+                No Telefon: {{$notis['telefon']}} <br>
+                No K/P: {{$notis['kpbaru']}} 
            </p>
            @foreach ($lelongid as $bid)

@@ -82,19 +82,29 @@
            
            <p>Butiran lelongan adalah seperti berikut :-</p>
            
-            <p>Tarikh: <br>
-               Cawangan: <br>
-               Waktu: 
+            <p>Tarikh:   @php 
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong );
+                  $datez = $myDateTime->format('d-m-Y');
+                  echo($datez);
+              
+              @endphp <br>
+               Cawangan: {{$caw['caw_name']}}<br>
+               Waktu:  {{ $bid->masamula_lelong }} Pagi
            </p>

-            <p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut <b>pada atau sebelum (tarikh):-</b></p>
+            <p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut <b>pada atau sebelum 
+                
+                
+            @php 
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong );
+            $datez = $myDateTime->modify('-2 day')->format('d-m-Y');
+            echo($datez);
+            @endphp:-</b></p>

-            <p>1. Tebus sepenuhnya <br>
-               2. Tebus gadai semula
-
-            <p>Pelanggan hanya perlu menjelaskan upah simpan sehingga sembilan (9) bulan sahaja.<br>
-                <i>*Permohonan tangguh lelong adalah tidak dibenarkan.</i></p>
            
+            @php echo $caw['para2']; @endphp
+            {{-- syarat2 notis lelong( db cawangan - table para2) --}}
+
            <p>Notis:<br>
               <i>Sila bawa bersama Surat Akuan Gadai(SAG) untuk sebarang urusan.</i><br>
               <i>Sila abaikan notis ini sekiranya penebusan telah dibuat.</i><br></p>