From f67ca478a49c9437614fba9e57156bfcf8708839 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Mon, 26 Sep 2022 10:32:34 +0800
Subject: [PATCH] fix pengesahan function

---
 app/Models/LelongBidMarhun.php                       |  4 ++++
 .../2022_03_07_061858_create_pengesahan_table.php    |  3 +++
 resources/views/marhun/marhun.blade.php              | 12 ++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/app/Models/LelongBidMarhun.php b/app/Models/LelongBidMarhun.php
index ecb0ed06..679f70ce 100644
--- a/app/Models/LelongBidMarhun.php
+++ b/app/Models/LelongBidMarhun.php
@@ -22,4 +22,8 @@ class LelongBidMarhun extends Model
        'n_marhun',
        'hargaasas',
     ];
+
+    public function pengesahan() {
+        return $this->hasOne(Pengesahan::class, 'lelongbidmarhun_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 17859029..97bd6523 100644
--- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php
+++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php
@@ -25,6 +25,9 @@ class CreatePengesahanTable extends Migration
             $table->datetime('diminta_pada');
             $table->integer('status')->default(0); //1 = terima, 2 = tangguh lelong
             $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat, 6 = tangguh lelong pc
+            $table->string('request_berat')->nullable();
+            $table->string('request_karat')->nullable();
+            $table->string('request_marhun')->nullable();
             $table->timestamps();
         });
 
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 5def0387..e3dd1738 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -114,6 +114,18 @@
                         <td>{{ $item->nota }}</td>
                         <td class="text-center">
                             @if($lelongbid->status_semak == 1)
+                            @elseif(isset($item->pengesahan))
+                                @if($item->pengesahan['status_ubah'] == 1)
+                                <span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu</i></span>
+                                @elseif($item->pengesahan['status_ubah'] == 2)
+                                <span class="badge badge-warning">Tunggu Pengesahan<br><i>Tambah Marhun</i></span>
+                                @elseif($item->pengesahan['status_ubah'] == 3)
+                                <span class="badge badge-warning">Tunggu Pengesahan<br><i>Hapus Marhun</i></span>
+                                @elseif($item->pengesahan['status_ubah'] == 4)
+                                <span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Berat</i></span>
+                                @elseif($item->pengesahan['status_ubah'] == 5)
+                                <span class="badge badge-warning">Tunggu Pengesahan<br><i>Ubah Mutu & Berat</i></span>
+                                @endif
                             @else
                             <a onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{  $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
                             <a class="confirmdel" id="btndelete" data-lelongbidmarhun="{{ $item->id }}" data-lelongbid="{{ $item->lelongbid_id }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>