diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index f9e3f621..2c374d07 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/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');
diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php
index bb894cb5..e271c4a8 100644
--- a/database/migrations/2021_12_14_041545_create_simulasis_table.php
+++ b/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);
diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php
index a3692410..f40037b6 100644
--- a/database/migrations/2021_12_14_041557_create_lelongs_table.php
+++ b/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')
diff --git a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php
index d788ae2a..f4e451bb 100644
--- a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php
+++ b/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();
});
}
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 81e890b4..cc468dbb 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/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);
+
}
}
diff --git a/database/seeders/KaratSeeder.php b/database/seeders/KaratSeeder.php
index 11952881..87338d82 100644
--- a/database/seeders/KaratSeeder.php
+++ b/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'
-
- ]);
+
diff --git a/database/seeders/TetapanSeeder.php b/database/seeders/TetapanSeeder.php
new file mode 100644
index 00000000..e9e4b58e
--- /dev/null
+++ b/database/seeders/TetapanSeeder.php
@@ -0,0 +1,29 @@
+ '2022-07-26',
+ 'kali' => '1',
+ 'cajlelong' => '3'
+
+ ]);
+
+
+
+ }
+}
diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php
index ef3530bb..8f8f1263 100644
--- a/resources/views/jananotis/senarainotis.blade.php
+++ b/resources/views/jananotis/senarainotis.blade.php
@@ -21,24 +21,26 @@
No
+ No KP
No Rujukan
Tempoh
- No KP
Pembiayaan
Keuntungan 6 Bulan
Bayaran Telah Dibuat
| {{$caw['caw_name']}} | -|
|---|---|
| {{$caw['alamat1']}} | -- |
| {{$caw['alamat2']}} | -- |
| {{ ' No Tel : '. $caw['notel'] . ' No Faks : '. $caw['nofaks'] }} | -- |
| TARIKH CETAK - | -: | -@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); - $datez = $myDateTime->format('d-m-Y'); - echo($datez); - @endphp - | - - | |||||||||||||
| NO RUJUKAN | -: | -{{ $notis['norujukan'] }} | -- | - | - | - | - | - | - | - | - | - | - | NO TELEFON | -: | - {{--{{$notis['telefon'] }} | --}} - -
| KEPADA | -: | - {{--{{ $notis['nama'] }} {{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : ' ' . strtoupper($notis['alamat2']) !!} {{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['namadaerah']) . ' ' . strtoupper($notis['negeri'])}} | --}}
- - | - | - | - | - | - | - | - | - | - | - - | NO K/P | -: | -{{ $notis['nokp'] }} | -
| {{ $caw['caw_name'] }} | +|
|---|---|
| {{ $caw['alamat1'] }} | ++ |
| {{ $caw['alamat2'] }} | ++ |
| {{ ' No Tel : '. $caw['notel'] . ' No Faks : '. $caw['nofaks'] }} | ++ |
| TARIKH CETAK + | +: | +@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphp + | + + | |||
| NO RUJUKAN | +: | +{{ $notis['norujukan']}} | ++ | NO TELEFON | +: | +{{ $notis['nama']['telefon'] }} | + +
| KEPADA | +: | +{{ $notis['nama']['nama']}}
+ {{ strtoupper($notis['nama']['alamat1']) }} + {!! ($notis['nama']['alamat2'] === null || $notis['nama']['alamat2'] === '') ? '' : ' ' . strtoupper($notis['nama']['alamat2']) !!} + {{ ' ' . $notis['nama']['poskod'] . ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}} |
+ + | NO K/P | +: | +{{ $notis['nokp'] }} | +
Tuan/Puan,
-Tuan/Puan,
+Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas akan dilelong.
+ +Butiran lelongan adalah seperti berikut :-
+ +| Tarikh | +: | +@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphp | +
| Cawangan | +: | +{{ $caw['caw_name'] }} | +
| Waktu | +: | +{{ date('H:i',strtotime($notis['masa'])). ' pagi' }} | +
Tuan/Puan adalah dikehendaki untuk membuat urusan berikut 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 -
Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas akan dilelong.
- -Butiran lelongan adalah seperti berikut :-
- -| Tarikh | -: | -@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong); - $datez = $myDateTime->format('d-m-Y'); - echo($datez); - @endphp | -
| Cawangan | -: | -{{$caw['caw_name']}} | -
| Waktu | -: | -10.00 pagi | -
Tuan/Puan adalah dikehendaki untuk membuat urusan berikut 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:-
-@endforeach - - @php echo $caw['para2']; @endphp - {{-- syarat2 notis lelong( db cawangan - table para2) --}} + @endphp:- + -Notis:
- Sila bawa bersama Surat Akuan Gadai(SAG) untuk sebarang urusan.
- Sila abaikan notis ini sekiranya penebusan telah dibuat.
Surat ini adalah cetakan komputer dan tiada tandatangan diperlukan
- - - @endforeach - -