update seeder, notis lelong

app/Http/Controllers/NotisController.php

@@ -63,49 +63,49 @@ class NotisController extends Controller
 
         $user =  Auth::user();
         $bayaran=0;
+        $arraydetails = [];
 
         $caw = Cawangan::where('caw_code','=',$user->kodcaw)
         ->first();
 
-        $lelong_id = $lelong_id;
+        $lelong_id = $lelong_id;      
 
-        $senarai = LelongBid::where('lelongbid.kodcaw','=',$user->kodcaw)
-        ->where('lelongbid.lelong_id', $lelong_id);
+        $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+        ->where('lelong_id','=',$lelong_id)
+        ->where('lelongbid.kodcaw','=',$user->kodcaw);
 
-        $arraysenarai = $senarai->pluck('norujukan')->toArray();
-        $datasenarai = $senarai->get();
+        $arraynorujukan = $marhun->pluck('norujukan')->toArray();
+        $datalelong = $marhun->get();
+        $marhuns = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+        ->select('nokp')
+        ->groupBy('nokp')
+        ->get();
+        // dd($marhuns); 
+        $arraysag = [];
+       
 
-        $gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
-        ->get()->toArray();
+        foreach($marhuns as $index1=>$cal){
+            $customer =  Customer::where('kpbaru','=',$cal['nokp'])
+            ->orWhere('kplama','=',$cal['nokp'])
+            ->first();
 
-        // $gadaicaw2 = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
-        // ->where('gadai.kodcaw','=',$user->kodcaw);
+            $listsag = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+            ->where('nokp','=',$cal['nokp'])
+            ->get();
+            // dd($listgadai);
+            foreach($listsag as $index=>$listing){
 
-        
-        // $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
-        // $datacustomer = $gadaicaw2->get();
-        // // dd($gadaicaw2);
-        // $customer = Customer::on($datacustomer[0]['kodcaw'])
-        // ->whereIn('kpbaru',$arraycustomer)
-        // ->orWhereIn('kplama',$arraycustomer)            
-        // ->get()->toArray();       
+                $bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
 
+            }
+            $marhuns[$index1]['nama'] = $customer;
+            $marhuns[$index1]['listsag'] = $listsag;
 
-        // $gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
-        // ->select('nokp')
-        // ->groupBy('nokp')
-        // ->get()->toArray();
-        // dd($gadaicaw);
-
-        foreach($gadaicaw as $index1=>$notis)
-        {
-            $bayaran = $notis['hargajualan'] - $notis['bakihargajualan'];
+            
         }
+      
 
-        // $gadaicaw[$index1]['payment'] = $payment;
-        // $gadaicaw[$index1]['bayaran_keuntungan'] = $bayaran_keuntungan;
-
-        return view('jananotis.senarainotis',compact('gadaicaw','lelong_id','bayaran'));
+        return view('jananotis.senarainotis',compact('marhuns','lelong_id','bayaran','listsag'));
 
     }
 
@@ -122,22 +122,61 @@ class NotisController extends Controller
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
 
