Merge branch 'atie' into 'main'

update structure 1033

See merge request online-sistem1/lelong!8

app/Http/Controllers/MarhunController.php

@@ -514,6 +514,7 @@ class MarhunController extends Controller
     public function terimaperubahan(Request $request)
     {
         //update mutu marhun - gadaimarhun
+        // dd($request->all());
         $user =  Auth::user();
 
         $currentdate = Carbon::now();

app/Http/Controllers/SimulasiController.php

@@ -319,7 +319,7 @@ class SimulasiController extends Controller
         foreach($cawangansim as $cawsim)
         {
             $cawangan = Cawangan::where('id','=',$cawsim->caw_id)->first();
-            $databid = SimulasiBid::where('simulasi_id','=',$simulasi_id)->get();
+            $databid = SimulasiBid::where('caw_id','=',$cawsim->caw_id)->where('simulasi_id','=',$simulasi_id)->get();
             
             $packet = 0;
             $berat = 0;

database/migrations/2021_12_13_053311_create_cawangans_table.php

@@ -30,6 +30,7 @@ class CreateCawangansTable extends Migration
             $table->string('nofaks')->nullable(); 
             $table->string('lokasi')->nullable(); 
             $table->string('pkb_jmc')->nullable(); 
+            $table->string('para2')->nullable();
             $table->timestamps();
         });
 

database/migrations/2021_12_14_041545_create_simulasis_table.php

@@ -64,7 +64,7 @@ class CreateSimulasisTable extends Migration
             $table->decimal('nilaimarhun', $precision = 9, $scale = 2);
             $table->decimal('pinjaman', $precision = 9, $scale = 2);
             $table->decimal('bakiupah', $precision = 7, $scale = 2);
-            $table->decimal('cajlain', $precision = 7, $scale = 2);
+            $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable();
             $table->decimal('cajlelong', $precision = 7, $scale = 2);
             $table->decimal('baki', $precision = 9, $scale = 2);
             $table->decimal('berat', $precision = 7, $scale = 2);

database/migrations/2021_12_14_041557_create_lelongs_table.php

@@ -67,7 +67,7 @@ class CreateLelongsTable extends Migration
             $table->decimal('nilaimarhun', $precision = 9, $scale = 2);
             $table->decimal('pinjaman', $precision = 9, $scale = 2);
             $table->decimal('bakiupah', $precision = 7, $scale = 2);
-            $table->decimal('cajlain', $precision = 7, $scale = 2);
+            $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable();
             $table->decimal('cajlelong', $precision = 7, $scale = 2);
             $table->decimal('baki', $precision = 9, $scale = 2);
             $table->decimal('berat', $precision = 7, $scale = 2);

resources/views/simulasi/showsimulasi.blade.php

@@ -340,7 +340,7 @@
             "orderable": false
             }
         ],
-        order: [[1, 'asc']],
+        order: [[0, 'asc']],
         // "ordering": false,
         "searching":false,
         "info": false,