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

app/Http/Controllers/Api/RestfulapiController.php

@@ -146,14 +146,14 @@ class RestfulapiController extends BaseController
 
                         if (!empty($c->created_n))
                         {
-                            $tarikh_n = Carbon::parse($c->created_n)->translatedFormat("l, d M, 'y");
-                            $masa_n = Carbon::parse($c->created_n)->translatedFormat("g:i A");
+                            $tarikh_n = Carbon::parse($c->created_c)->translatedFormat("l, d M, 'y");
+                            $masa_n = Carbon::parse($c->created_c)->translatedFormat("g:i A");
                         }
 
                         if(!empty($c->created_c))
                         {
-                            $tarikh = Carbon::parse($c->created_c)->translatedFormat("l, d M, 'y");
-                            $masa = Carbon::parse($c->created_c)->translatedFormat("g:i A");
+                            $tarikh = Carbon::parse($c->created_n)->translatedFormat("l, d M, 'y");
+                            $masa = Carbon::parse($c->created_n)->translatedFormat("g:i A");
                         }
 
                         //set default data to '-' if not present