provider store_name

admin/control/merchant.php

@@ -892,7 +892,8 @@ class merchantControl extends SystemControl
                 $order_list[$order_id]['diff_time'] = time() - $order_info['order_time'];
             }
         }
-        $provider_list = Model('')->table('refill_provider')->limit(100)->select();
+        $provider_list = Model('')->table('refill_provider,store')->field('refill_provider.*,store.store_name')->join('inner')->on('store.store_id=refill_provider.store_id')->limit(100)->select();
+
         Tpl::output('stat', $stat);
         Tpl::output('count', $count);
         Tpl::output('order_list', $order_list);

admin/templates/default/refill.order.index.php

@@ -49,7 +49,7 @@
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
                         <?php foreach($output['provider_list'] as $provider){?>
                             <option value="<?php echo $provider['store_id']?>"
-                                    <?php if ($_GET['store_id'] == $provider['store_id']){ ?>selected<?php } ?>><?php echo $provider['name']?>
+                                    <?php if ($_GET['store_id'] == $provider['store_id']){ ?>selected<?php } ?>><?php echo $provider['store_name']?>
                             </option>
                         <?php }?>
                     </select>