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

// fix tpl folder detection in BO

Browse Source
This commit is contained in:
tDidierjean
2011-11-21 10:11:49 +00:00
parent d08054ad35
commit dc78a657d4
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/addons_myaccount/content.tpl → admin-dev/themes/template/addons_my_account/content.tpl
View File
classes/Tools.php
+1 -1
View File
@@ -1259,7 +1259,7 @@ class ToolsCore
{
// 'CMSCategories' => 'cms_categories'
// 'RangePrice' => 'range_price'
return strtolower(preg_replace('/([a-zA-Z])([A-Z][a-z])/', '$1_$2', $string));
return strtolower(trim(preg_replace('/([A-Z][a-z])/', '_$1', $string), '_'));
}
public static function getBrightness($hex)
controllers/admin/AdminOrdersController.php
+1 -1
View File
@@ -68,7 +68,7 @@ class AdminOrdersControllerCore extends AdminController
'total_paid' => array('title' => $this->l('Total'), 'width' => 70, 'align' => 'right', 'prefix' => '<b>', 'suffix' => '</b>', 'type' => 'price', 'currency' => true),
'payment' => array('title' => $this->l('Payment'), 'width' => 100),
'osname' => array('title' => $this->l('Status'), 'width' => 230, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int', 'width' => 200),
'date_add' => array('title' => $this->l('Date'), 'width' => 35, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'),
'date_add' => array('title' => $this->l('Date'), 'width' => 120, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'),
'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false));
$this->shopLinkType = 'shop';