diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 1feb42e1..6476eeea 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -452,7 +452,7 @@ class MarhunController extends Controller ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong.fasa','lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->get() ->toArray(); @@ -647,7 +647,7 @@ class MarhunController extends Controller ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong.fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php index c1492b33..85a6aa61 100644 --- a/app/Models/Cawangan.php +++ b/app/Models/Cawangan.php @@ -28,5 +28,6 @@ class Cawangan extends Model 'lokasi', 'pkb_jmc', 'para2', + 'para3', ]; } diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 82d021db..9e5bd4af 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -194,6 +194,7 @@ class CreateLelongsTable extends Migration $table->integer('cajlelong')->nullable(); $table->timestamps(); $table->string('para2','9999')->nullable(); + $table->string('para3','9999')->nullable(); // $table->foreign('norujukan') diff --git a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php index f4e451bb..02b81a7b 100644 --- a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php +++ b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php @@ -15,7 +15,9 @@ class AddPara2ToCawanganTable extends Migration { Schema::table('cawangan', function (Blueprint $table) { $table->string('para2','9999')->nullable(); + $table->string('para3','9999')->nullable(); }); + } /** @@ -27,6 +29,7 @@ class AddPara2ToCawanganTable extends Migration { Schema::table('cawangan', function (Blueprint $table) { $table->dropColumn('para2') ; + $table->dropColumn('para3') ; }); } } diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php index 468374e6..85a69a4f 100644 --- a/resources/views/marhun/senarailelongmarhun.blade.php +++ b/resources/views/marhun/senarailelongmarhun.blade.php @@ -15,9 +15,10 @@ No - Cawangan + {{-- Cawangan --}} Batch Lelong Tarikh Lelong + Fasa Status Lelong Tindakan @@ -27,18 +28,19 @@ {{$loop->iteration}} - + {{-- @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach - + --}} {{ $lel['info']['lelong_id']}} @php $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); @endphp + {{ $lel['info']['fasa']}} @if($lel['info']['sts_lelong'] == 0) diff --git a/resources/views/marhun/senlelmarhun.blade.php b/resources/views/marhun/senlelmarhun.blade.php index 2046c3f9..dbda458c 100644 --- a/resources/views/marhun/senlelmarhun.blade.php +++ b/resources/views/marhun/senlelmarhun.blade.php @@ -14,8 +14,9 @@ No - Cawangan + {{-- Cawangan --}} Tarikh Lelong + Fasa Status Lelong Tindakan @@ -24,12 +25,17 @@ @foreach($arrayinfo as $lel) {{$loop->iteration}} - + {{-- @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach - - {{ $lel['info']['tarikh_lelong']}} + --}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphp + {{ $lel['info']['fasa']}} @if($lel['info']['sts_lelong'] == 0)