dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-02 09:54:23 +00:00
parent ab5fc723b4
commit c945049ef1
46 changed files with 370 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminOrders.php
+3 -5
View File
@@ -657,12 +657,10 @@ class AdminOrders extends AdminTab
<br />
<fieldset style="width: 400px">
<legend><img src="../img/admin/details.gif" /> '.$this->l('Order details').'</legend>';
if (Tools::isMultiShopActivated())
if (Shop::isMultiShopActivated())
{
$shop = new Shop((int)$order->id_shop);
echo '
<label>'.$this->l('Shop:').' </label>
<div style="margin: 2px 0 1em 190px;">'.$shop->name.'</div>';
echo '<label>'.$this->l('Shop:').' </label>
<div style="margin: 2px 0 1em 190px;">'.Shop::getInstance($order->id_shop)->name.'</div>';
}
echo '
<label>'.$this->l('Original cart:').' </label>