diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 10e296f..c49398e 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -2,6 +2,7 @@ use Carbon\Carbon; use Modules\Lpj\Models\PenawaranDetailTender; +use Modules\Lpj\Models\PenawaranTender; function formatTanggalIndonesia($date) { @@ -42,10 +43,12 @@ function formatAlamat($alamat) } // andy add -function checkActiveDateRangePenawaran($start_date1, $end_date1) +function checkActiveDateRangePenawaran($id) { - $start_date = strtotime($start_date1); - $end_date = strtotime($end_date1); + $penawaran = PenawaranTender::find($id); + + $start_date = strtotime($penawaran->start_date); + $end_date = strtotime($penawaran->end_date); $todays_date = strtotime(now()); $allow = true; diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php index 9c16c9f..243fb9d 100644 --- a/app/Http/Controllers/ProsesPenawaranController.php +++ b/app/Http/Controllers/ProsesPenawaranController.php @@ -255,8 +255,8 @@ class ProsesPenawaranController extends Controller $data = array(); $dataPermohonan = array(); $dataPenawaran = array(); - $penawaran = PenawaranTender::findOrFail($id); - $checkActiveDateRange = checkActiveDateRangePenawaran($penawaran->start_date, $penawaran->end_date); + $penawaran = PenawaranTender::find($id); + $checkActiveDateRange = checkActiveDateRangePenawaran($id); // cek masa aktif penawaran if($checkActiveDateRange)