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

app/Http/Controllers/Api/CompoundResourceController.php

@@ -992,7 +992,7 @@ class CompoundResourceController extends BaseController
 
                         //mobile already accept 'kpd' string, so no need to change string name to 'notis'.
                         array_push($data, array(
-                            'kpd' => '-',
+                            'kpd' => $non,
                             'non' => $non
                         ));
 

resources/views/pdf/compound_payment.blade.php

@@ -168,7 +168,7 @@
         <td>
             <table width="100%" border="0" cellpadding="0" cellspacing="0">
                 <td width="35%" style="text-align: left; font-size: 12px;">Peruntukan Undang - Undang</td>
-                <td width="65%" style="text-align: left; font-size: 12px;">: {{ faulty['deed_law']['nama'] }}</td>
+                <td width="65%" style="text-align: left; font-size: 12px;">: {{ $faulty->deedlaw->nama }}</td>
             </table>
         </td>
     </tr>
@@ -179,7 +179,7 @@
         <td>
             <table width="100%" border="0" cellpadding="0" cellspacing="0">
                 <td width="35%" style="text-align: left; font-size: 12px;">Seksyen / Kaedah</td>
-                <td width="65%" style="text-align: left; font-size: 12px;">: {{ faulty['sketr'] }}</td>
+                <td width="65%" style="text-align: left; font-size: 12px;">: {{ $faulty->sketr }}</td>
             </table>
         </td>
     </tr>
@@ -191,7 +191,7 @@
             <table width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
                     <td width="35%" style="text-align: left; font-size: 12px;">Kesalahan</td>
-                    <td width="65%" style="text-align: left; font-size: 12px;">: {{ faulty['nama'] }}</td>
+                    <td width="65%" style="text-align: left; font-size: 12px;">: {{ $faulty->nama }}</td>
                 </tr>
             </table>
         </td>
@@ -240,7 +240,7 @@
         <td>
             <table width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                    <td style="text-align: left; font-size: 12px;">Dikeluarkan Oleh<br> {{ $staff->staff_detail->full_name }}, <br> ({{ $staff->roles_access }}), <br> [{{ $department->jbkod }}] {{ $department->jnama }}</td>
+                    <td style="text-align: left; font-size: 12px;">Dikeluarkan Oleh<br> {{ $staff->staffdetail->full_name }}, <br> ({{ $staff->roles_access }}), <br> [{{ $department->jbkod }}] {{ $department->jnama }}</td>
                 </tr>
             </table>
         </td>