-        $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-        ->join('customer','gadai.nokp','=','customer.kpbaru')
-        ->join('daerah','customer.koddaerah','=','daerah.koddaerah')
-        ->join('negeri','customer.kodnegeri','=','negeri.kodnegeri')
-        ->where('lelongbid.lelong_id', $lelong_id)
-        ->get()->toArray(); 
+        $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+        ->where('lelong_id','=',$lelong_id)
+        ->where('lelongbid.kodcaw','=',$user->kodcaw);
+
+        $arraynorujukan = $marhun->pluck('norujukan')->toArray();
+        $datalelong = $marhun->get();
+        $marhuns = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+        ->select('nokp','norujukan')
+        ->get();
+        // dd($marhuns); 
+        $arraysag = [];
+       
+
+        foreach($marhuns as $index1=>$cal){
+            $customer =  Customer::where('kpbaru','=',$cal['nokp'])
+            ->orWhere('kplama','=',$cal['nokp'])
+            ->join('daerah','customer.koddaerah','=','daerah.koddaerah')
+            ->join('negeri','customer.kodnegeri','=','negeri.kodnegeri')      
+            ->join('poskod','customer.poskod','=','poskod.poskod')  
+            ->first();
+
+            $listsag = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+            ->where('nokp','=',$cal['nokp'])
+            ->get();
+            // dd($listgadai);
+            foreach($listsag as $index=>$listing){
+
+                $bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
+
+            }
+            $marhuns[$index1]['nama'] = $customer;
+            $marhuns[$index1]['listsag'] = $listsag;
+
+            
+        }
+        // $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
+        // $datacustomer = $gadaicaw2->get();
+        // $customer = Customer::query()
+        // ->whereIn('kpbaru',$arraycustomer)
+        // ->orWhereIn('kplama',$arraycustomer)     
+        // ->join('daerah','customer.koddaerah','=','daerah.koddaerah')
+        // ->join('negeri','customer.kodnegeri','=','negeri.kodnegeri')      
+        // ->join('poskod','customer.poskod','=','poskod.poskod')  
+        // ->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(); 
-
   
 
-        $pdf = PDF::loadView('pdf.jananotis',compact('payment','lelong_id','lelongid','caw','tarikh_cetak'))
+        $pdf = PDF::loadView('pdf.jananotis',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag'))
         ->setPaper('a4', 'potrait');
        
        return $pdf->download('Penjanaan Notis.pdf');

database/migrations/2021_12_14_041545_create_simulasis_table.php

@@ -61,7 +61,7 @@ class CreateSimulasisTable extends Migration
             $table->date('t_jual')->nullable();
             $table->integer('nopembeli')->nullable();
             $table->decimal('jbg', $precision = 7, $scale = 2);
-            $table->decimal('kadarupah', $precision = 5, $scale = 2);
+            $table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable();
             $table->decimal('upahsimpan', $precision = 11, $scale = 2)->nullable();
             $table->decimal('ansuran', $precision = 11, $scale = 2)->nullable();
             $table->decimal('nilaimarhun', $precision = 9, $scale = 2);

database/migrations/2021_12_14_041557_create_lelongs_table.php

@@ -68,7 +68,7 @@ class CreateLelongsTable extends Migration
             $table->integer('nopembeli')->nullable();
             $table->decimal('jbg', $precision = 7, $scale = 2);
             $table->decimal('kadarupah', $precision = 5, $scale = 2);
-            $table->decimal('upahsimpan', $precision = 11, $scale = 2);
+            $table->decimal('upahsimpan', $precision = 11, $scale = 2)->nullable();
             $table->decimal('ansuran', $precision = 11, $scale = 2)->nullable();
             $table->decimal('nilaimarhun', $precision = 9, $scale = 2);
             $table->decimal('pinjaman', $precision = 9, $scale = 2);
@@ -173,7 +173,7 @@ class CreateLelongsTable extends Migration
             $table->string('kali')->nullable();
             $table->integer('cajlelong')->nullable();
             $table->timestamps();
-            $table->string('para2')->nullable(); 
+            $table->string('para2','9999')->nullable(); 
 
 
             // $table->foreign('norujukan')

database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php

@@ -14,7 +14,7 @@ class AddPara2ToCawanganTable extends Migration
     public function up()
     {
         Schema::table('cawangan', function (Blueprint $table) {
-            $table->string('para2')->nullable(); 
+            $table->string('para2','9999')->nullable(); 
         });
     }
 

database/seeders/DatabaseSeeder.php

@@ -16,5 +16,7 @@ class DatabaseSeeder extends Seeder
         $this->call(RolesSeeder::class);
         $this->call(JenisEmasSeeder::class);
         $this->call(KaratSeeder::class);
+        $this->call(TetapanSeeder::class);
+
     }
 }

database/seeders/KaratSeeder.php

@@ -80,12 +80,7 @@ class KaratSeeder extends Seeder
             'dariharga916' => -139.71
         ]);
 
-        Tetapan::create([
-            'tetap_tarikh_lelong' => '2022-07-31',
-            'kali' => '1',
-            'cajlelong' => '3'
-            
-        ]);
+   
 
         
 

database/seeders/TetapanSeeder.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use App\Models\Tetapan;
+
+class TetapanSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+       
+
+        Tetapan::create([
+            'tetap_tarikh_lelong' => '2022-07-26',
+            'kali' => '1',
+            'cajlelong' => '3'
+            
+        ]);
+
+        
+
+    }
+}

resources/views/jananotis/senarainotis.blade.php

@@ -21,24 +21,26 @@
                 <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
+                        <th>No KP</th>
                         <th>No Rujukan</th>
                         <th>Tempoh</th>
-                        <th>No KP</th>
                         <th>Pembiayaan</th>
                         <th>Keuntungan 6 Bulan</th>
                         <th>Bayaran Telah Dibuat</th>
                     </tr>
             </thead>
             <tbody>
-                @foreach($gadaicaw as $index1=> $notis)
+                @foreach($marhuns as $index1=> $notis)
                         <tr>
                             <td>{{ $loop->iteration }} </td>
-                            <td>{{ $notis['norujukan']}}</td>
-                            <td>{{ $notis['tempoh']}}</td>
                             <td>{{ $notis['nokp']}}</td>
