Merge branch 'atie' into 'main'

add function kemaskini data simulasi

See merge request online-sistem1/lelong!92

app/Http/Controllers/SimulasiController.php

@@ -26,6 +26,8 @@ use App\Models\CawanganLelong;
 use App\Models\LelongBid;
 use App\Models\LelongBidMarhun;
 use App\Models\LelKarat;
+use App\Models\LogUser;
+use App\Models\LelongTebus;
 
 
 
@@ -1069,5 +1071,91 @@ class SimulasiController extends Controller
                                            
                                            ));
     }
+
+    public function kemaskinidata($simulasi_id)
+    {
+        $user = Auth::user();
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateTimeString();
+        $data = [];
+        $senaraisag = SimulasiBid::where('simulasibid.simulasi_id', $simulasi_id)
+        ->whereNotIn('simulasibid.norujukan', function($query) {
+            $query->select('norujukan')
+                  ->from('gadai');
+        })
+        ->get()->toArray();
+        // dd($senaraisag);
+
+        foreach($senaraisag as $data)
+        {
+              //insert lelong_tebus
+              $lelongtebus = new LelongTebus;
+              $lelongtebus->tarikh = $currentdate;
+              $lelongtebus->teller = $user->name;
+              $lelongtebus->norujukan = $data['norujukan'];
+              $lelongtebus->batch_no = $simulasi_id;
+              $lelongtebus->nilai_marhun = $data['nilaimarhun'];
+              $lelongtebus->pinjaman = $data['pinjaman'];
+              $lelongtebus->upah = $data['bakiupah'];
+              $lelongtebus->jbg = $data['jbg'];
+              $lelongtebus->jenis_tebus = 'T';
+              $lelongtebus->save();
+
+            // dd($data['norujukan']);
+            $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
+            $updatesimulasi->delete();
+             //insert loguser
+             $loguser = new LogUser;
+             $loguser->user_id = $user->id;
+             $loguser->date = $currentdate;
+             $loguser->username = $user->username;
+             $loguser->nama_user = $user->name;
+             $loguser->norujukan = $data['norujukan'];
+             $loguser->nota = ' Kemaskini Data Simulasi '.$simulasi_id;
+             $loguser->save();
+
+            
+        } 
+
+        $data1 = [];
+        $senaraisagtempoh = SimulasiBid::join('gadai','gadai.norujukan','=','simulasibid.norujukan')
+        ->where('simulasibid.simulasi_id', $simulasi_id)
+        ->whereIn('simulasibid.norujukan', function($query) {
+            $query->select('norujukan')
+                  ->from('gadai');
+        })
+        ->select('gadai.norujukan','gadai.tempoh')
+        ->get()->toArray();
+        // dd($senaraisagtempoh);
+
+        foreach($senaraisagtempoh as $datatempoh)
+        {
+            // dd($data['norujukan']);
+            $updatetempoh = SimulasiBid::where('norujukan', $datatempoh['norujukan'])
+                            ->where('simulasi_id', $simulasi_id)
+                            ->first();
+            $updatetempoh->jbg = $datatempoh['tempoh'];
+            $updatetempoh->update();
+             //insert loguser
+             $loguser = new LogUser;
+             $loguser->user_id = $user->id;
+             $loguser->date = $currentdate;
+             $loguser->username = $user->username;
+             $loguser->nama_user = $user->name;
+             $loguser->norujukan = $datatempoh['norujukan'];
+             $loguser->nota = ' Kemaskini Tempoh '.$simulasi_id;
+             $loguser->save();
+        } 
+
+
+
+        $date = Carbon::now()->toDateTimeString();
+        $simulasi = Simulasi::where('id','=',$simulasi_id)->first();
+        $simulasi->masakemaskini_data = $date;
+        $simulasi->save();
+        
+        return redirect()->route('analisa.senaraisimulasi')
+                        ->with('success','Kemaskini Berjaya');
+    }
 }
        

app/Models/LelongTebus.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class LelongTebus extends Model
+{
+    use HasFactory;
+
+    protected $table = 'lelong_tebus';
+
+    protected $fillable = [
+        'recno',
+        'tarikh',
+        'teller',
+        'norujukan',
+        'batch_no',
+        'nilaimarhun',
+        'pinjaman',
+        'upah',
+        'jbg',
+        'jenis_tebus'
+    ];
+
+}

database/migrations/2021_12_14_041557_create_lelongs_table.php

@@ -145,6 +145,23 @@ class CreateLelongsTable extends Migration
                 ->references('id')->on('lelong')
                 ->onDelete('cascade');
         });
+
+        Schema::create('lelong_tebus', function (Blueprint $table) {
+            $table->bigIncrements('recno');
+            $table->datetime('tarikh')->nullable(); 
+            $table->string('teller')->nullable();
+            $table->string('norujukan')->nullable();
+            $table->string('batch_no')->nullable();
+            $table->decimal('nilaimarhun', $precision = 5, $scale = 2);
+            $table->decimal('pinjaman', $precision = 5, $scale = 2);
+            $table->decimal('jbg', $precision = 5, $scale = 2);
+            $table->string('jenis_tebus')->nullable();
+            $table->timestamps();
+
+            // $table->foreign('norujukan')
+            //     ->references('norujukan')->on('gadai')
+            //     ->onDelete('cascade');
+        });
     }
 
     /**

resources/views/simulasi/senaraisimulasi.blade.php

@@ -43,6 +43,7 @@
                             </td>
                              <td>{{ $info['info']['harga_emas_asas'] }}</td>
                             <td class="text-center">
+                                <a  href="{{ route('analisa.kemaskinidata',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a>
                                 <a  href="{{ route('analisa.show',$info['info']['simulasi_id']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
                                 <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Hapus"><i class="far fa-trash-alt"></i></a>
                                     

routes/web.php

@@ -75,6 +75,8 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct
 
     Route::post('/senaraitempsimulasi',['as'=>'analisa.senaraitempsimulasi','uses'=>'SimulasiController@senaraitempsimulasi']); 
     Route::get('/tempbycawsimulasi/{details}/{t_lelong}/{fasa}',['as'=>'analisa.tempbycawsimulasi','uses'=>'SimulasiController@tempbycawsimulasi']); 
+
+    Route::get('/kemaskinidata/{simulasi_id}',['as'=>'analisa.kemaskinidata','uses'=>'SimulasiController@kemaskinidata']);
 });
 
 Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], function () {