From 1ec04930545cffc6b1a14c76cec349e2d1512aaf Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Mon, 29 Aug 2022 15:45:56 +0800 Subject: [PATCH 1/3] pembetulan 23/8/2022 2) disabled button tangguh lelong kat cwgn 4) button start lelong (utk semua cwgn, hanya klik button offline utk cwgn yg tak boleh start lelong) --- app/Http/Controllers/HomeController.php | 9 +++++++-- app/Http/Controllers/TangguhLelongController.php | 4 ++-- resources/views/home.blade.php | 10 ++++++---- .../views/tangguhlelong/senarailelongtangguh.blade.php | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b0fa1029..6336708a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -46,9 +46,14 @@ class HomeController extends Controller $semakCountArray = []; $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('lelongbid', function($join){ + $join->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id') + ->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id'); + }) + ->where('lelong.tarikh_lelong', $dateTime) + ->where('lelongbid.status_semak',1) ->select('lelong.fasa','cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong') - ->where('tarikh_lelong', $dateTime) - ->groupBy('lelong_id') + ->groupBy('cawangan_lelong.lelong_id','cawangan_lelong.caw_id') ->get() ->toArray(); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index fdae5804..0f9aa1fe 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -249,7 +249,7 @@ class TangguhLelongController extends Controller 'lelongbid.cajlelong', 'lelongbid.baki', 'lelongbid.berat', - 'lelongbid.marhun', + 'lelongbid.marhun' ) ->get()->toArray(); @@ -398,7 +398,7 @@ class TangguhLelongController extends Controller 'lelongbid.cajlelong', 'lelongbid.baki', 'lelongbid.berat', - 'lelongbid.marhun', + 'lelongbid.marhun' ) ->get()->toArray(); // dd($lelongbidmarhun); diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 1ca920f9..90f3d964 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -85,6 +85,7 @@
LELONGAN HARI INI @foreach ($arrayinfo as $lel) + {{$loop->iteration}} {{ $lel['info']['lelong_id'] }} @@ -132,9 +133,9 @@ - @if(sizeof($sag) == 0) + - @endif + @@ -147,9 +148,9 @@ - @if(sizeof($sag) == 0) + - @endif + @endhasrole + @endforeach @endisset diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php index d1d71e34..5523b271 100644 --- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php @@ -60,7 +60,7 @@ @if($lel['info']['sts_lelong'] == 0) {{-- @foreach($lel['detailsinfo'] as $details) --}} - + {{-- @endforeach --}} @endif From d8a51d060a30f92b0f11b41b5333f4808c715f31 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:03:22 +0800 Subject: [PATCH 2/3] update slip serahan, migrate table scanmarhun --- app/Http/Controllers/SerahanController.php | 2 ++ ...2_03_07_061858_create_pengesahan_table.php | 23 +++++++++++++++++++ resources/views/includes/sidebar.blade.php | 8 +++---- resources/views/pdf/slipserahan.blade.php | 2 +- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index ac0bf4d3..6c02b8db 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -302,6 +302,8 @@ class SerahanController extends Controller $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('lelongbidmarhun','lelongbid.id','=','lelongbidmarhun.lelongbid_id') + ->join('jenisemas','lelongbidmarhun.marhun','jenisemas.marhun') ->join('payment','lelongbid.norujukan','=','payment.norujukan') ->join('resit','payment.resit_id','=','resit.id') ->where('lelongbidder.user_id',$user_id) diff --git a/database/migrations/2022_03_07_061858_create_pengesahan_table.php b/database/migrations/2022_03_07_061858_create_pengesahan_table.php index 6cb2646b..815341a7 100644 --- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php +++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php @@ -40,6 +40,29 @@ class CreatePengesahanTable extends Migration // ->onDelete('cascade'); }); + + + Schema::create('scanmarhun', function (Blueprint $table) { + $table->id()->default(0); + $table->string('kodcaw')->nullable()->default(0); + $table->unsignedBigInteger('lelong_id')->unsigned()->default(0); + $table->integer('fasa')->default(0); + $table->string('norujukan')->nullable()->default(0); + $table->decimal('nilaimarhun', $precision = 9, $scale = 2)->default(0); + $table->string('drp','100')->nullable()->default(0); + $table->string('kpd','20')->nullable()->default(0); + $table->decimal('bulan', $precision = 3, $scale = 0)->default(0); + $table->decimal('tahun', $precision = 5, $scale = 0)->default(0); + $table->integer('tag')->default(0)->default(0); + $table->datetime('tarikh')->nullable()->default(0); + $table->time('masa')->nullable()->default(0); + $table->string('namateller','30')->nullable(); + + + $table->foreign('lelong_id') + ->references('id')->on('lelong') + ->onDelete('cascade'); + }); } /** diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 156cb0c6..9713f378 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -89,11 +89,11 @@ Jana Notis Lelong - --}}
  • Tangguh Lelong @@ -169,9 +169,9 @@