-                            <td>{{ number_format($notis['pinjaman'], 2, '.', ',')}}</td>
-                            <td>{{ number_format($notis['bakiupah'], 2, '.', ',')}}</td>  
-                            <td>{{ number_format($bayaran, 2, '.', ',')}}</td>  
+                            {{-- <td style='word-wrap'>{{ $notis['nama']['nama']}}</td> --}}
+
+                            <td>@foreach($notis['listsag'] as $item){{ $item['norujukan']}}<br>@endforeach</td>
+                            <td>@foreach($notis['listsag'] as $item){{ $item['tempoh']}}<br>@endforeach</td>
+                            <td>@foreach($notis['listsag'] as $item){{ number_format($item['pinjaman'], 2, '.', ',')}}<br>@endforeach</td>
+                            <td>@foreach($notis['listsag'] as $item){{ number_format($item['bakiupah'], 2, '.', ',')}}<br>@endforeach</td>  
+                            <td>{{ number_format($bayaran, 2, '.', ',')}}<br></td>  
 
                 @endforeach
         </tbody>

resources/views/pdf/jananotis.blade.php

@@ -8,7 +8,7 @@
   #header td, #customers th {
    
     padding-left:4px;
-    font-size:13px;
+    font-size:12px;
   }
   
   #header tr:nth-child(even){background-color: #ffffff;}
@@ -37,7 +37,7 @@
   #scan td, #scan th {
    
     padding: 8px;
-    font-size:13px;
+    font-size:11px;
   }
   
   #scan tr:nth-child(even){background-color: #ffffff;}
@@ -64,7 +64,7 @@
   #scan td, #scan th {
     border-collapse: collapse;
     padding: 8px;
-    font-size:13px;
+    font-size:11px;
   }
   
   #scan tr:nth-child(even){background-color: #ffffff;}
@@ -93,7 +93,7 @@
   #details td, #details th {
    
     padding: 8px;
-    font-size:13px;
+    font-size:11px;
   }
   
   #details tr:nth-child(even){background-color: #ffffff;}
@@ -113,7 +113,7 @@
     padding: 20px 20px 20px 20px;
   }
   .tablestyle{
-    font-size:13px;
+    font-size:12px;
   }
   .tablestyle td, .tablestyle th{
     /* padding-top: 12px; */
@@ -121,158 +121,133 @@
   
   }
   .page-break {
-    page-break-before: always;
-}
+      page-break-before: always;
+  }
   </style>
 
-
-@foreach ($gadaicaw as $notis)
-
-            <div class="container">
-              <table id="header">
-                <tr>
-                  {{-- <th rowspan="4"style="width:100px"><br><img src="{{ asset('img/icon_pkb.png') }}" style="width:70px"></img></th> --}}
-                  <th colspan="1">{{$caw['caw_name']}}</th>
-                </tr>
-                <tr>
-                  <td style="vertical-align:top;">{{$caw['alamat1']}}</td>
-                  <td></td>
-                </tr>
-                <tr>
-                  <td style="vertical-align:top;">{{$caw['alamat2']}}</td>
-                  <td></td>
-                </tr>
-                <tr>
-                  <td style="vertical-align:top;">{{ ' No Tel : '. $caw['notel'] . ' No Faks : '. $caw['nofaks'] }}</td>
-                  <td></td>
-                </tr>
-              </table>
-              <br>
-            
-            
-              <div>
-                <table class="tablestyle">
-                  <tr>
-                    <td width="15%">TARIKH CETAK 
-                    </td>
-                    <td width="1%">:</td>
-                    <td width="43%">@php 
-                      $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-                          $datez = $myDateTime->format('d-m-Y');
-                          echo($datez);
-                      @endphp
-                      <td colspan="3"></td>
-            </td>
-                  </tr>
-                  <tr>
-                    <td><br></td>
-                  </tr>
-                  <tr>
-                    <td>NO RUJUKAN</td>
-                    <td>:</td>
-                    <td>{{ $notis['norujukan'] }}</td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td width="14%">NO TELEFON</td>
-                    <td width="1%">:</td>
-                    {{-- <td>{{$notis['telefon'] }}</td> --}}
-            
-                  </tr>
-                  <tr>
-                    <td style="vertical-align:top;">KEPADA</td>
-                    <td style="vertical-align:top;">:</td>
-                    {{-- <td style="vertical-align:top;">{{ $notis['nama'] }}<br> {{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['alamat2']) !!} <br> {{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['namadaerah']) . ' ' . strtoupper($notis['negeri'])}}</td> --}}
-                    <td></td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    
-                    <td style="vertical-align:top;">NO K/P</td>
-                    <td style="vertical-align:top;">:</td>
-                    <td style="vertical-align:top;"> {{ $notis['nokp'] }}</td>
-                  </tr>
-                </table>
+@foreach($marhuns as $index1=> $notis)
 
 
 
 
-            @foreach ($lelongid as $bid)
+  <div class="container">
+    <table id="header">
+      <tr>
+        {{-- <th rowspan="4"style="width:100px"><br><img src="{{ asset('img/icon_pkb.png') }}" style="width:70px"></img></th> --}}
+        <th colspan="1">{{ $caw['caw_name'] }}</th>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ $caw['alamat1'] }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ $caw['alamat2'] }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td style="vertical-align:top;">{{ ' No Tel : '. $caw['notel'] . ' No Faks : '. $caw['nofaks'] }}</td>
+        <td></td>
+      </tr>
+    </table>
+    <br>
+  
+  
+    <div>
+      <table class="tablestyle">
+        <tr>
+          <td width="15%">TARIKH CETAK 
+          </td>
+          <td width="1%">:</td>
+          <td width="43%">@php 
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+                $datez = $myDateTime->format('d-m-Y');
+                echo($datez);
+            @endphp
+            <td colspan="3"></td>
+  </td>
+        </tr>
+        <tr>
+          <td><br></td>
+        </tr>
+        <tr>
+          <td>NO RUJUKAN</td>
+          <td>:</td>
+          <td>{{ $notis['norujukan']}}</td>
+          <td></td>
+          <td width="14%">NO TELEFON</td>
+          <td width="1%">:</td>
+          <td>{{ $notis['nama']['telefon'] }}</td>
+  
+        </tr>
+        <tr>
+          <td style="vertical-align:top;">KEPADA</td>
+          <td style="vertical-align:top;">:</td>
+          <td style="vertical-align:top;">{{ $notis['nama']['nama']}}
+            <br> {{ strtoupper($notis['nama']['alamat1']) }} 
+          {!! ($notis['nama']['alamat2'] === null || $notis['nama']['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat2']) !!} <br> 
+          {{ ' ' . $notis['nama']['poskod'] . ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}}</td>
+          <td></td>
+          <td style="vertical-align:top;">NO K/P</td>
+          <td style="vertical-align:top;">:</td>
+          <td style="vertical-align:top;"> {{ $notis['nokp'] }}</td>
+        </tr>
+      </table>
 
