admin update

admin/control/provider.php

@@ -208,9 +208,8 @@ class providerControl extends SystemControl
             $providers[$provider['provider_id']] = $provider;
         }
         $mod = Model('provider_amount');
-        $list = $mod->getAmountList($condition,50,'*', 'add_time desc, provider_id asc', '', true);
+        $list = $mod->getAmountList($condition,50,'provider_amount.*,refill_provider.name', 'provider_amount.add_time desc, refill_provider.name asc', '', true);
         foreach ($list as $key => $value) {
-            $list[$key]['provider_name'] = $providers[$value['provider_id']]['name'];
             $list[$key]['store_name'] = $providers[$value['provider_id']]['store_name'];
         }
         $stat = Model()->table('provider_amount')

admin/templates/default/provider.amount.php

@@ -114,7 +114,7 @@
                         <td><?php echo $k+1;?></td>
                         <td><?php echo $v['provider_id']; ?></td>
                         <td><?php echo $v['id']; ?></td>
-                        <td><?php echo $v['provider_name']; ?> (<?php echo $v['store_name'];?>)</td>
+                        <td><?php echo $v['name']; ?> (<?php echo $v['store_name'];?>)</td>
                         <td class="align-right"><?php echo $v['amount']; ?></td>
                         <td class="align-left"><?php echo $v['operation']; ?></td>
                         <td class="align-left"><?php echo $v['add_time'] ? date('Y-m-d H:i', $v['add_time']) : $lang['no_limit']; ?></td>
@@ -126,14 +126,14 @@
                 <?php } ?>
             <?php } else { ?>
                 <tr class="no_data">
-                    <td colspan="6"><?php echo $lang['nc_no_record']; ?></td>
+                    <td colspan="8"><?php echo $lang['nc_no_record']; ?></td>
                 </tr>
             <?php } ?>
             </tbody>
             <tfoot>
             <tr class="tfoot">
                 <td></td>
-                <td colspan="6">
+                <td colspan="8">
                     <div class="pagination"><?php echo $output['show_page']; ?></div>
                 </td>
             </tr>