KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'amirah' into 'main'

Browse Source 
update excel notis lelong, seeder tetapan

See merge request online-sistem1/lelong!124
This commit is contained in:
Nur Izzati Zulkifli
2022-07-21 07:00:53 +00:00
parent 601d18c98c e8d5e0042a
commit 2b6dc042e1
9 changed files with 95 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+2 -2
View File
@@ -930,10 +930,10 @@ class LelongController extends Controller
return $pdf->download('Senarai Lelong Tak Laku.pdf');
}
public function senaraipemenang($lelong_id, $caw_code){
public function senaraipemenang(Request $request, $lelong_id){
$caw_code = $request->caw_code;
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
app/Http/Controllers/NotisController.php
+72 -20
View File
@@ -18,6 +18,8 @@ use App\Models\Gadai;
use App\Models\Daerah;
use App\Models\Negeri;
use App\Models\Tetapan;
use App\Models\Customer;
use Carbon\Carbon;
use PDF;
use DateTime;
@@ -60,27 +62,50 @@ class NotisController extends Controller
public function senarainotis($lelong_id){
$user = Auth::user();
$bayaran=0;
$caw = Cawangan::where('caw_code','=',$user->kodcaw)
->first();
$lelong_id = $lelong_id;
$senarai = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->where('gadai.kodcaw','=',$user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id)
->get()->toArray();
$senarai = LelongBid::where('lelongbid.kodcaw','=',$user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id);
$bayaran=0;
foreach($senarai as $index1=>$notis)
$arraysenarai = $senarai->pluck('norujukan')->toArray();
$datasenarai = $senarai->get();
$gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
->get()->toArray();
// $gadaicaw2 = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
// ->where('gadai.kodcaw','=',$user->kodcaw);
// $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
// $datacustomer = $gadaicaw2->get();
// // dd($gadaicaw2);
// $customer = Customer::on($datacustomer[0]['kodcaw'])
// ->whereIn('kpbaru',$arraycustomer)
// ->orWhereIn('kplama',$arraycustomer)
// ->get()->toArray();
// $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'];
}
$senarai[$index1]['payment'] = $senarai;
$senarai[$index1]['bayaran_keuntungan'] = $bayaran;
// $gadaicaw[$index1]['payment'] = $payment;
// $gadaicaw[$index1]['bayaran_keuntungan'] = $bayaran_keuntungan;
return view('jananotis.senarainotis',compact('senarai','lelong_id','bayaran'));
return view('jananotis.senarainotis',compact('gadaicaw','lelong_id','bayaran'));
}
@@ -128,31 +153,58 @@ class NotisController extends Controller
$lelong_id = $request->lelong_id;
$payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->join('customer', function ($join) {
$join->on('gadai.nokp', '=', 'customer.kpbaru')->orOn('gadai.nokp', '=', 'customer.kplama');
})
$senarai = LelongBid::where('lelongbid.kodcaw','=',$user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id);
$arraysenarai = $senarai->pluck('norujukan')->toArray();
$datasenarai = $senarai->get();
$gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
->where('gadai.kodcaw','=',$user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id)
->get()->toArray();
->get()->toArray();
$bayaran=0;
foreach($payment as $index1=>$pay)
foreach($gadaicaw as $index1=>$pay)
{
$bayaran = $pay['hargajualan'] - $pay['bakihargajualan'];
}
$payment[$index1]['payment'] = $payment;
$payment[$index1]['bayaran_keuntungan'] = $bayaran;
$gadaicaw2 = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
->where('gadai.kodcaw','=',$user->kodcaw);
$arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
$datacustomer = $gadaicaw2->get();
// dd($gadaicaw2);
$customer = Customer::query()
->whereIn('kpbaru',$arraycustomer)
->orWhereIn('kplama',$arraycustomer)
->get()->toArray();
// $customer[$index1]['listsag'] = $listsag;
// ->join('customer', function ($join) {
// $join->on('gadai.nokp', '=', 'customer.kpbaru')->orOn('gadai.nokp', '=', 'customer.kplama');
// })
// ->where('gadai.kodcaw','=',$user->kodcaw)
// ->where('lelongbid.lelong_id', $lelong_id)
// ->get()->toArray();
// $payment[$index1]['payment'] = $payment;
// $payment[$index1]['bayaran_keuntungan'] = $bayaran;
if($request->type == 'excel')
{
return view('excel.listnotis_excel',compact('payment','caw','lelong_id','bayaran'));
return view('excel.listnotis_excel',compact('gadaicaw','caw','lelong_id','bayaran','customer'));
}
else
{
$pdf = PDF::loadView('pdf.listnotis',compact('payment','caw','lelong_id','bayaran'))
$pdf = PDF::loadView('pdf.listnotis',compact('gadaicaw','caw','lelong_id','bayaran'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Notis.pdf');
app/Http/Controllers/ReportController.php
+2 -1
View File
@@ -140,7 +140,8 @@ class ReportController extends Controller
$marhuns[$index1]['listsag'] = $listsag;
$pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','marhuns','lelong_id','keuntungan','total_hargaasas','total_berat','datasimulasi'))
$pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','marhuns','lelong_id','keuntungan','total_hargaasas',
'total_berat','datasimulasi'))
->setPaper('a4', 'landscape');
return $pdf->download('Senarai Barang Lelong.pdf');
database/seeders/KaratSeeder.php
+7
View File
@@ -80,6 +80,13 @@ class KaratSeeder extends Seeder
'dariharga916' => -139.71
]);
Tetapan::create([
'tetap_tarikh_lelong' => '2022-07-31',
'kali' => '1',
'cajlelong' => '3'
]);
}
resources/views/excel/listnotis_excel.blade.php
+6 -6
View File
@@ -72,16 +72,16 @@
<th align="left">Bayaran Telah Dibuat</th>
</tr>
</thead>
@foreach($payment as $pay)
@foreach($customer as $index1=> $pay)
<tr>
<td align="left">{{ $loop->iteration }} </td>
<td align="left">{{ $pay['nama']}}</td>
<td align="left">{{ $pay['norujukan']}}</td>
<td align="left">{{ $gadaicaw[$index1]['norujukan'] }}</td>
<td align="left">6{{ $pay['telefon']}}</td>
<td align="left">{{ $pay['tempoh']}}</td>
<td align="left">{{ $pay['nokp']}}</td>
<td align="left">{{ number_format($pay['pinjaman'], 2, '.', ',')}}</td>
<td align="left">{{ number_format($pay['bakiupah'], 2, '.', ',')}}</td>
<td align="left">{{ $gadaicaw[$index1]['tempoh'] }}</td>
<td align="left">{{ $gadaicaw[$index1]['nokp'] }}</td>
<td align="left">{{ number_format($gadaicaw[$index1]['pinjaman'], 2, '.', ',')}}</td>
<td align="left">{{ number_format($gadaicaw[$index1]['bakiupah'], 2, '.', ',')}}</td>
<td align="left">{{ number_format($bayaran, 2, '.', ',')}}</td>
@endforeach
resources/views/jananotis/senarainotis.blade.php
+1 -1
View File
@@ -30,7 +30,7 @@
</tr>
</thead>
<tbody>
@foreach($senarai as $notis)
@foreach($gadaicaw as $index1=> $notis)
<tr>
<td>{{ $loop->iteration }} </td>
<td>{{ $notis['norujukan']}}</td>
resources/views/lelong/showsimulasi.blade.php
+1 -1
View File
@@ -215,7 +215,7 @@
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
@endif+
{{-- {{$cawangan[0] }} --}}
</div>
<div class="modal fade" tabindex="-1" id="modalfilter">
resources/views/pdf/jananotis.blade.php
+3 -3
View File
@@ -126,7 +126,7 @@
</style>
@foreach ($payment as $notis)
@foreach ($gadaicaw as $notis)
<div class="container">
<table id="header">
@@ -184,13 +184,13 @@
<td> </td>
<td width="14%">NO TELEFON</td>
<td width="1%">:</td>
<td>{{$notis['telefon'] }}</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 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>
resources/views/pdf/listnotis.blade.php
+1 -1
View File
@@ -100,7 +100,7 @@ tr:nth-child(even) {
</tr>
</thead>
@foreach($payment as $pay)
@foreach($gadaicaw as $index1=> $pay)
<tr>
<td align="left">{{ $loop->iteration }} </td>
<td align="left">{{ $pay['norujukan']}}</td>