Merge branch 'master' of http://git.swisslink.com.my/SwissLink/sipadu_mbip

app/Http/Controllers/Api/RestfulapiController.php

@@ -94,16 +94,13 @@ class RestfulapiController extends BaseController
                     ->orWhere(function($q) use
                     ($notice, $ic, $date, $jalan, $taman, $kawasan) {
 
-                        if(!empty($notice) && $notice != '-'){
-
-                            $q = $q->where('non', 'like', $notice)->orWhere('kpd', 'like', $notice);
-                        }
-
-                        if(!empty($ic) && $ic != '-'){
-
-                            $q = $q->where('identity', 'like', $ic);
+                        //filter by nama kawasan, taman, jalan
+                        if( !empty($kawasan) || !empty($taman) || !empty($jalan) )
+                        {
+                            $q = $q->where('nama_kawasan',  $kawasan)->orWhere('nama_taman', $taman)->orWhere('nama_jalan', $jalan);
                         }
 
+                        //filter by date
                         if(!empty($date) && $date != '-'){
 
                             $start = Carbon::createFromFormat('Y-m-d', $date)->startOfDay();
@@ -113,9 +110,16 @@ class RestfulapiController extends BaseController
 
                         }
 
-                        if( !empty($kawasan) || !empty($taman) || !empty($jalan) )
-                        {
-                            $q = $q->where('nama_kawasan',  $kawasan)->orWhere('nama_taman', $taman)->orWhere('nama_jalan', $jalan);
+                        //filter by no notice
+                        if(!empty($notice) && $notice != '-'){
+
+                            $q = $q->where('non', 'like', $notice)->orWhere('kpd', 'like', $notice);
+                        }
+
+                        //filter by no ic
+                        if(!empty($ic) && $ic != '-'){
+
+                            $q = $q->where('identity', 'like', $ic);
                         }
 
                      })->get();
@@ -146,13 +150,13 @@ class RestfulapiController extends BaseController
 
                         if (!empty($c->created_n))
                         {
-                            $tarikh_n = Carbon::parse($c->created_n)->translatedFormat("l, d M, 'y");
+                            $tarikh_n = Carbon::parse($c->created_n)->translatedFormat("l, d F, 'y");
                             $masa_n = Carbon::parse($c->created_n)->translatedFormat("g:i A");
                         }
 
                         if(!empty($c->created_c))
                         {
-                            $tarikh = Carbon::parse($c->created_c)->translatedFormat("l, d M, 'y");
+                            $tarikh = Carbon::parse($c->created_c)->translatedFormat("l, d F, 'y");
                             $masa = Carbon::parse($c->created_c)->translatedFormat("g:i A");
                         }