From bdea293ca6ea2e35a6c52896d86c4ba54aba800b Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sat, 10 Dec 2022 22:25:26 +0800 Subject: [PATCH 01/20] update tukar tarikh function --- app/Http/Controllers/LelongController.php | 73 ++++++++----------- app/Http/Controllers/ReportController.php | 1 + config/laravel-webp.php | 58 +++++++++++++++ .../views/lelong/showtukartarikh.blade.php | 8 +- .../pembida/senaraipemenangbycaw.blade.php | 6 +- resources/views/template/pemenang.blade.php | 2 +- routes/web.php | 4 + 7 files changed, 102 insertions(+), 50 deletions(-) create mode 100644 config/laravel-webp.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 9083d022..2383cc69 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -49,6 +49,7 @@ use App\Models\TangguhLelong; use App\Models\Tetapan; use App\Models\TransaksiKeuntungan; use DateTime; +// use Nexmo\Laravel\Facade\Nexmo; class LelongController extends Controller { @@ -1932,7 +1933,14 @@ class LelongController extends Controller } + //noti emel Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name'])); + // //noti sms + // Nexmo::message()->send([ + // 'to' => $userdetails['notelbimbit'], + // 'from' => 'Sender', + // 'text' => 'ArrahnBid-Tahniah Anda Berjaya Bidaan Lelongan Hari Ini, Sila Semak Dalam Pautan Ini. https://bid.arrahn.com.my' + // ]); } else { @@ -2155,7 +2163,14 @@ class LelongController extends Controller // dd("sni"); //sending notify emel kepada pembida } + //send email Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name'])); + // //send sms + // Nexmo::message()->send([ + // 'to' => $userdetails['notelbimbit'], + // 'from' => 'Sender', + // 'text' => 'ArrahnBid-Tahniah Anda Pemenang ArrahnBid, sila semak dalam pautan ini. https://bid.arrahn.com.my' + // ]); } else { $kalah = LelongBidder::where('id', '=', $bidder->id) ->first(); @@ -2605,7 +2620,7 @@ class LelongController extends Controller $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') - // ->where('lelong.sts_lelong', 3) + ->where('lelong.sts_lelong', 0) ->get()->toArray(); foreach($lelong as $laporan) @@ -2721,55 +2736,30 @@ class LelongController extends Controller $lelongasal = Lelong::where('id','=',$lelongidasal)->first(); $cawanganasal = CawanganLelong::join('cawangan','cawangan.id','=', 'cawangan_lelong.caw_id') ->where('cawangan_lelong.lelong_id','=',$lelongidasal) - ->where('cawangan.caw_code','=',$request->caw) ->get(); - // dd($cawanganasal); - // dd( $lelongidbaru); - - // $lelongnew = new Lelong(); - // $lelongnew->tarikh_lelong = $tarikhlelongbaru; - // $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas; - // $lelongnew->jbg = $lelongasal->jbg; - // $lelongnew->cajlelong = $lelongasal->cajlelong; - // $lelongnew->fasa = $lelongasal->fasa; - // $lelongnew->kali = $lelongasal->kali; - // $lelongnew->save(); - - - // foreach($lelkarat as $lelongKarat) - // { - // $lelkarat = new LelKarat; - // $lelkarat->lelong_id = $lelongnew->id; - // $lelkarat->karat = $lelongKarat->karat; - // $lelkarat->keterangan = $lelongKarat->keterangan; - // $lelkarat->harga = $lelongKarat->harga; - // $lelkarat->harga2 = $lelongKarat->harga2; - // $lelkarat->save(); - // } - - - //tukartarikh ID lelong - if($request->caw) - { + // dd($request->caw); - $caw = Cawangan::whereIn('caw_code',$request->caw)->get(); + // $caw = Cawangan::whereIn('caw_code',$request->caw)->get(); // dd($caw); - foreach($caw as $index=>$cawtukartarikh){ - // dd($cawpindah->caw_id); - - // dd($cawtukartarikh->caw_id); + foreach($cawanganasal as $index=>$cawtukartarikh) + { + $namacaw = CawanganLelong::join('cawangan','cawangan.id','=','cawangan_lelong.caw_id') + ->where('cawangan_lelong.lelong_id','=',$lelongidasal) + ->where('cawangan_lelong.caw_id','=',$cawtukartarikh->caw_id) + ->select('cawangan.caw_code') + ->first(); $caw_tukartarikh = Lelong::where('id', $request->lelongidasal)->first(); $caw_tukartarikh->tarikh_lelong = $tarikhlelongbaru; $caw_tukartarikh->update(); $surat = LelongBid::where('lelong_id','=',$lelongidasal) - ->where('kodcaw','=',$request->caw) + // ->where('kodcaw','=',$request->caw) ->get(); // dd($surat); - $suratcaw = $surat->where('kodcaw','=',$cawtukartarikh->caw_code)->all(); + $suratcaw = $surat->all(); foreach(array_chunk($suratcaw,100) as $data_chunk) { //dd($data); @@ -2782,12 +2772,8 @@ class LelongController extends Controller } } - } - } - else - { - // dd('error'); - } + } + return redirect()->route('lelong.tukartarikhlelong'); } @@ -3085,6 +3071,7 @@ class LelongController extends Controller $caw_pindahsag = LelongBid::where('norujukan', $data->norujukan) ->where('status_jual','=', 0)->first(); $caw_pindahsag->lelong_id = $request->lelongidbaru; + $caw_pindahsag->t_lelong = $request->tarikhlelongbaru; $caw_pindahsag->update(); } } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 267b06c5..cbd9df94 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -908,6 +908,7 @@ class ReportController extends Controller $cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id) ->where('pengesahan.status', 1) + ->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%') ->whereNotNull('pengesahan.disahkan_oleh') ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id') ->orderBy('pengesahan.lelongbid_id') diff --git a/config/laravel-webp.php b/config/laravel-webp.php new file mode 100644 index 00000000..2eaa2194 --- /dev/null +++ b/config/laravel-webp.php @@ -0,0 +1,58 @@ + 70, + + /* + |-------------------------------------------------------------------------- + | Default Driver + |-------------------------------------------------------------------------- + | + | This is a default image processing driver. Available: ['cwebp', 'php-gd'] + | + */ + 'default_driver' => 'php-gd', + + /* + |-------------------------------------------------------------------------- + | Drivers + |-------------------------------------------------------------------------- + | + | Available drivers which can be selected + | + */ + 'drivers' => [ + + /* + |-------------------------------------------------------------------------- + | Cwebp Driver + |-------------------------------------------------------------------------- + | + | If you choose cwebp driver it is required to specify the path to the executable. + | + */ + 'cwebp' => [ + 'path' => '/usr/local/bin/cwebp', + ], + + /* + |-------------------------------------------------------------------------- + | Cwebp Driver + |-------------------------------------------------------------------------- + | + | If you choose PHP GD driver no configuration is necessary. + | + */ + 'php-gd' => [ + // + ], + ], +]; diff --git a/resources/views/lelong/showtukartarikh.blade.php b/resources/views/lelong/showtukartarikh.blade.php index 2721e49e..51dbeb81 100644 --- a/resources/views/lelong/showtukartarikh.blade.php +++ b/resources/views/lelong/showtukartarikh.blade.php @@ -38,7 +38,7 @@
- +
{{$lelong_id}}
@@ -46,7 +46,7 @@ - + {{-- --}} @@ -59,7 +59,7 @@ @foreach ($arraycaw as $index=>$caw) - + {{-- --}} @@ -71,7 +71,7 @@ - + diff --git a/resources/views/pembida/senaraipemenangbycaw.blade.php b/resources/views/pembida/senaraipemenangbycaw.blade.php index 5c11ea8f..ccdf795c 100644 --- a/resources/views/pembida/senaraipemenangbycaw.blade.php +++ b/resources/views/pembida/senaraipemenangbycaw.blade.php @@ -44,7 +44,7 @@ - @foreach($listwinner as $winner) + @forelse($listwinner as $winner) @@ -75,7 +75,9 @@ - @endforeach + @empty + + @endforelse
PilihPilihNo Cawangan Bil SAG
{{$index+1}} {{ $caw['cawangan'] }} {{ $caw['bil_marhun'] }}
JUMLAH KESELURUHANJUMLAH KESELURUHAN {{ $total_marhun }} {{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nilaimarhun, 2, '.', ',') }}
{{ $loop->iteration }} {{ $winner['details']['name']}}
No Data
{{--