diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 670af09c..8a90b555 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -4768,68 +4768,46 @@ class LelongController extends Controller $total_bakiupah = 0; $total_nilaimarhun = 0; $keuntungan = 0; + $bakilelong = 0; + $total_cazlelong = 0; - $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') - ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid) - ->where('status_jual','=',0) - ->select( - 'lelongbid.t_lelong', - 'lelongbid.kodcaw', - 'cawangan.caw_name', - 'lelongbid.norujukan', - 'lelongbid.pinjaman', - 'lelongbid.berat', - 'lelongbid.nilaimarhun', - 'lelongbid.hargaasas', - 'lelongbid.hargajual', - 'lelongbid.t_jual', - 'lelongbid.upahsimpan', - 'lelongbid.cajlelong', - 'lelongbid.baki', - 'lelongbid.bakiupah', - 'lelongbid.status_jual', - 'lelongbid.jbg' - ) - ->get()->toArray(); + $lelonglel = Lelong::with('cawangan')->find($lelongid); + + $cawanganDetail = $lelonglel->cawangan->find($cawid); + + $marhuns = LelongBid::where('caw_id', '=', $cawid) + ->where('lelong_id', '=', $lelongid) + ->where('caw_id','=',$cawid) + ->get(); // dd($marhuns); $arraymarhun = []; foreach ($marhuns as $index1=> $cal) { - // dd($cal); - $gadai = Gadai::on($cal['kodcaw']) - ->where('norujukan','=',$cal['norujukan']) - ->first(); - // dd($gadai); - $customer = Customer::where('kpbaru','=',$gadai['nokp']) - ->orWhere('kplama','=',$gadai['nokp']) - ->first(); - // dd($customer); - - // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); + $sumcajlelong = $cal['hargaasas'] * ($lelonglel->cajlelong/100); + $cajlelongnew = round($sumcajlelong,1,1); + $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew; + $marhuns[$index1]['cajlelong'] = $cajlelongnew; + $marhuns[$index1]['baki'] = $totalbaki; $marhuns[$index1]['keuntungan'] = $keuntungan; - $marhuns[$index1]['nama'] = $customer; - array_push($arraymarhun,[ - 'norujukan' => $cal['norujukan'], - 'tempoh' => $gadai['tempoh'], - 'nama' => $customer['nama'], - 'berat' => $cal['berat'], - 'nilaimarhun' => $cal['nilaimarhun'], - 'hargaasas' => $cal['hargaasas'], - 'hargajual' => $cal['hargajual'], - 't_jual' => $cal['t_jual'], - 'pinjaman' => $cal['pinjaman'], - 'pinjasal' => $gadai['pinjaman'], - 'bakiupah' => $cal['bakiupah'], - 'cajlelong' => $cal['cajlelong'], - 'baki' => $cal['baki'], - 'upah6bulan' => $gadai['bakiupah'] - ]); - // $total_marhun = $total_marhun + sizeof($databid); $total_berat = $total_berat + $cal['berat']; $total_pinjaman = $total_pinjaman + $cal['pinjaman']; $total_hargaasas = $total_hargaasas + $cal['hargaasas']; $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun']; $total_bakiupah = $total_bakiupah + $cal['bakiupah']; + $total_cazlelong = $total_cazlelong + $cajlelongnew; + + array_push($arraymarhun,[ + 'norujukan' => $cal['norujukan'], + 'tempoh' => $cal['jbg'], + 'berat' => $cal['berat'], + 'nilaimarhun' => $cal['nilaimarhun'], + 'hargaasas' => $cal['hargaasas'], + 'pinjaman' => $cal['pinjaman'], + 'bakiupah' => $cal['bakiupah'], + 'cajlelong' => $cajlelongnew, + 'baki' => $cal['baki'], + ]); + } $arrayinfo = []; @@ -4855,7 +4833,9 @@ class LelongController extends Controller 'total_upah', 'total_hargaasas', 'total_bakiupah', - 'total_nilaimarhun')); + 'total_nilaimarhun', + 'lelonglel', + 'total_cazlelong')); } public function showlelongpc(Request $request, $id) diff --git a/resources/views/jananotis/gadaibycaw.blade.php b/resources/views/jananotis/gadaibycaw.blade.php index cddee91a..7fabfb50 100644 --- a/resources/views/jananotis/gadaibycaw.blade.php +++ b/resources/views/jananotis/gadaibycaw.blade.php @@ -3,8 +3,20 @@ @section('content')
-
-

Butiran Gadaian Cawangan {{ $user->kodcaw }}

+
+
+
+
+ + + +
+ + Butiran Gadaian Cawangan {{ $user->kodcaw }} +
+
+
+ {{--

Butiran Gadaian Cawangan {{ $user->kodcaw }}

--}} @if ($message = Session::get('failed'))
@@ -13,12 +25,45 @@ @endif
-
-
-

Tarikh Lelong : {{ $t_lelong }}

-

Tarikh Gadai Sehingga : {{ $t_gadais->t_gadai }}

-

Anggaran Tarikh Daftar Lelong : {{ $t_anggaran }}

-

Bilangan Surat : {{ $bil_lelongcaw[0]['bil_lelong'] }}

+
+ {{--
--}} +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ {{--

Tarikh Lelong : {{ $t_lelong }}

--}} + {{--

Tarikh Gadai Sehingga : {{ $t_gadais->t_gadai }}

--}} + {{--

Anggaran Tarikh Daftar Lelong : {{ $t_anggaran }}

+

Bilangan Surat : {{ $bil_lelongcaw[0]['bil_lelong'] }}

--}}
@@ -28,7 +73,7 @@ EXCEL
- +
diff --git a/resources/views/lelong/pindahsenarailelong.blade.php b/resources/views/lelong/pindahsenarailelong.blade.php index bb093553..72efc664 100644 --- a/resources/views/lelong/pindahsenarailelong.blade.php +++ b/resources/views/lelong/pindahsenarailelong.blade.php @@ -3,16 +3,25 @@ @section('content')
-
-
- +
+
+
+
+ {{-- + + --}} +
+ + butiran lelong (pindah lelong) +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@endif -
Pindah Lelong
-
Bil
+
@@ -60,9 +69,9 @@ -
Bil{{$data['laporan']['jbg']}} {{$data['laporan']['cajlelong']}} + @hasrole('jurulelong') - + @@ -79,7 +88,7 @@ @hasrole('operasi') @if($data['laporan']['sts_lelong'] == 0) - + @elseif($data['laporan']['sts_lelong'] == 1) @elseif($data['laporan']['sts_lelong'] == 2) diff --git a/resources/views/lelong/senaraimarhunpc.blade.php b/resources/views/lelong/senaraimarhunpc.blade.php index c909ec38..ab21d12c 100644 --- a/resources/views/lelong/senaraimarhunpc.blade.php +++ b/resources/views/lelong/senaraimarhunpc.blade.php @@ -4,34 +4,57 @@
-
- -