Merge pull request 'andydev' (#52) from andydev into staging
Reviewed-on: #52
This commit is contained in:
@@ -6,7 +6,10 @@
|
|||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Modules\Lpj\Http\Requests\PersetujuanPenawaranRequest;
|
use Modules\Lpj\Http\Requests\PersetujuanPenawaranRequest;
|
||||||
use Modules\Lpj\Models\Permohonan;
|
use Modules\Lpj\Models\PenawaranDetailTender;
|
||||||
|
use Modules\Lpj\Models\PenawaranDetailTenderLog;
|
||||||
|
use Modules\Lpj\Models\PenawaranTender;
|
||||||
|
use Modules\Lpj\Models\Permohonan;
|
||||||
use Modules\Lpj\Models\PersetujuanPenawaran;
|
use Modules\Lpj\Models\PersetujuanPenawaran;
|
||||||
|
|
||||||
class PersetujuanPenawaranController extends Controller
|
class PersetujuanPenawaranController extends Controller
|
||||||
@@ -69,6 +72,16 @@
|
|||||||
$permohonan->status_bayar = request()->get('status_bayar');
|
$permohonan->status_bayar = request()->get('status_bayar');
|
||||||
$permohonan->status = 'spk';
|
$permohonan->status = 'spk';
|
||||||
$permohonan->save();
|
$permohonan->save();
|
||||||
|
|
||||||
|
// andy add, update status penawaran.status='spk'
|
||||||
|
// $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
|
||||||
|
PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)
|
||||||
|
->update(['status'=>'spk',
|
||||||
|
'updated_by' => Auth::id(),
|
||||||
|
'updated_at' => now()
|
||||||
|
]);
|
||||||
|
// andy add, update status penawaran.status='spk'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return redirect()
|
return redirect()
|
||||||
@@ -90,6 +103,64 @@
|
|||||||
{
|
{
|
||||||
$permohonan = Permohonan::find($id);
|
$permohonan = Permohonan::find($id);
|
||||||
$permohonan->status='tender';
|
$permohonan->status='tender';
|
||||||
|
$dataDetailPenawaranLog = [];
|
||||||
|
|
||||||
|
// andy add update status penawaran
|
||||||
|
// update detail_penawaran => detail_penawaran.status = 1 (untuk all KJPP)
|
||||||
|
// update penawaran => penawaran.status ="tender", penawaran.updated_at, penawaran.updated_by
|
||||||
|
// update permohonan => permohonan.status ="tender", permohonan.updated_at, permohonan.updated_by
|
||||||
|
// insert detail_permohonan_log
|
||||||
|
$penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
|
||||||
|
// dd($penawaran->id);
|
||||||
|
PenawaranDetailTender::where('penawaran_id', $penawaran->id)
|
||||||
|
->update(['status' => 1,
|
||||||
|
'updated_by' => Auth::id(),
|
||||||
|
'updated_at' => now()
|
||||||
|
]);
|
||||||
|
|
||||||
|
PenawaranTender::where('id', $penawaran->id)
|
||||||
|
->update(['status'=>'tender',
|
||||||
|
'updated_by' => Auth::id(),
|
||||||
|
'updated_at' => now()
|
||||||
|
]);
|
||||||
|
|
||||||
|
$detailPenawaran = PenawaranDetailTender::where('penawaran_id', $penawaran->id)
|
||||||
|
->distinct()
|
||||||
|
->get();
|
||||||
|
|
||||||
|
// log
|
||||||
|
if(sizeof($detailPenawaran)>0)
|
||||||
|
{
|
||||||
|
|
||||||
|
foreach ($detailPenawaran as $model) {
|
||||||
|
array_push($dataDetailPenawaranLog, [
|
||||||
|
'detail_penawaran_id' =>$model->id,
|
||||||
|
'kjpp_rekanan_id' =>$model->kjpp_rekanan_id,
|
||||||
|
'penawaran_id' =>$model->penawaran_id,
|
||||||
|
'no_proposal' =>$model->no_proposal,
|
||||||
|
'tgl_proposal' =>$model->tgl_proposal,
|
||||||
|
'biaya_penawaran' =>$model->biaya_penawaran,
|
||||||
|
'attachment' =>$model->attachment,
|
||||||
|
'dokumen_persetujuan' =>$model->dokumen_persetujuan,
|
||||||
|
'status' =>$model->status,
|
||||||
|
'authorized_status' =>$model->authorized_status,
|
||||||
|
'authorized_at' =>$model->authorized_at,
|
||||||
|
'authorized_at' =>$model->authorized_at,
|
||||||
|
'created_at' =>$model->created_at,
|
||||||
|
'updated_at' =>$model->updated_at,
|
||||||
|
'deleted_at' =>$model->deleted_at,
|
||||||
|
'created_by' =>$model->created_by,
|
||||||
|
'updated_by' =>$model->updated_by,
|
||||||
|
'deleted_by' =>$model->deleted_by
|
||||||
|
]);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
PenawaranDetailTenderLog::insert($dataDetailPenawaranLog);
|
||||||
|
}
|
||||||
|
// log
|
||||||
|
// andy add update status penawaran
|
||||||
|
|
||||||
return $permohonan->save();
|
return $permohonan->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user