Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into andydev

app/Helpers/Lpj.php

@@ -6,32 +6,13 @@ use Modules\Lpj\Models\HolidayCalendar;
     use Modules\Lpj\Models\PenawaranDetailTender;
     use Modules\Lpj\Models\PenawaranTender;
 
-
-    function formatTanggalIndonesia($date)
-    {
-        $carbonDate       = Carbon::parse($date);
-        $indonesianMonths = [
-            'Januari',
-            'Februari',
-            'Maret',
-            'April',
-            'Mei',
-            'Juni',
-            'Juli',
-            'Agustus',
-            'September',
-            'Oktober',
-            'November',
-            'Desember',
-        ];
-        $month            = $indonesianMonths[$carbonDate->month - 1];
-        return $carbonDate->format('d') . ' ' . $month . ' ' . $carbonDate->format('Y');
-    }
-
-    function formatTanggalIndonesia2($date)
+    function formatTanggalIndonesia($date,$time=false)
     {
         Carbon::setLocale('id');
         $waktu = Carbon::parse($date);
+        if(!$time){
+            return $waktu->translatedFormat('d F Y');
+        }
         return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB';
     }