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

Merge branch 'main' into amir_dev_2

Browse Source
This commit is contained in:
Amir
2022-11-02 10:47:14 +08:00
parent 21eafd194a 886361901c
commit 7f7db0437a
8 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+1
View File
@@ -1671,6 +1671,7 @@ class LelongController extends Controller
public function startall($id)
{
event(new LelongNotify('start'));
$currentdate = Carbon::now();
$currenttime = $currentdate->toTimeString();
app/Http/Controllers/ReportCawanganController.php
+8 -8
View File
@@ -77,10 +77,11 @@ class ReportCawanganController extends Controller
$caw = Cawangan::where('caw_code','=',$user->kodcaw)
->first();
$brglelongcaw = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
$brglelongcaw = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('lelongbid.lelong_id', $lelong_id)
->where('gadai.kodcaw','=',$user['kodcaw'])
->where('lelongbid.kodcaw','=',$user['kodcaw'])
->get()->toArray();
// dd($brglelongcaw);
$keuntungan=0;
$total_hargaasas = 0;
@@ -234,7 +235,7 @@ class ReportCawanganController extends Controller
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan_lelong.lelong_id','=',$lelong_id)
->where('cawangan.caw_code','=',$user['kodcaw'])
->select('lelong_id','tarikh_lelong','fasa')
->select('lelong_id','tarikh_lelong','lelong.fasa')
->groupBy('lelong_id')
->get();
@@ -311,7 +312,7 @@ class ReportCawanganController extends Controller
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan.caw_code','=',$user['kodcaw'])
->where('cawangan_lelong.lelong_id','=',$lelong_id)
->select('lelong_id','tarikh_lelong','fasa')
->select('lelong_id','tarikh_lelong','lelong.fasa')
->groupBy('lelong_id')
->get();
@@ -391,7 +392,7 @@ class ReportCawanganController extends Controller
->select('lelong_id','tarikh_lelong','lelong.fasa')
->groupBy('lelong_id')
->get();
dd($info);
// dd($info);
foreach($info as $laporancaw)
{
@@ -403,9 +404,8 @@ class ReportCawanganController extends Controller
array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]);
}
$brglelpembida = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
->where('gadai.kodcaw','=',$user['kodcaw'])
$brglelpembida = LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
->where('lelongbid.kodcaw','=',$user['kodcaw'])
->where('lelongbid.lelong_id','=',$lelong_id)
->where('lelongbidder.status_bidder','=','1')
->get()->toArray();
app/Http/Controllers/ReportController.php
+21 -5
View File
@@ -123,6 +123,8 @@ class ReportController extends Controller
foreach($datasimulasi as $index=>$totharga){
$total_hargaasas = $total_hargaasas + $totharga['hargaasas'];
$total_berat = $total_berat + $totharga['berat'];
}
@@ -137,10 +139,7 @@ class ReportController extends Controller
->where('nokp','=',$upah['nokp'])
->get();
foreach($listsag as $index=>$listing){
$total_berat = $total_berat + $listing['berat'];
}
}
$marhuns[$index1]['listsag'] = $listsag;
@@ -972,6 +971,8 @@ class ReportController extends Controller
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
$arraydetails = [];
$total_berat = 0;
$total_hargaasas = 0;
$cawangan_id = $request->caw;
@@ -994,10 +995,25 @@ class ReportController extends Controller
->join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('lelongbid','cawangan.caw_code','=','lelongbid.kodcaw')
->where([['tarikh_lelong','>=',$request->datemula],['tarikh_lelong','<=',$request->datehingga]])
->select('norujukan','marhun','berat','hargaasas','cawangan_lelong.lelong_id','lelongbid.id','cawangan.caw_code')
->get()->toArray();
return view('pdf.cetakbdbrglelong',compact('cawangan'));
foreach($cawangan as $index1=>$brglelong){
$data = LelongBid::where('id','=',$brglelong['id'])
->where('kodcaw','=',$brglelong['caw_code'])
->get();
$total_berat = $total_berat + ($data->sum('berat'));
$total_hargaasas = $total_hargaasas + ($data->sum('hargaasas'));
}
// dd($total_berat);
return view('pdf.cetakbdbrglelong',compact('cawangan','total_berat','total_hargaasas'));
}
database/seeders/RolesSeeder.php
+2
View File
@@ -182,6 +182,8 @@ class RolesSeeder extends Seeder
$role4->givePermissionTo('pengesahanbayarancash');
$role4->givePermissionTo('serahan');
$role4->givePermissionTo('tangguhlelong');
$role4->givePermissionTo('report');
$role5 = Role::create(['name' => 'jurulelong']);
$role5->givePermissionTo('pendaftaranbatch');
resources/views/home.blade.php
+2 -6
View File
@@ -179,9 +179,6 @@
@if($details['status_online'] == '0')
@if($semakCountArray[$index] > 0)
<a class="startlelongcawangan" href="{{ route('lelong.startcawangan',[$lel['info']['lelong_id'], 'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan"><button class="btn btn-danger float-right " id="btnstart" disabled>Offline</button></a><br>
@elseif($semakCountArray[$index] == 0)
@@ -207,10 +204,9 @@
<!-- @if($lel['info']['sts_lelong'] == 0) -->
<!-- <a href="{{ route('lelong.refreshhome',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> -->
@if($semakCountArray[$index] == 0)
<a class="startlelongall" href="{{ route('lelong.startall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua" style="margin-right:40px"><button class="btn btn-danger float-right " id="btnstart" >Offline</button></a>
@endif
<a href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
<!-- <a href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang" style="margin-right:40px"><i class="fas fa-users-cog"></i></a> -->
<a href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang" style="margin-right:40px"><i class="fas fa-trophy"></i></a>
resources/views/laporan/bdbrglelong.blade.php
+1 -1
View File
@@ -97,7 +97,7 @@
<span class="input-group-text" id="basic-addon1">Cawangan</span>
</div>
<select class="custom-select" name="caw" id="caw">
<option value="">Please select</option>
<option value="">Pilih Cawangan</option>
@foreach ($caw as $item)
<option value="{{$item->id}}">{{$item->caw_name}}</option>
@endforeach
resources/views/pdf/cetakbdbrglelong.blade.php
+8 -1
View File
@@ -130,7 +130,14 @@ tr:nth-child(even) {
<td>{{ $item['berat'] }}</td>
<td>{{ $item['hargaasas'] }}</td>
</tr>
@endforeach</td>
@endforeach
<tr>
<td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
<td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
<td></td>
</tr>
</table>
resources/views/pdf/laporannamapembidacaw.blade.php
+5 -1
View File
@@ -142,7 +142,11 @@ tr:nth-child(even) {
</td>
<td>
@foreach($laporan['details'] as $details)
<span class="m-2">{{ $details['masa_bidaan']}}</span><br>
<span class="m-2"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $details['masa_bidaan'] );
$t_lelong = $myDateTime->format('d-m-Y h:i:s');
echo($t_lelong);
@endphp</span><br>
@endforeach
</td>
</tr>