diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index cd2cba70..9083d022 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -8,6 +8,10 @@ use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Http; +use App\Mail\Pemenang; +use Illuminate\Support\Facades\Hash; +use Illuminate\Support\Facades\Mail; +use Illuminate\Support\Str; use PDF; use App\Models\User; use App\Models\Cawangan; @@ -1174,12 +1178,14 @@ class LelongController extends Controller return view('lelong.lelongtaklaku',compact('lelongtaklaku','lelong_id','total_pinjaman', - 'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi','info','arrayinfocaw')); + 'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi','info','arrayinfocaw','caw_code')); } public function pdflelongtaklaku (Request $request){ $lelong_id = $request->lelongid; + $kodcaw = $request->kodcaw; + // dd($kodcaw); $total_pinjaman = 0; @@ -1193,11 +1199,13 @@ class LelongController extends Controller $infolelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->where('cawangan.caw_code','=',$kodcaw) ->get(); $lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') ->where('status_jual', 0) ->where('lelongbid.lelong_id', $lelong_id) + ->where('cawangan.caw_code','=',$kodcaw) ->whereNull('t_jual') ->select( 'lelongbid.norujukan', @@ -1214,11 +1222,13 @@ class LelongController extends Controller 'lelongbid.status_jual' ) ->get(); + // dd($lelongtaklaku); foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){ $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.kodcaw','=',$kodcaw) ->where('status_jual', '=', 1) ->whereNull('t_jual') ->get(); @@ -1243,7 +1253,7 @@ class LelongController extends Controller $pdf = PDF::loadView('pdf.pdflelongtaklaku',compact('lelongtaklaku','lelong_id','infolelong','total_pinjaman', 'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi')) - ->setPaper('a4', 'landscape'); + ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Lelong Tak Laku.pdf'); } @@ -1255,6 +1265,7 @@ class LelongController extends Controller $lelonglel = Lelong::with('cawangan')->find($lelong_id); $cawanganDetail = $lelonglel->cawangan->where('caw_code', $caw_code)->first(); + // dd($cawanganDetail); $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.status_bidder', 1) @@ -1721,17 +1732,18 @@ class LelongController extends Controller $currenttime = $currentdate->toTimeString(); $endtime = $currentdate->addHours(2); - // $lelong = Lelong::where('id','=',$id)->first(); - // $lelong->masamula_lelong = $currenttime; - // $lelong->masatamat_lelong = $endtime->toTimeString(); - // $lelong->sts_lelong = 1; //start lelong - // $lelong->save(); + + $lelong = CawanganLelong::where('lelong_id','=',$id)->where('caw_id','=',$cawid)->first(); $lelong->masamula_lelong = $currenttime; $lelong->masatamat_lelong = $endtime->toTimeString(); $lelong->status_online = 1; //start lelong $lelong->save(); + // $stslelong = Lelong::where('id','=',$id)->first(); + // $stslelong->masatamat_lelong = $endtime->toTimeString(); + // $stslelong->sts_lelong = 1; //start lelong + // $stslelong->save(); return redirect()->route('home') ->with('success','Lelongan bermula'); } @@ -1842,30 +1854,26 @@ class LelongController extends Controller $day = $current->day; $month = $current->month; $year = $current->format('y'); - + $today = $current->format('Y-m-d'); $lelong = Lelong::where('id','=',$lelong_id)->first(); - $lelongbid = LelongBid::join('cawangan','cawangan.caw_code','=','lelongbid.kodcaw') - ->where('lelong_id','=',$lelong_id) - ->where('cawangan.id','=',$cawid) - ->select('lelongbid.id') - ->get(); - //dd($lelongbid); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)->where('status_jual', '=', 0)->where('caw_id', '=', $cawid)->get(); foreach($lelongbid as $bid) { - - $highestprice = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id') - ->join('cawangan','cawangan.caw_code','=','lelongbid.kodcaw') - ->where('lelongbid_id','=',$bid->id) - ->orderBy('lelongbidder.hargabida','DESC' ) + $highestprice = LelongBidder::where('lelongbid_id', '=', $bid->id) + ->where('masa_bidaan', 'LIKE', '%'.$today.'%') + ->orderBy('lelongbidder.hargabida', 'DESC') ->first(); // dd($bid->id); if($highestprice) { // foreach($highestprice as $price){ - $bidders = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id') - ->where('lelongbid_id','=',$bid->id) - ->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' ) - ->select('lelongbidder.user_id','lelongbidder.id','lelongbidder.hargabida','lelongbid.pinjaman','lelongbid.bakiupah') + $bidders = LelongBidder::join('lelongbid', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + // ->where('lelongbid.status_jual', 0) + ->where('lelongbidder.masa_bidaan', 'LIKE', '%'.$today.'%') + ->where('lelongbid.lelong_id', '=', $lelong_id) + ->where('lelongbid_id', '=', $bid->id) + ->where('hargabida', '=', $highestprice->hargabida)->orderBy('masa_bidaan', 'ASC') + ->select('lelongbidder.user_id', 'lelongbidder.id', 'lelongbidder.hargabida', 'lelongbid.pinjaman', 'lelongbid.bakiupah','lelongbid.kodcaw') ->get(); // dd($lelong[0]['cajlelong']); @@ -1877,18 +1885,11 @@ class LelongController extends Controller if($count == 1) { - $sumhargabida = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id') - ->where('lelongbidder.user_id','=',$bidder->user_id) - ->where('lelongbid.lelong_id','=',$lelong_id) - ->where('lelongbid.caw_id','=',$cawid) - ->where('lelongbidder.hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' ) - ->raw("SUM(hargabida) as hargabida") - ->get(); - // dd($bidder->user_id); - // dd($bidder->id); $pemenang = LelongBidder::where('id','=',$bidder->id)->first(); $pemenang->status_bidder = 1; $pemenang->save(); + + $userdetails = User::where('id', $bidder['user_id'])->first(); $datalelong = Lelong::where('id',$lelong_id)->get(); $sumcajlelong = $bidder->hargabida * ($datalelong[0]['cajlelong']/100); @@ -1897,7 +1898,7 @@ class LelongController extends Controller // dd($totalbaki); $updatebid->hargajual = $bidder->hargabida; $updatebid->t_jual = $currentdate; - $updatebid->cajlelong = bcdiv($sumcajlelong,1,1); + $updatebid->cajlelong = round($sumcajlelong,1,1); $updatebid->baki = $totalbaki; $updatebid->nopembeli = $bidder->user_id; $updatebid->status_jual = 1; @@ -1905,9 +1906,9 @@ class LelongController extends Controller $previous_siri = Resit::orderBy('id','desc')->first(); - $checkdata = Resit::where('user_id', $bidder->user_id) + $checkdata = Invoice::where('user_id', $bidder->user_id) ->where('lelong_id', $lelong_id) - ->where('resit_type', 2) + ->where('invoice_type', 2) ->first(); if(!$checkdata){ @@ -1917,19 +1918,21 @@ class LelongController extends Controller $nosiri = 1; } - $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri); + $reference_no = 'iPKB' . $day . $month . $year . sprintf("%08d", $nosiri);; - $resit = new Resit; - $resit->user_id = $bidder->user_id; - $resit->lelong_id = $lelong_id; - $resit->reference_no = $reference_no; - $resit->billplz_id = ''; - $resit->total_payment = $sumhargabida->sum('hargabida'); - $resit->resit_type = 2; // 1 = fee , 2 = bid - $resit->save(); + $invoice = new Invoice; + $invoice->user_id = $bidder->user_id; + $invoice->lelong_id = $lelong_id; + $invoice->invoice_no = $reference_no; + $invoice->total_invoice = '0.00'; + $invoice->invoice_type = 2; // 1 = fee , 2 = bid + $invoice->save(); + + } + Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name'])); } else { @@ -2064,8 +2067,9 @@ class LelongController extends Controller // dd($today); $lelong = Lelong::where('id', '=', $lelong_id)->first(); - $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)->get(); - foreach ($lelongbid as $bid) { + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)->where('status_jual', '=', 0)->get(); + foreach ($lelongbid as $bid) + { $highestprice = LelongBidder::where('lelongbid_id', '=', $bid->id) ->where('masa_bidaan', 'LIKE', '%'.$today.'%') ->orderBy('lelongbidder.hargabida', 'DESC') @@ -2077,13 +2081,14 @@ class LelongController extends Controller // foreach($highestprice as $price){ // $bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get(); $bidders = LelongBidder::join('lelongbid', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + // ->where('lelongbid.status_jual', 0) ->where('masa_bidaan', 'LIKE', '%'.$today.'%') ->where('lelongbid.lelong_id', '=', $lelong_id) ->where('lelongbid_id', '=', $bid->id) ->where('hargabida', '=', $highestprice->hargabida)->orderBy('masa_bidaan', 'ASC') - ->select('lelongbidder.user_id', 'lelongbidder.id', 'lelongbidder.hargabida', 'lelongbid.pinjaman', 'lelongbid.bakiupah') + ->select('lelongbidder.user_id', 'lelongbidder.id', 'lelongbidder.hargabida', 'lelongbid.pinjaman', 'lelongbid.bakiupah','lelongbid.kodcaw') ->get(); - // dd($bidders); + // dd($bidders->sum('hargabida')); $count = 0; foreach ($bidders as $bidder) { $count = $count + 1; @@ -2093,6 +2098,7 @@ class LelongController extends Controller $pemenang->status_bidder = 1; $pemenang->save(); + $userdetails = User::where('id', $bidder['user_id'])->first(); // $updatebid = LelongBid::where('id','=',$bid->id)->first(); // // dd($updatebid); // $updatebid->hargajual = $bidder->hargabida; @@ -2147,13 +2153,15 @@ class LelongController extends Controller $invoice->save(); // dd($invoice->toArray()); // dd("sni"); + //sending notify emel kepada pembida } + Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name'])); } else { $kalah = LelongBidder::where('id', '=', $bidder->id) - ->first(); + ->first(); $kalah->status_bidder = 0; $kalah->save(); - } + } // return back()->with('failed', 'Failed! there is some issue with email provider'); } // } @@ -2511,7 +2519,9 @@ class LelongController extends Controller public function pindahjanadata(Request $request) { - // dd($request->all()); + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); $lelongidasal = $request->lelongidasal; $lelongidbaru = $request->lelong_id; // dd($lelongidasal); @@ -2546,10 +2556,36 @@ class LelongController extends Controller $caw_pindah = CawanganLelong::where('caw_id', $cawpindah->id)->first(); $caw_pindah->lelong_id = $lelongidbaru; $caw_pindah->update(); + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $data->norujukan; + $loguser->nota = 'Pindah Lelong '.$lelongidasal.'-'.$lelongidbaru; + $loguser->save(); } - - - + } + $checksag = LelongBid::where('lelong_id',$lelongidasal) + ->first(); + // dd($checksag); + + if(empty($checksag)) + { + $lelongbatch = Lelong::where('id','=',$lelongidasal)->first(); + $lelongbatch->delete(); + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + // $loguser->norujukan = $data->norujukan; + $loguser->nota = 'Hapus Batch Lelong '.$lelongidasal; + $loguser->save(); } } @@ -2857,25 +2893,23 @@ class LelongController extends Controller $pindahlelongsag->lelong_id = $lelongidbaru; $pindahlelongsag->update(); + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $norujukan; + $loguser->nota = 'Pindah Lelong '.$lelongidasal.'-'.$lelongidbaru; + $loguser->save(); + $checksag = LelongBid::where('lelong_id',$request->lelongid) ->first(); // dd($checksag); - if($checksag) + if(empty($checksag)) { - - //insert loguser - $loguser = new LogUser; - $loguser->user_id = $user->id; - $loguser->date = $currentdate; - $loguser->username = $user->username; - $loguser->nama_user = $user->name; - $loguser->norujukan = $norujukan; - $loguser->nota = 'Pindah Lelong '.$lelongidasal.'-'.$lelongidbaru; - $loguser->save(); - } - else{ $lelongbatch = Lelong::where('id','=',$lelongidasal)->first(); $lelongbatch->delete(); @@ -2884,8 +2918,8 @@ class LelongController extends Controller $loguser->date = $currentdate; $loguser->username = $user->username; $loguser->nama_user = $user->name; - $loguser->norujukan = $norujukan; - $loguser->nota = 'Pindah Lelong '.$lelongidasal.'-'.$lelongidbaru; + // $loguser->norujukan = $data->norujukan; + $loguser->nota = 'Hapus Batch Lelong '.$lelongidasal; $loguser->save(); } @@ -3823,7 +3857,6 @@ class LelongController extends Controller $lelong = Lelong::where('kali','=',$kali)->first(); $cawanganlel = CawanganLelong::where('kali','=',$kali)->get(); - // dd($cawangansim); $arraydata = []; $arraycaw = []; diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 881d44c8..d0ef92f0 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -401,6 +401,7 @@ class PembidaController extends Controller $currentdate = $currentdate->toDateTimeString(); $t_lelong = Carbon::parse($request->t_lelong); $data = $request->checkboxdata; + // dd($data); foreach($data as $index=>$norujukan) { $user = Auth::user(); @@ -408,18 +409,33 @@ class PembidaController extends Controller $currentdate = $currentdate->toDateTimeString(); //$marhun = LelongBid::where('norujukan','=',$norujukan)->first(); - $taklaku = new TakLaku; - $taklaku->lelong_id = $request->lelong_id; - $taklaku->caw_id = $request->caw_id; - $taklaku->kodcaw = $request->kodcaw; - $taklaku->norujukan = $norujukan; - $taklaku->t_lelong = $t_lelong; - $taklaku->status = '0'; - $taklaku->fasa = $request->fasa; - $taklaku->save(); + // $taklaku = new TakLaku; + // $taklaku->lelong_id = $request->lelong_id; + // $taklaku->caw_id = $request->caw_id; + // $taklaku->kodcaw = $request->kodcaw; + // $taklaku->norujukan = $norujukan; + // $taklaku->t_lelong = $t_lelong; + // $taklaku->status = '0'; + // $taklaku->fasa = $request->fasa; + // $taklaku->save(); + + $infos = LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->join('lelong','lelong.id','=','lelongbid.lelong_id') + ->select ('lelongbid.kodcaw','lelongbid.caw_id','lelongbidder.user_id','lelongbidder.nama_bidder','lelongbidder.hargabida','lelongbid.norujukan','lelongbid.hargaasas','lelongbidder.masa_bidaan','lelongbid.t_lelong','lelongbid.id','lelongbid.fasa','lelongbid.lelong_id') + ->where('lelongbid.norujukan', $norujukan) + ->where('lelongbid.kodcaw', $request->kodcaw) + ->where('lelongbid.status_jual', 1) + ->where('lelongbidder.status_bidder', 1) + ->groupBy('lelongbidder.user_id') + ->where(function($query){ + $query->whereNull('lelongbidder.status_payment') + ->orWhere('lelongbidder.status_payment',2); + }) + ->first(); + // dd($infos->user_id); //banned pembida - $user = User::where('id','=',$request->user_id)->first(); + $user = User::where('id','=',$infos->user_id)->first(); // dd($user); $user->updated_at = $currentdate; $user->status = 'banned'; @@ -438,7 +454,7 @@ class PembidaController extends Controller //hapus lelongbidder $lelongbidder = LelongBidder::where('lelongbid_id', $bida->id) - ->where('user_id', $request->user_id) + ->where('user_id', $infos->user_id) ->delete(); // dd($lelongbidder); @@ -452,7 +468,7 @@ class PembidaController extends Controller $loguser->nota = ' Tak Laku Lelong'; $loguser->save(); } - return redirect()->route('lelong.senarailelongtaklaku'); + return redirect()->route('lelong.senlelbelumbayarbidaan'); } public function kebenaranbayarantunai(Request $request) diff --git a/app/Mail/Pemenang.php b/app/Mail/Pemenang.php new file mode 100644 index 00000000..55752a6f --- /dev/null +++ b/app/Mail/Pemenang.php @@ -0,0 +1,69 @@ +name = $name; + // $this->id = $id; + // $this->lelong_id = $lelong_id; + // $this->token = $token; + } + + /** + * Build the message. + *git stsa + */ + public function build() + { + // return $this->view('view.name'); + $user['name'] = $this->name; + // $user['id'] = $this->id; + // $user['lelong_id'] = $this->lelong_id; + // $user['token'] = $this->token; + // $current = Carbon::now(); + // $current = new Carbon(); + // $today = $current->format('Y-m-d'); + + // $bidders = LelongBidder::join('lelongbid', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + // // ->where('lelongbid.status_jual', 0) + // ->where('masa_bidaan', 'LIKE', '%'.$today.'%') + // ->where('lelongbid.lelong_id', '=', $this->lelong_id) + // ->where('lelongbid.nopembeli', '=', $this->id) + // ->where('lelongbid.status_jual', '=', 1) + // ->select('lelongbidder.user_id', 'lelongbidder.id', 'lelongbidder.hargabida', 'lelongbid.pinjaman', 'lelongbid.bakiupah','lelongbid.kodcaw') + // ->get(); + // foreach($bidders as $index=>$bidder) + // { + // $bidders[$index]['hargabida'] = $bidder->sum('hargabida'); + // } + + // $infos[$index1]['info'] = $info; + + return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid") + ->subject('ArrahnBid -Tahniah,Nama Anda Pemenang ArrahnBid') + ->view('template.pemenang', ['user' => $user]); + } +} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 26f7991d..7eb3930b 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -177,7 +177,7 @@ @endhasrole @hasrole('jurulelong') - Saya jurulelong! + {{-- Saya jurulelong! --}}
@@ -188,10 +188,10 @@
-
- + +
@if(count($arrayinfo)> 0) - +
@@ -265,16 +265,16 @@ @if($semakCountArray[$index] == 0) @endif - + {{-- --}} - + {{-- --}} - + @@ -301,7 +301,6 @@
@endif - @endhasrole @hasrole('operasi') @@ -317,7 +316,7 @@
@if(count($arrayinfomenang)> 0) SENARAI PEMENANG BIDAAN MENGIKUT CAWANGAN - +
@@ -343,8 +342,8 @@ @endphp diff --git a/resources/views/home/kaunterpembayaran.blade.php b/resources/views/home/kaunterpembayaran.blade.php index f850a8b9..8731a1f1 100644 --- a/resources/views/home/kaunterpembayaran.blade.php +++ b/resources/views/home/kaunterpembayaran.blade.php @@ -4,7 +4,17 @@
-
+
+
+
+ + + +
+ Senarai Bayaran Pemenang +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -14,11 +24,7 @@

{{ $message }}

@endif - -

Senarai Pemenang

-
No @foreach($lel['detailsinfo'] as $details) - - {{ $details['caw_name']}} + + {{ $details['caw_name']}}
@endforeach
+
diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php index 5d2c34f9..8739914a 100644 --- a/resources/views/jurulelong/listcawangan.blade.php +++ b/resources/views/jurulelong/listcawangan.blade.php @@ -3,8 +3,14 @@ @section('content')
-
- +
+
+
+
+ Jana Pemenang +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -12,7 +18,7 @@ @endif
-
No
+
diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index d503f0ba..ee57fde5 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -3,26 +3,33 @@ @section('content')
-
- +
+
+
+ + + +
+ Butiran Lelongan Tak Laku +
+
+
No
@foreach ($info as $info) - + @endforeach @foreach ($arrayinfocaw as $laporancaw) - @foreach ($laporancaw['cawangan'] as $details) - + @foreach ($laporancaw['cawangan'] as $details) + @endforeach @@ -39,21 +46,23 @@ @csrf + {{-- {{dd($caw_code)}} --}} + -
Batch Lelong: {{$lelong_id}}Tarikh Lelong : @php - $myDateTime = DateTime::createFromFormat('Y-m-d',$info->tarikh_lelong ); - $datez = $myDateTime->format('d-m-Y'); - echo($datez); - @endphpTarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d',$info->tarikh_lelong ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphpFasa: {{$info->fasa}} Cawangan : {{$details['caw_name']}} - @endforeachCawangan : {{$details['caw_name']}} + @endforeach
+
- - + {{-- --}} + - + {{-- - + --}} @@ -63,14 +72,14 @@ - + {{-- --}} - - {{ $leltaklaku->cajlelong }} + @php $rugi = ''; $baki = ''; if(strpos($leltaklaku->baki, '-') !== false) @@ -80,9 +89,9 @@ else { $baki = $leltaklaku->baki; } - ?> + @endphp - + --}} @if($leltaklaku->status_jual == 0) @endif @@ -96,14 +105,14 @@ - + - - {{ number_format($total_cajlelong, 2, '.', ',') }} + @php $total_rugi = 0; $total_baki = 0; if(strpos($leltaklaku->total_bakirugi, '-') !== false) @@ -115,9 +124,9 @@ $total_rugi = $total_bakirugi; } - ?> + @endphp - + --}} @@ -125,9 +134,9 @@
No No RujukanBilanganPinjaman (RM)BilanganPembiayaan (RM) Berat (gm) N. Marhun (RM) Harga Asas (RM) Keuntungan (RM)Caj (RM)Caj (RM) Rugi (RM)Baki (RM)Baki (RM)Status Lelong (RM) Tindakan
{{ $loop->iteration }} {{ $leltaklaku->norujukan }}{{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }} {{ $leltaklaku->berat }} {{ $leltaklaku->nilaimarhun }} {{ $leltaklaku->hargaasas }} {{ $leltaklaku->upahsimpan }}{{ $leltaklaku->cajlelong }}{{$rugi}}{{$baki}}{{$baki}}TIDAK LAKU
JUMLAH KESELURUHANJUMLAH KESELURUHAN {{ number_format($total_pinjaman, 2, '.', ',') }} {{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nmarhun, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} {{ number_format($total_upahsimpan, 2, '.', ',') }}{{ number_format($total_cajlelong, 2, '.', ',') }}{{number_format($total_rugi, 2, '.', ',')}}{{number_format($total_baki, 2, '.', ',')}}{{number_format($total_baki, 2, '.', ',')}}
-
+ {{--
Kembali -
+
--}} diff --git a/resources/views/lelong/senaraimarhunsimulasi.blade.php b/resources/views/lelong/senaraimarhunsimulasi.blade.php index 66cc8d97..315feb2e 100644 --- a/resources/views/lelong/senaraimarhunsimulasi.blade.php +++ b/resources/views/lelong/senaraimarhunsimulasi.blade.php @@ -4,11 +4,17 @@
-
- - Senarai Simulasi Lelong +
+
+
+ + + +
+ Senarai Simulasi Lelong +
+
+
@foreach ($arrayinfo as $laporan) @@ -39,7 +45,7 @@ @csrf -
+
diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php index 4da90102..1dac804f 100644 --- a/resources/views/lelong/senaraipemenang.blade.php +++ b/resources/views/lelong/senaraipemenang.blade.php @@ -11,7 +11,7 @@
- senarai lelong : {{ $cawanganDetail->caw_name }} + senarai lelong
diff --git a/resources/views/lelong/showlelongdone.blade.php b/resources/views/lelong/showlelongdone.blade.php index 3a89f0bd..0ca6883f 100644 --- a/resources/views/lelong/showlelongdone.blade.php +++ b/resources/views/lelong/showlelongdone.blade.php @@ -188,7 +188,7 @@ @foreach ($arraycaw as $index=>$caw)
- + diff --git a/resources/views/lelong/showrenewxlaku.blade.php b/resources/views/lelong/showrenewxlaku.blade.php index ff0c76b0..384cc605 100644 --- a/resources/views/lelong/showrenewxlaku.blade.php +++ b/resources/views/lelong/showrenewxlaku.blade.php @@ -43,7 +43,7 @@ {{$lelong_id}} -
No
{{$index+1}}{{ $caw['cawangan'] }}{{ $caw['cawangan'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} {{ number_format($caw['n_marhun'], 2, '.', ',') }}
+
@@ -72,10 +72,10 @@ - - - - + + + +
JUMLAH KESELURUHAN{{ $total_marhun }}{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nilaimarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ $total_marhun }}{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nilaimarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}
diff --git a/resources/views/pdf/pdflelongtaklaku.blade.php b/resources/views/pdf/pdflelongtaklaku.blade.php index e463d473..59b87662 100644 --- a/resources/views/pdf/pdflelongtaklaku.blade.php +++ b/resources/views/pdf/pdflelongtaklaku.blade.php @@ -11,19 +11,54 @@ #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { border: 0px solid; padding: 1px; - text-align: left; + + /* text-align: left; */ } -#sim tr:nth-child(even){} +#sim tr:nth-child(even){ + /* border-bottom: 1px solid #ddd; */ +} #sim tr:hover {} #sim th { - text-align: left; + /* text-align: left; */ border: 0px solid; table-layout:auto; color: black; + + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; +} + + +#sim2 { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size:10px; + border-collapse: collapse; + width: 100%; +} + +#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { + border: 0px solid; + padding: 1px; + + /* text-align: left; */ + +} + +#sim2 tr:nth-child(even){ + /* border-bottom: 1px solid #ddd; */ +} + +#sim2 tr:hover {} + +#sim2 th { + /* text-align: left; */ + border: 0px solid; + table-layout:auto; + color: black; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; } @@ -37,7 +72,7 @@ } .column { - float: left; + /* float: left; */ width: 100%; padding: 5px; } @@ -57,22 +92,29 @@ table { } td { - text-align: left; + /* text-align: left; */ padding: 16px; } th{ - text-align: left; + /* text-align: left; */ padding: 16px; - background-color:gainsboro; + /* text-align: left; */ + table-layout:auto + color: black; + border-bottom: 1px solid #ddd; + /* background-color:gainsboro; */ } + tr:nth-child(even) { - background-color: #f2f2f2; + /* background-color: #f2f2f2; */ + } + @@ -106,17 +148,17 @@ tr:nth-child(even) { - - - - - - - - - + + + {{-- --}} + + + + + + {{-- - + --}} > @@ -125,15 +167,15 @@ tr:nth-child(even) { @foreach ($lelongtaklaku as $leltaklaku) - - - - - - - - - {{ $leltaklaku->norujukan }} + {{-- --}} + + + + + + {{-- + @php $rugi = ''; $baki = ''; if(strpos($leltaklaku->baki, '-') !== false) @@ -143,24 +185,24 @@ tr:nth-child(even) { else { $baki = $leltaklaku->baki; } - ?> + @endphp - - - + --}} + {{-- + --}} @endforeach - - - - - - - - Jumlah Keseluruhan + + + + + + {{-- + @php $total_rugi = 0; $total_baki = 0; if(strpos($leltaklaku->total_bakirugi, '-') !== false) @@ -172,9 +214,9 @@ tr:nth-child(even) { $total_rugi = $total_bakirugi; } - ?> + @endphp - + --}} diff --git a/resources/views/pembida/detailsbidaanbelumbayar.blade.php b/resources/views/pembida/detailsbidaanbelumbayar.blade.php index 72998e27..4c7fbdad 100644 --- a/resources/views/pembida/detailsbidaanbelumbayar.blade.php +++ b/resources/views/pembida/detailsbidaanbelumbayar.blade.php @@ -66,7 +66,7 @@
NoNo RujukanBilanganPinjaman(RM)Berat(gm)Nilai Marhun(RM)Harga Asas(RM)Upah Simpan(RM)Caj Lelong(RM)NoNo RujukanBilanganPembiayaan(RM)Berat(gm)Nilai Marhun(RM)Harga Asas(RM)Keuntungan(RM)Caj Lelong(RM) Rugi Lelong(RM)Baki Lelong(RM)Baki Lelong(RM)
{{ $loop->iteration }}{{ $leltaklaku->norujukan }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }}{{ $leltaklaku->berat }}{{ $leltaklaku->nilaimarhun }}{{ $leltaklaku->hargaasas }}{{ $leltaklaku->upahsimpan }}{{ $leltaklaku->cajlelong }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }} {{ $leltaklaku->berat }}{{ $leltaklaku->nilaimarhun }}{{ $leltaklaku->hargaasas }}{{ $leltaklaku->upahsimpan }}{{ $leltaklaku->cajlelong }}{{$rugi}}{{$baki}}{{$baki}}
Jumlah Keseluruhan{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_upahsimpan, 2,'.',',') }}{{ number_format($total_cajlelong, 2,'.',',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_upahsimpan, 2,'.',',') }}{{ number_format($total_cajlelong, 2,'.',',') }}{{number_format($total_rugi, 2, '.', ',')}}{{number_format($total_baki, 2, '.', ',')}}{{number_format($total_baki, 2, '.', ',')}}
- Kembali + {{-- Kembali --}}
diff --git a/resources/views/template/pemenang.blade.php b/resources/views/template/pemenang.blade.php new file mode 100644 index 00000000..b9395ffd --- /dev/null +++ b/resources/views/template/pemenang.blade.php @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + +
+ + + + + + + +
+ ArrahnBid +
+ + + + +
+

+ Kepada {{ $user ? $user['name'] : '' }}, +

+ Tahniah, Nama Anda Telah Menang Dalam Bidaan Emas Hari Ini, Sila Semak Bidaan Anda Dalam Pautan ini. +

+ +

+ LOG MASUK ARRAHNBID +

+ + +

+ Terima Kasih,

+

+ ArrahnBid

+
+
+
+ + \ No newline at end of file