From 7fe5eb8744b12c451c31d0722616fd5e164aaca7 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Tue, 1 Mar 2022 12:30:59 +0800
Subject: [PATCH 1/2] update table

---
 app/Http/Controllers/SimulasiController.php            | 4 ++--
 app/Models/GadaiMarhun.php                             | 2 +-
 resources/views/pembayaran/kaunterpembayaran.blade.php | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 371a799a..46d27969 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -143,7 +143,7 @@ class SimulasiController extends Controller
 
                     $sumhargaasas = 0;
                     $berat = 0;
-                    $gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get();
+                    $gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
                     foreach($gadaimarhun as $marhun)
                     {
                         $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
@@ -229,7 +229,7 @@ class SimulasiController extends Controller
 
                 $sumhargaasas = 0;
                 $berat = 0;
-                $gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get();
+                $gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
                 foreach($gadaimarhun as $marhun)
                 {
                     $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
diff --git a/app/Models/GadaiMarhun.php b/app/Models/GadaiMarhun.php
index f2bf32ed..a1fdd6ef 100644
--- a/app/Models/GadaiMarhun.php
+++ b/app/Models/GadaiMarhun.php
@@ -12,7 +12,7 @@ class GadaiMarhun extends Model
     protected $table = 'gadaimarhun';
 
     protected $fillable = [
-        'gadai_id',
+        'norujukan',
         'bil',
         'marhun',
         'nota',
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index b1e341e0..6fb24d60 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -46,8 +46,11 @@
                 @endforeach
             </tbody>
         </table>
+        <div class="modal-footer" style="margin-top:2%;">
+            <a  href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary">Kembali</a>
         </div>
     </div>
+    </div>
 </div>
 
 <script>

From a4799d8c60d5ac02533fca6df99300a52f7ed2f8 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Tue, 1 Mar 2022 12:55:50 +0800
Subject: [PATCH 2/2] update simulasi

---
 app/Http/Controllers/LelongController.php          |  2 --
 app/Http/Controllers/SimulasiController.php        | 14 +++++---------
 app/Models/Gadai.php                               |  2 --
 app/Models/LelongBid.php                           |  2 --
 app/Models/SimulasiBid.php                         |  2 --
 .../2021_12_14_041545_create_simulasis_table.php   |  2 --
 .../2021_12_14_041557_create_lelongs_table.php     |  2 --
 resources/views/pembida/senaraipembida.blade.php   |  9 ++++-----
 8 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index bd5befaa..8e174bad 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -296,8 +296,6 @@ class LelongController extends Controller
                 $lelongbid->baki =$simulasibid->baki;
                 $lelongbid->berat =$simulasibid->berat;
                 $lelongbid->marhun =$simulasibid->marhun;
-                $lelongbid->gst_hj =$simulasibid->gst_hj;
-                $lelongbid->gst_cl =$simulasibid->gst_cl;
                 $lelongbid->percent =$simulasibid->percent;
                 $lelongbid->status_jual =$simulasibid->status_jual;
                 $lelongbid->status_payment =$simulasibid->status_payment;
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 46d27969..71ec1773 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -123,19 +123,17 @@ class SimulasiController extends Controller
                     $simulasibid->hargajual = 0.00;
                     $simulasibid->jbg = $data->jbg;
                     $simulasibid->kadarupah = $data->kadarupah;
-                    $simulasibid->upahsimpan = $data->upahsimpan;
+                    $simulasibid->upahsimpan = $data->upahSim;
                     $simulasibid->ansuran = $data->ansuran;
                     $simulasibid->nilaimarhun = $data->nilaimarhun;
                     $simulasibid->pinjaman = $data->pinjaman;
                     $simulasibid->bakiupah = $data->bakiupah;
                     $simulasibid->cajlain = $data->cajlain;
                     $simulasibid->cajlelong = 0.00;
-                    $simulasibid->baki = $data->baki;
+                    $simulasibid->baki = 0.00;
                     $simulasibid->berat = $data->berat;
                     $simulasibid->marhun = $data->marhun;
-                    $simulasibid->gst_hj = $data->gst_hj;
-                    $simulasibid->gst_cl = $data->gst_cl;
-                    $simulasibid->percent = $data->percent;
+                    $simulasibid->percent = $data->percentpinj;
                     $simulasibid->status_jual = 0;
                     $simulasibid->status_payment = 0;
                     $simulasibid->mora_upah = 0;
@@ -209,7 +207,7 @@ class SimulasiController extends Controller
                 $simulasibid->hargajual = 0.00;
                 $simulasibid->jbg = $data->jbg;
                 $simulasibid->kadarupah = $data->kadarupah;
-                $simulasibid->upahsimpan = $data->upahsimpan;
+                $simulasibid->upahsimpan = $data->upahSim;
                 $simulasibid->ansuran = $data->ansuran;
                 $simulasibid->nilaimarhun = $data->nilaimarhun;
                 $simulasibid->pinjaman = $data->pinjaman;
@@ -219,9 +217,7 @@ class SimulasiController extends Controller
                 $simulasibid->baki = $data->baki;
                 $simulasibid->berat = $data->berat;
                 $simulasibid->marhun = $data->marhun;
-                $simulasibid->gst_hj = $data->gst_hj;
-                $simulasibid->gst_cl = $data->gst_cl;
-                $simulasibid->percent = $data->percent;
+                $simulasibid->percent = $data->percentpinj;
                 $simulasibid->status_jual = 0;
                 $simulasibid->status_payment = 0;
                 $simulasibid->mora_upah = 0;
diff --git a/app/Models/Gadai.php b/app/Models/Gadai.php
index 7569b3f0..67a12f24 100644
--- a/app/Models/Gadai.php
+++ b/app/Models/Gadai.php
@@ -25,8 +25,6 @@ class Gadai extends Model
         'baki', 
         'berat',
         'marhun',
-        'gst_hj',
-        'gst_cl',
         'percent',
         'mora_upah',
         't_gadai',
diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php
index 75247c3c..304d1bbc 100644
--- a/app/Models/LelongBid.php
+++ b/app/Models/LelongBid.php
@@ -31,8 +31,6 @@ class LelongBid extends Model
         'baki',
         'berat',
         'marhun',
-        'gst_hj',
-        'gst_cl',
         'percent',
         'status_jual',
         'status_payment',
diff --git a/app/Models/SimulasiBid.php b/app/Models/SimulasiBid.php
index 1a286d19..32787ab8 100644
--- a/app/Models/SimulasiBid.php
+++ b/app/Models/SimulasiBid.php
@@ -31,8 +31,6 @@ class SimulasiBid extends Model
         'baki',
         'berat',
         'marhun',
-        'gst_hj',
-        'gst_cl',
         'percent',
         'status_jual',
         'status_payment',
diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php
index 3ed5c114..dc3f202e 100644
--- a/database/migrations/2021_12_14_041545_create_simulasis_table.php
+++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php
@@ -69,8 +69,6 @@ class CreateSimulasisTable extends Migration
             $table->decimal('baki', $precision = 9, $scale = 2);
             $table->decimal('berat', $precision = 7, $scale = 2);
             $table->string('marhun');
-            $table->decimal('gst_hj', $precision = 7, $scale = 2);
-            $table->decimal('gst_cl', $precision = 7, $scale = 2);
             $table->decimal('percent', $precision = 7, $scale = 2);
             $table->integer('status_jual');
             $table->integer('status_payment');
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 5e66c61c..3d3c3b3d 100644
--- a/database/migrations/2021_12_14_041557_create_lelongs_table.php
+++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php
@@ -72,8 +72,6 @@ class CreateLelongsTable extends Migration
             $table->decimal('baki', $precision = 9, $scale = 2);
             $table->decimal('berat', $precision = 7, $scale = 2);
             $table->string('marhun');
-            $table->decimal('gst_hj', $precision = 7, $scale = 2);
-            $table->decimal('gst_cl', $precision = 7, $scale = 2);
             $table->decimal('percent', $precision = 7, $scale = 2);
             $table->string('status_jual');
             $table->string('status_payment');
diff --git a/resources/views/pembida/senaraipembida.blade.php b/resources/views/pembida/senaraipembida.blade.php
index a5bd2cc3..fa0e87be 100644
--- a/resources/views/pembida/senaraipembida.blade.php
+++ b/resources/views/pembida/senaraipembida.blade.php
@@ -36,16 +36,15 @@
                             <td>{{ $user->notelbimbit }}</td>
                             <td>{{ $user->email }}</td>
                             <td>
-                                @if ($user->status =='active')
+                                <!-- @if ($user->status =='active')
                                     <button class="btn btn-success btn-sm hovernone-success" disabled>{{$user->status}}</button>
                                 @elseif ($user->status =='banned')
                                 <button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
-                                @endif
-                                
+                                @endif -->
+                                Menunggu Pengesahan Operasi
                             </td>
                             <td class="text-center">
-                                <a  href="{{ route('pembida.show',$user->id) }}"><i class="fas fa-check"></i></a>
-                                {{-- <a class="confirmdel" href="{{ route('pengguna.delete',$user->id) }}"><i class="far fa-trash-alt"></i></a> --}}
+                                <a  href="{{ route('pembida.show',$user->id) }}"><i class="fas fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach