Merge branch 'atie' into 'main'

update jana pemenang, add emel notifikasi

See merge request online-sistem1/lelong!324
This commit is contained in:
Nur Izzati Zulkifli
2022-12-08 09:04:16 +00:00
14 changed files with 450 additions and 186 deletions
+103 -70
View File
@@ -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 = [];
+28 -12
View File
@@ -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)
+69
View File
@@ -0,0 +1,69 @@
<?php
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use App\Models\LelongBidder;
use Carbon\Carbon;
class Pemenang extends Mailable
{
use Queueable, SerializesModels;
/**
* Create a new message instance.
*
* @return void
*/
public $name;
// public $id;
// public $lelong_id;
// public $token;
public function __construct($name)
{
$this->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]);
}
}
+10 -11
View File
@@ -177,7 +177,7 @@
</div>
@endhasrole
@hasrole('jurulelong')
Saya jurulelong!
{{-- Saya jurulelong! --}}
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
@@ -188,10 +188,10 @@
</div>
</div>
</div>
<div class="card-body">
@if(count($arrayinfo)> 0)
<table class=" table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<table class=" table table-bordered table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
@@ -265,16 +265,16 @@
@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.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>
{{-- <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> --}}
<!-- <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a> -->
<!-- @elseif ($lel['info']['sts_lelong'] == 2) -->
<!-- <a href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a> -->
<a href="{{ route('lelong.janapemenangallcaw',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
<!-- @elseif ($lel['info']['sts_lelong'] == 3) -->
<a href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
<a href="{{ route('lelong.listpemenang') }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
<!-- @else -->
<a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><button class="btn btn-success float-right " id="btnstart" >Online</button></a></a>
@@ -301,7 +301,6 @@
</table>
@endif
@endhasrole
@hasrole('operasi')
@@ -317,7 +316,7 @@
</div>
@if(count($arrayinfomenang)> 0)
SENARAI PEMENANG BIDAAN MENGIKUT CAWANGAN
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<table class="table table-bordered table-xl text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -343,8 +342,8 @@
@endphp</td>
<td class="text-left">
@foreach($lel['detailsinfo'] as $details)
<a href=" {{ route('pembida.kaunterpembayaran', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<strong><span class="m-2">{{ $details['caw_name']}}</strong>
<a class="btn m-1 btn-primary" href=" {{ route('pembida.kaunterpembayaran', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<span class="m-2">{{ $details['caw_name']}}
</span><br>
@endforeach
</td>
@@ -4,7 +4,17 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="col">
<div class="card">
<div class="card-header header-style">
<a href="javascript:window.history.go(-1);" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Senarai Bayaran Pemenang
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -14,11 +24,7 @@
<p>{{ $message }}</p>
</div>
@endif
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<h4> Senarai Pemenang </h4>
<table class="table table-striped table-xl text-center" id="tablekaunter" style="width:100%">
<table class="table table-bordered table-xl text-center" id="tablekaunter" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -3,8 +3,14 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="col">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Jana Pemenang
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -12,7 +18,7 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<table class="table table-bordered table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
+38 -29
View File
@@ -3,26 +3,33 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="javascript:window.history.go(-1);" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Butiran Lelongan Tak Laku
</div>
</div>
<div class="card-body">
<table cellspacing="2" cellpadding="3" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped table-xl">
<thead class="bg-light ">
<tr>
<td><b>Batch Lelong: {{$lelong_id}}</b></td>
@foreach ($info as $info)
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d',$info->tarikh_lelong );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d',$info->tarikh_lelong );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</b></td>
@endforeach
<td><b>Fasa: {{$info->fasa}} <b></td>
@foreach ($arrayinfocaw as $laporancaw)
@foreach ($laporancaw['cawangan'] as $details)
<td><b>Cawangan : {{$details['caw_name']}}
@endforeach</b></td>
@foreach ($laporancaw['cawangan'] as $details)
<td><b>Cawangan : {{$details['caw_name']}}
@endforeach</b></td>
@endforeach
</tr>
@@ -39,21 +46,23 @@
@csrf
<input type="hidden" name="type" value="User">
<input type="hidden" name="lelongid" value="{{$lelong_id}}">
{{-- {{dd($caw_code)}} --}}
<input type="hidden" name="kodcaw" value="{{$caw_code}}">
<table class="table table-striped table-xl text-center" id="notis" style="width:104%">
<table class="table table-bordered text-center" id="notis">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Bilangan</th>
<th>Pinjaman (RM)</th>
{{-- <th>Bilangan</th> --}}
<th>Pembiayaan (RM)</th>
<th>Berat (gm)</th>
<th>N. Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Keuntungan (RM)</th>
<th>Caj (RM)</th>
{{-- <th>Caj (RM)</th>
<th>Rugi (RM)</th>
<th>Baki (RM)</th>
<th>Baki (RM)</th> --}}
<th>Status Lelong (RM)</th>
<th>Tindakan</th>
</tr>
@@ -63,14 +72,14 @@
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $leltaklaku->norujukan }}</td>
<td>{{ $leltaklaku['suratlelongtaklaku'] }} </td>
{{-- <td>{{ $leltaklaku['suratlelongtaklaku'] }} </td> --}}
<td>{{ $leltaklaku->pinjaman }}</td>
<td>{{ $leltaklaku->berat }}</td>
<td>{{ $leltaklaku->nilaimarhun }}</td>
<td>{{ $leltaklaku->hargaasas }}</td>
<td>{{ $leltaklaku->upahsimpan }}</td>
<td>{{ $leltaklaku->cajlelong }}</td>
<?php
{{-- <td>{{ $leltaklaku->cajlelong }}</td>
@php
$rugi = '';
$baki = '';
if(strpos($leltaklaku->baki, '-') !== false)
@@ -80,9 +89,9 @@
else {
$baki = $leltaklaku->baki;
}
?>
@endphp
<td>{{$rugi}}</td>
<td>{{$baki}}</td>
<td>{{$baki}}</td> --}}
@if($leltaklaku->status_jual == 0)
<td style = "color:red" ><b>TIDAK LAKU</b> </td>
@endif
@@ -96,14 +105,14 @@
<tfoot>
<tr>
<td colspan="5" align="left"><b><strong>JUMLAH KESELURUHAN</strong></b></td>
<td colspan="2" align="left"><b><strong>JUMLAH KESELURUHAN</strong></b></td>
<td><strong>{{ number_format($total_pinjaman, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
<?php
{{-- <td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
@php
$total_rugi = 0;
$total_baki = 0;
if(strpos($leltaklaku->total_bakirugi, '-') !== false)
@@ -115,9 +124,9 @@
$total_rugi = $total_bakirugi;
}
?>
@endphp
<td><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td>
<td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td>
<td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td> --}}
<td></td>
<td></td>
</tr>
@@ -125,9 +134,9 @@
</table>
<div class="modal-footer" style="margin-top:2%;">
{{-- <div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('lelong.senarailelongtaklaku') }}" class="btn btn-primary">Kembali</a>
</div>
</div> --}}
</div>
</div>
</div>
@@ -4,11 +4,17 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<span class="pt-3" style="margin-left:1%; font-size:20px"><b>Senarai Simulasi Lelong</b></span>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<a href="javascript:window.history.go(-1);" class="header-style-icon">
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
Senarai Simulasi Lelong
</div>
</div>
<div class="card-body">
<table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped table-xl">
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
@@ -39,7 +45,7 @@
@csrf
<input type="hidden" name="lelongid" value="{{$lelongid}}">
<input type="hidden" name="cawid" value="{{$cawid}}">
<table class="table table-striped table-xl" id="marhun" style="width:100%">
<table class="table table-bordered table-xl" id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -11,7 +11,7 @@
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
senarai lelong : {{ $cawanganDetail->caw_name }}
senarai lelong
</div>
</div>
<div class="card-body">
@@ -188,7 +188,7 @@
@foreach ($arraycaw as $index=>$caw)
<tr>
<td>{{$index+1}}</td>
<td><a href=" {{ route('lelong.senaraimarhundone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
<td style='white-space:nowrap;'><a href=" {{ route('lelong.senaraimarhundone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
<td>{{ $caw['bil_marhun'] }}</td>
<td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
@@ -43,7 +43,7 @@
{{$lelong_id}}
</div>
</div>
<table class="table table-striped table-xl" id="simulasi" style="width:100%">
<table class="table table-bordered table-xl" id="simulasi" style="width:100%">
<thead class="bg-primary text-white">
<tr class="text-center">
<!-- <th>Pilih</th> -->
@@ -72,10 +72,10 @@
<tfoot>
<tr>
<td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
<td align = 'center'>{{ $total_marhun }}</td>
<td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td align = 'center'><b>{{ $total_marhun }}</td>
<td align = 'right'><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
</tr>
</tfoot>
</table>
+83 -41
View File
@@ -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; */
}
</style>
<body>
<table width="100%" border="0" id="sim">
@@ -106,17 +148,17 @@ tr:nth-child(even) {
<thead>
<tr>
<th width="3%" align="left">No</th>
<th width="15%" align="left">No Rujukan</th>
<th width="8%" align="left">Bilangan</th>
<th width="12%" align="left">Pinjaman(RM)</th>
<th width="8%" align="left">Berat(gm)</th>
<th width="12%" align="left">Nilai Marhun(RM)</th>
<th width="12%" align="left">Harga Asas(RM)</th>
<th width="12%" align="left">Upah Simpan(RM)</th>
<th width="12%" align="left">Caj Lelong(RM)</th>
<th align="left">No</th>
<th align="center">No Rujukan</th>
{{-- <th align="left">Bilangan</th> --}}
<th align="right">Pembiayaan(RM)</th>
<th align="right">Berat(gm)</th>
<th align="right">Nilai Marhun(RM)</th>
<th align="right">Harga Asas(RM)</th>
<th align="right">Keuntungan(RM)</th>
{{-- <th width="12%" align="left">Caj Lelong(RM)</th>
<th width="12%" align="left">Rugi Lelong(RM)</th>
<th width="12%" align="left">Baki Lelong(RM)</th>
<th width="12%" align="left">Baki Lelong(RM)</th> --}}
>
</tr>
@@ -125,15 +167,15 @@ tr:nth-child(even) {
@foreach ($lelongtaklaku as $leltaklaku)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $leltaklaku->norujukan }}</td>
<td> {{ $leltaklaku['suratlelongtaklaku'] }} </td>
<td>{{ $leltaklaku->pinjaman }}</td>
<td>{{ $leltaklaku->berat }}</td>
<td>{{ $leltaklaku->nilaimarhun }}</td>
<td>{{ $leltaklaku->hargaasas }}</td>
<td>{{ $leltaklaku->upahsimpan }}</td>
<td>{{ $leltaklaku->cajlelong }}</td>
<?php
<td align="center">{{ $leltaklaku->norujukan }}</td>
{{-- <td> {{ $leltaklaku['suratlelongtaklaku'] }} </td> --}}
<td align="right">{{ $leltaklaku->pinjaman }}</td>
<td align="right"> {{ $leltaklaku->berat }}</td>
<td align="right">{{ $leltaklaku->nilaimarhun }}</td>
<td align="right">{{ $leltaklaku->hargaasas }}</td>
<td align="right">{{ $leltaklaku->upahsimpan }}</td>
{{-- <td>{{ $leltaklaku->cajlelong }}</td>
@php
$rugi = '';
$baki = '';
if(strpos($leltaklaku->baki, '-') !== false)
@@ -143,24 +185,24 @@ tr:nth-child(even) {
else {
$baki = $leltaklaku->baki;
}
?>
@endphp
<td>{{$rugi}}</td>
<td>{{$baki}}</td>
<td></td>
<td></td>
<td>{{$baki}}</td> --}}
{{-- <td></td>
<td></td> --}}
</tr>
@endforeach
<tr>
<td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
<td><strong>{{ number_format($total_pinjaman, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_upahsimpan, 2,'.',',') }}</strong></td>
<td><strong>{{ number_format($total_cajlelong, 2,'.',',') }}</strong></td>
<?php
<td colspan="2" align="left"><strong>Jumlah Keseluruhan</strong></td>
<td align="right"><strong>{{ number_format($total_pinjaman, 2, '.', ',') }}</strong></td>
<td align="right"><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
<td align="right"><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
<td align="right"><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
<td align="right"><strong>{{ number_format($total_upahsimpan, 2,'.',',') }}</strong></td>
{{-- <td><strong>{{ number_format($total_cajlelong, 2,'.',',') }}</strong></td>
@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
<td><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td>
<td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td>
<td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td> --}}
</tr>
@@ -66,7 +66,7 @@
</tbody>
</table>
<div class="modal-footer; text-center" style="margin-top:2%; margin-bottom:2%;">
<a href="{{ route('pembida.senlelbelumbayarbidaan') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
{{-- <a href="{{ route('pembida.senlelbelumbayarbidaan') }}" class="btn btn-primary" style="width:8%;">Kembali</a> --}}
<button type="submit" class="btn btn-success">Isytihar Tak Laku</button>
</div>
</form>
@@ -0,0 +1,78 @@
<!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="x-apple-disable-message-reformatting">
<title></title>
<style>
table,
td,
div,
h1,
p {
font-weight: 500;
font-family: Arial, sans-serif;
}
.btn {margin: 10px 0px;
border-radius: 4px;
text-decoration: none;
color: #fff !important;
height: 46px;
padding: 10px 20px;
font-size: 16px;
font-weight: 600;
background-image: linear-gradient(to right top, #021d68, #052579, #072d8b, #09369d, #093fb0) !important;
}
.btn:hover {
text-decoration: none;
opacity: .8;
}
</style>
</head>
<body style="margin:0;padding:0;">
<table role="presentation"
style="width:100%;border-collapse:collapse;border:0;border-spacing:0;background:#ffffff;">
<tr>
<td align="center" style="padding:0;">
<table role="presentation"
style="width:600px;border-collapse:collapse;border:1px solid #cccccc;border-spacing:0;text-align:left;">
<tr style="border-collapse:collapse;border:1px solid #cccccc;border-spacing:0;">
<td align="left" style="padding:10px 25px;background:#fff; display: flex; align-items: center;">
<span style="font-weight: bold; padding-top: 10px;"> ArrahnBid </span>
</td>
</tr>
<tr>
<td style="padding:36px 30px 42px 30px;">
<table role="presentation"
style="width:100%;border-collapse:collapse;border:0;border-spacing:0;">
<tr>
<td style="padding:0 0 36px 0;color:#153643;">
<p style="font-weight:bold;margin:0 0 20px 0;font-family:Arial,sans-serif;">
Kepada {{ $user ? $user['name'] : '' }},</h1>
<p
style="margin:0 0 12px 0;font-size:14px;line-height:24px;font-family:Arial,sans-serif;">
Tahniah, Nama Anda Telah Menang Dalam Bidaan Emas Hari Ini, Sila Semak Bidaan Anda Dalam Pautan ini.
</p>
<p style="text-align: center;">
<a href="{{'https://bid.arrahn.com.my'}}" class="btn">LOG MASUK ARRAHNBID</a>
</p>
<p style="margin:100px 0 12px 0;font-size:14px;font-family:Arial,sans-serif;">
Terima Kasih, </p>
<p style="margin:0 0 12px 0;font-size:14px;font-family:Arial,sans-serif;">
ArrahnBid </p>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>