KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update mutu marhun

Browse Source
This commit is contained in:
faiqahzaman
2022-03-09 14:27:05 +08:00
parent 9fecf68d01
commit 3826c3024f
6 changed files with 139 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+62 -16
View File
@@ -21,6 +21,7 @@ use App\Models\LelKarat_temp;
use App\Models\Pengesahan;
use App\Models\GadaiMarhun;
use App\Models\TangguhLelong;
use Carbon\Carbon;
class MarhunController extends Controller
@@ -63,7 +64,16 @@ class MarhunController extends Controller
// dd($request->all());
$marhun = LelongBidMarhun::where('id','=',$request->idmarhun)->first();
$lelongbid = LelongBid::where('id','=',$marhun->lelongbid_id)->first();
// dd($lelongbid);
// dd($marhun);
if($marhun->marhun != $request->marhun)
{
// dd($marhun->marhun);
$txtmarhun = ",1 " . $marhun->marhun ;
// dd($txtmarhun);
$lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhun . "," ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
}
$caw = CawanganLelong::where('id','=',$lelongbid->caw_id)->first();
$lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first();
@@ -75,16 +85,26 @@ class MarhunController extends Controller
// {
if($request->karat != $marhun->karat)
{
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->save();
$checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id)
->whereNull('disahkan_pada')
->first();
if($checkdata)
{
//
}
else
{
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->save();
}
}
$bezaberat = $marhun->berat - $request->berat_emas;
// $bezahargaasas = $marhun->hargaasas - $request->hargaasas;
$bezahargaasas = $marhun->hargaasas - $request->harga_asas;
// $val = round($request->berat_emas * $karat->harga);
$marhun->marhun = $request->marhun;
@@ -94,9 +114,10 @@ class MarhunController extends Controller
$marhun->n_marhun = $request->nilai_marhun;
$marhun->hargaasas = $request->harga_asas;
$marhun->save();
// dd($marhun->marhun);
$lelongbid->berat = $lelongbid->berat - ($bezaberat);
// $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas);
$lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas);
$lelongbid->save();
// }
@@ -160,19 +181,22 @@ class MarhunController extends Controller
{
// dd($request->all());
$mutumarhun = Pengesahan::join('lelong', 'pengesahan.lelong_id', '=', 'lelong.id')
->whereNull('disahkan_oleh')
->select(
'pengesahan.id as pengesahan_id',
'pengesahan.norujukan',
'lelong.tarikh_lelong'
'lelong.tarikh_lelong',
'pengesahan.norujukan'
)
->get();
return view('pengesahan.perubahanmutumarhun', compact('mutumarhun'));
}
public function mutumarhun($pengesahan_id)
public function mutumarhun($pengesahan_id, $norujukan)
{
$pengesahan = Pengesahan::where('id', $pengesahan_id)
->where('norujukan', $norujukan)
->first();
$marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)
@@ -206,9 +230,8 @@ class MarhunController extends Controller
$marhuns[$index1]['old_harga'] = $karat->harga;
$marhuns[$index1]['old_nilaimarhun'] = $total;
$marhuns[$index1]['old_hargaasas'] = $hargaasas;
// $marhun
}
return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id'));
return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan'));
}
public function terimaperubahan(Request $request)
@@ -221,14 +244,37 @@ class MarhunController extends Controller
$pengesahan = Pengesahan::where('id', $request->pengesahan_id)
->first();
dd($pengesahan);
$pengesahan->disahkan_oleh = $user->id;
$pengesahan->disahkan_pada = $currentdate;
$pengesahan->update();
// $updategadaimarhun = GadaiMarhun::where('')
$gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
foreach($lelongbidmarhun as $bidmarhun)
{
$newmarhun = new GadaiMarhun;
$newmarhun->norujukan = $pengesahan->norujukan;
$newmarhun->bil = $bidmarhun->bil;
$newmarhun->marhun = $bidmarhun->marhun;
$newmarhun->nota = $bidmarhun->nota;
$newmarhun->karat = $bidmarhun->karat;
$newmarhun->berat = $bidmarhun->berat;
$newmarhun->save();
}
//update status lelongbidmarhun = tangguh
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $pengesahan->lelong_id;
$tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
$tangguhlelong->norujukan = $pengesahan->norujukan;
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun';
$tangguhlelong->save();
return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya');
}
}
app/Models/TangguhLelong.php
+23
View File
@@ -0,0 +1,23 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class TangguhLelong extends Model
{
use HasFactory;
protected $table = 'tangguhlelong';
protected $fillable = [
'lelong_id',
'lelongbid_id',
'norujukan',
'tarikhtangguh',
'ditangguh_oleh',
'ditangguh_pada',
'nota'
];
}
database/migrations/2022_03_09_122631_create_tangguhlelong_table.php
+47
View File
@@ -0,0 +1,47 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateTangguhlelongTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('tangguhlelong', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('lelong_id')->unsigned();
$table->unsignedBigInteger('lelongbid_id')->unsigned();
$table->string('norujukan');
$table->datetime('tarikhtangguh')->nullable();
$table->integer('ditangguh_oleh');
$table->datetime('ditangguh_pada');
$table->string('nota');
$table->timestamps();
$table->foreign('lelong_id')
->references('id')->on('lelong')
->onDelete('cascade');
$table->foreign('lelongbid_id')
->references('id')->on('lelongbid')
->onDelete('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('tangguhlelong');
}
}
resources/views/pengesahan/mutumarhun.blade.php
+5 -5
View File
@@ -6,7 +6,8 @@
<div class="col-md-11 mx-auto card p-4">
<form action="{{ route('pengesahan.terimaperubahan') }}" method="POST" id="formmutumarhun">
@csrf
<input type="type" name="pengesahan_id" value="{{ $pengesahan_id }}" />
<input type="hidden" name="pengesahan_id" value="{{ $pengesahan_id }}" />
<input type="hidden" name="norujukan" value="{{ $norujukan }}" />
@if ($message = Session::get('success'))
<div class="alert alert-success">
@@ -73,7 +74,7 @@
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.perubahanmutumarhun') }}" class="btn btn-primary">Kembali</a>
<a href="{{ route('pengesahan.perubahanmutumarhun') }}" class="btn btn-success" onclick="terima()">Sahkan</a>
<button type="button" class="btn btn-success" onclick="functerima()" >Sahkan</button>
</div>
</form>
</div>
@@ -84,9 +85,8 @@
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
function terima(){
$('#formmutumarhun').submit();
function functerima(){
$("#formmutumarhun").submit();
}
var tablelelong = $('#tablelelong').DataTable( {
resources/views/pengesahan/perubahanmutumarhun.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@
<td>{{ $marhun['tarikh_lelong'] }}</td>
<td>{{ $marhun['norujukan'] }}</td>
<td>
<a href=" {{ route('pengesahan.mutumarhun', ['pengesahan_id'=>$marhun['pengesahan_id']] ) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
<a href=" {{ route('pengesahan.mutumarhun', ['pengesahan_id'=>$marhun['pengesahan_id'], 'norujukan'=>$marhun['norujukan'] ] ) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
routes/web.php
+1 -1
View File
@@ -145,7 +145,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {
Route::get('/perubahanmutumarhun',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']);
Route::get('/mutumarhun/{pengesahan_id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
Route::get('/mutumarhun/{pengesahan_id}/{norujukan}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']);
});
//Operasi