Merge branch 'master' of github.com:hainatravel/information-system

application/models/feedback_model.php

@@ -70,11 +70,11 @@ class Feedback_model extends CI_Model {
           $feedback_count = COUNT($feedback_list);
           if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) {  
             $feedback = [                
-                // 'title' => $feedback_row->tai_title,
+                'title' => $feedback_row->tai_title,
                 'customer' => $feedback_row->tai_customerid,
                 // 'content' => $feedback_row->tad_content,
-                // 'url' => $feedback_row->tai_url,
-                // 'createdOn' => $createdOnString
+                'url' => $feedback_row->tai_url,
+                'createdOn' => $createdOnString
             ];
             $feedback_list[] = $feedback;
             $customer_id_list[] = $feedback_row->tai_customerid;