-            <p>Tuan/Puan,</p>
-            <h4>LELONGAN BARANGAN GADAIAN SECARA TENDER PADA 
-              @php 
-              $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
-                  $datez = $myDateTime->format('d-m-Y');
-                  echo($datez);
+      @foreach ($lelongid as $bid)
+  
+      <p>Tuan/Puan,</p>
+      <h4>LELONGAN BARANGAN GADAIAN SECARA TENDER PADA 
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
+            $datez = $myDateTime->format('d-m-Y');
+            echo($datez);
+  
+        @endphp</h4>
+      <p>Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas akan dilelong.</p>
+  
+      <p>Butiran lelongan adalah seperti berikut :-</p>
+      
+      <table>
+        <tr>
+          <td>Tarikh</td>
+          <td>:</td>
+          <td> @php     
+            $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
+            $datez = $myDateTime->format('d-m-Y');
+            echo($datez);
+            @endphp</td>
+        </tr>
+        <tr>
+          <td>Cawangan</td>
+          <td>:</td>
+          <td>{{ $caw['caw_name'] }}</td>
+        </tr>
+        <tr>
+          <td>Waktu</td>
+          <td>:</td>
+          <td>{{ date('H:i',strtotime($notis['masa'])). ' pagi' }}</td>
+        </tr>
+      </table>
+  
+  
+      <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</h4>
-            <p>Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas akan dilelong.</p>
-        
-            <p>Butiran lelongan adalah seperti berikut :-</p>
-            
-            <table>
-              <tr>
-                <td>Tarikh</td>
-                <td>:</td>
-                <td> @php     
-                  $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
-                  $datez = $myDateTime->format('d-m-Y');
-                  echo($datez);
-                  @endphp</td>
-              </tr>
-              <tr>
-                <td>Cawangan</td>
-                <td>:</td>
-                <td>{{$caw['caw_name']}}</td>
-              </tr>
-              <tr>
-                <td>Waktu</td>
-                <td>:</td>
-                <td>10.00 pagi</td>
-              </tr>
-            </table>
-        
-        
-            <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>
-@endforeach
-            
-            @php echo $caw['para2']; @endphp
-            {{-- syarat2 notis lelong( db cawangan - table para2) --}}
+        @endphp:-</b></p>
+  
 
-            <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>
-               <p>Surat ini adalah cetakan komputer dan tiada tandatangan diperlukan</p>
-     <div class="page-break"></div>
-
-    @endforeach
-
-            </div>
-
-
-</body>
-
-
-    
+      @php echo $caw['para2']; @endphp
+      <p>Notis:</p>
+      <i>Sila bawa bersama Surat Akaun Gadai (SAG) untuk sebarang urusan.</i>
+      <br>
+      <i>Sila abaikan notis ini sekiranya penebusan telah dibuat.</i>
+  
+      <p>Surat ini adalah cetakan komputer dan tiada tandatangan diperlukan</p>
+  
+    </div>
+  </div>
+  @endforeach
+  @endforeach