From 337725bb8607780f0192d64ac8f32dfae2fae4a2 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 4 Oct 2013 17:27:51 +0200 Subject: [PATCH 1/5] // Fixed KPI with 0 value --- admin-dev/themes/default/template/helpers/kpi/kpi.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/kpi/kpi.tpl b/admin-dev/themes/default/template/helpers/kpi/kpi.tpl index 9499f16a5..32294bc1a 100644 --- a/admin-dev/themes/default/template/helpers/kpi/kpi.tpl +++ b/admin-dev/themes/default/template/helpers/kpi/kpi.tpl @@ -45,9 +45,9 @@ success: function(jsonData){ if (!jsonData.has_errors) { - if (jsonData.value) + if (jsonData.value != undefined) $('#{$id|addslashes} .value').html(jsonData.value); - if (jsonData.data) + if (jsonData.data != undefined) { $("#{$id|addslashes} .boxchart svg").remove(); set_d3_{$id|str_replace:'-':'_'|addslashes}(jsonData.data); From 2e4f5c0b0765d036aa2b6e64b2d144c287a7d2ce Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Fri, 4 Oct 2013 17:34:07 +0200 Subject: [PATCH 2/5] // Menus details list is now bootstraped --- controllers/admin/AdminTabsController.php | 80 +++++++++++------------ 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/controllers/admin/AdminTabsController.php b/controllers/admin/AdminTabsController.php index 3a7eb3f0d..64b95e9a1 100644 --- a/controllers/admin/AdminTabsController.php +++ b/controllers/admin/AdminTabsController.php @@ -34,6 +34,7 @@ class AdminTabsControllerCore extends AdminController $this->context = Context::getContext(); $this->multishop_context = Shop::CONTEXT_ALL; $this->table = 'tab'; + $this->list_id = 'tab'; $this->className = 'Tab'; $this->lang = true; @@ -85,11 +86,19 @@ class AdminTabsControllerCore extends AdminController public function initPageHeaderToolbar() { $this->page_header_toolbar_title = $this->l('Menus'); - $this->page_header_toolbar_btn['new_menu'] = array( - 'href' => self::$currentIndex.'&addtab&token='.$this->token, - 'desc' => $this->l('Add new menu'), - 'icon' => 'process-icon-new' - ); + + if ($this->display == 'details') + $this->page_header_toolbar_btn['back_to_list'] = array( + 'href' => Context::getContext()->link->getAdminLink('AdminTabs'), + 'desc' => $this->l('Back to list'), + 'icon' => 'process-icon-back' + ); + else + $this->page_header_toolbar_btn['new_menu'] = array( + 'href' => self::$currentIndex.'&addtab&token='.$this->token, + 'desc' => $this->l('Add new menu'), + 'icon' => 'process-icon-new' + ); parent::initPageHeaderToolbar(); } @@ -212,53 +221,42 @@ class AdminTabsControllerCore extends AdminController return parent::renderList(); } - /** - * method call when ajax request is made with the details row action - * @see AdminController::postProcess() - */ - public function ajaxProcessDetails() + public function initProcess() { - if (($id = Tools::getValue('id'))) + if (Tools::getIsset('details'.$this->table)) { - // override attributes - $this->display = 'list'; - $this->lang = false; + $this->list_id = 'details'; + if (isset($_POST['submitReset'.$this->list_id])) + $this->processResetFilters(); + } + else + $this->list_id = 'tab'; + + return parent::initProcess(); + } + + public function renderDetails() + { + if (($id = Tools::getValue('id_tab'))) + { + $this->lang = false; + $this->list_id = 'details'; $this->addRowAction('edit'); $this->addRowAction('delete'); + $this->toolbar_btn = array(); + $tab = $this->loadObject($id); + $this->toolbar_title = $tab->name[$this->context->employee->id_lang]; $this->_select = 'b.*'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'tab_lang` b ON (b.`id_tab` = a.`id_tab` AND b.`id_lang` = '.$this->context->language->id.')'; $this->_where = 'AND a.`id_parent` = '.(int)$id; $this->_orderBy = 'position'; - - // get list and force no limit clause in the request - $this->getList($this->context->language->id); - - // Render list - $helper = new HelperList(); - $helper->actions = $this->actions; - $helper->list_skip_actions = $this->list_skip_actions; - $helper->no_link = true; - $helper->shopLinkType = ''; - $helper->identifier = $this->identifier; - $helper->imageType = $this->imageType; - $helper->toolbar_scroll = false; - $helper->show_toolbar = false; - $helper->orderBy = 'position'; - $helper->orderWay = 'ASC'; - $helper->currentIndex = self::$currentIndex; - $helper->token = $this->token; - $helper->table = $this->table; - $helper->position_identifier = $this->position_identifier; - // Force render - no filter, form, js, sorting ... - $helper->simple_header = true; - $content = $helper->generateList($this->_list, $this->fields_list); - - echo Tools::jsonEncode(array('use_parent_structure' => false, 'data' => $content)); + + self::$currentIndex = self::$currentIndex.'&details'.$this->table; + $this->processFilter(); + return parent::renderList(); } - - die; } public function postProcess() From c2bcc5baa1e6dd73f46a0811bf8889b80bcdc982 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 4 Oct 2013 18:32:31 +0200 Subject: [PATCH 3/5] [*] FO : TM home modules preparation --- classes/ProductSale.php | 15 ++++- modules/blockbestsellers/blockbestsellers.php | 2 +- modules/homefeatured/homefeatured.php | 1 + modules/homefeatured/js/homefeatured.js | 36 +++++++++++ .../blockbestsellers-home.tpl | 34 +--------- .../blocknewproducts/blocknewproducts.tpl | 28 +-------- .../modules/homefeatured/homefeatured.tpl | 44 +------------ themes/default/product-list-home.tpl | 62 +++++++++++++++++++ 8 files changed, 119 insertions(+), 103 deletions(-) create mode 100644 modules/homefeatured/js/homefeatured.js create mode 100644 themes/default/product-list-home.tpl diff --git a/classes/ProductSale.php b/classes/ProductSale.php index 2f8166a4d..698306cf4 100644 --- a/classes/ProductSale.php +++ b/classes/ProductSale.php @@ -86,7 +86,8 @@ class ProductSaleCore MAX(image_shop.`id_image`) id_image, il.`legend`, ps.`quantity` AS sales, t.`rate`, pl.`meta_keywords`, pl.`meta_title`, pl.`meta_description`, DATEDIFF(p.`date_add`, DATE_SUB(NOW(), - INTERVAL '.$interval.' DAY)) > 0 AS new + INTERVAL '.$interval.' DAY)) > 0 AS new, + IFNULL(pa.minimal_quantity, p.minimal_quantity) as minimal_quantity FROM `'._DB_PREFIX_.'product_sale` ps LEFT JOIN `'._DB_PREFIX_.'product` p ON ps.`id_product` = p.`id_product` '.Shop::addSqlAssociation('product', 'p', false).' @@ -142,10 +143,12 @@ class ProductSaleCore $sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1'); $sql = 'SELECT p.id_product, pl.`link_rewrite`, pl.`name`, pl.`description_short`, MAX(image_shop.`id_image`) id_image, il.`legend`, - ps.`quantity` AS sales, p.`ean13`, p.`upc`, cl.`link_rewrite` AS category + ps.`quantity` AS sales, p.`ean13`, p.`upc`, cl.`link_rewrite` AS category, p.show_price, p.available_for_order, p.quantity, p.customizable, + IFNULL(pa.minimal_quantity, p.minimal_quantity) as minimal_quantity, p.out_of_stock FROM `'._DB_PREFIX_.'product_sale` ps LEFT JOIN `'._DB_PREFIX_.'product` p ON ps.`id_product` = p.`id_product` '.Shop::addSqlAssociation('product', 'p').' + LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (ps.`id_product` = pa.`id_product` AND pa.default_on = 1) LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').' @@ -166,6 +169,7 @@ class ProductSaleCore GROUP BY product_shop.id_product ORDER BY sales DESC LIMIT '.(int)($page_number * $nb_products).', '.(int)$nb_products; + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql)) return false; @@ -173,6 +177,13 @@ class ProductSaleCore { $row['link'] = $context->link->getProductLink($row['id_product'], $row['link_rewrite'], $row['category'], $row['ean13']); $row['id_image'] = Product::defineProductImage($row, $id_lang); + $row['allow_oosp'] = Product::isAvailableWhenOutOfStock($row['out_of_stock']); + $row['price_tax_exc'] = Product::getPriceStatic( + (int)$row['id_product'], + false, + ((isset($row['id_product_attribute']) && !empty($row['id_product_attribute'])) ? (int)$row['id_product_attribute'] : null), + (Product::$_taxCalculationMethod == PS_TAX_EXC ? 2 : 6) + ); } return $result; } diff --git a/modules/blockbestsellers/blockbestsellers.php b/modules/blockbestsellers/blockbestsellers.php index 2d06046b5..cfe87a90d 100644 --- a/modules/blockbestsellers/blockbestsellers.php +++ b/modules/blockbestsellers/blockbestsellers.php @@ -217,7 +217,7 @@ class BlockBestSellers extends Module if (Configuration::get('PS_CATALOG_MODE')) return false; - if (!($result = ProductSale::getBestSalesLight((int)$params['cookie']->id_lang, 0, 5))) + if (!($result = ProductSale::getBestSalesLight((int)$params['cookie']->id_lang, 0, 8))) return (Configuration::get('PS_BLOCK_BESTSELLERS_DISPLAY') ? array() : false); $bestsellers = array(); diff --git a/modules/homefeatured/homefeatured.php b/modules/homefeatured/homefeatured.php index 5d7ec5b57..5a2b1ca54 100644 --- a/modules/homefeatured/homefeatured.php +++ b/modules/homefeatured/homefeatured.php @@ -112,6 +112,7 @@ class HomeFeatured extends Module public function hookHeader($params) { $this->context->controller->addCSS(($this->_path).'homefeatured.css', 'all'); + $this->context->controller->addJS(($this->_path).'js/homefeatured.js'); } public function hookDisplayHome($params) diff --git a/modules/homefeatured/js/homefeatured.js b/modules/homefeatured/js/homefeatured.js new file mode 100644 index 000000000..62606689b --- /dev/null +++ b/modules/homefeatured/js/homefeatured.js @@ -0,0 +1,36 @@ +/* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +$(document).ready(function() +{ + $('.title_block').click(function(){ + var button = $(this); + $('#index #center_column .products_block').removeClass('active'); + button.parent('.products_block').addClass('active'); + $('#index #center_column .products_block .block_content').hide(0, function(){ + button.next('.block_content').show(0); + }); + }); +}); \ No newline at end of file diff --git a/themes/default/modules/blockbestsellers/blockbestsellers-home.tpl b/themes/default/modules/blockbestsellers/blockbestsellers-home.tpl index 9aa6884da..e52fd8017 100644 --- a/themes/default/modules/blockbestsellers/blockbestsellers-home.tpl +++ b/themes/default/modules/blockbestsellers/blockbestsellers-home.tpl @@ -22,35 +22,5 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - - -
-

{l s='Top sellers' mod='blockbestsellers'}

- {if isset($best_sellers) AND $best_sellers} -
- {assign var='liHeight' value=320} - {assign var='nbItemsPerLine' value=4} - {assign var='nbLi' value=$best_sellers|@count} - {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} - {math equation="nbLines*liHeight" nbLines=$nbLines|ceil liHeight=$liHeight assign=ulHeight} - -

{l s='All best sellers' mod='blockbestsellers'}

-
- {else} -

{l s='No best sellers at this time' mod='blockbestsellers'}

- {/if} -
-
- +{capture name=title}{l s='Best sellers' mod='blockbestsellers'}{/capture} +{include file="$tpl_dir./product-list-home.tpl" id="blockbestsellers_block" title=$smarty.capture.title products=$best_sellers} diff --git a/themes/default/modules/blocknewproducts/blocknewproducts.tpl b/themes/default/modules/blocknewproducts/blocknewproducts.tpl index 208e7f63f..f57e2ffd0 100644 --- a/themes/default/modules/blocknewproducts/blocknewproducts.tpl +++ b/themes/default/modules/blocknewproducts/blocknewproducts.tpl @@ -22,29 +22,5 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - - -
-

{l s='New products' mod='blocknewproducts'}

-
- {if $new_products !== false} -
    - {foreach from=$new_products item='product' name='newProducts'} - {if $smarty.foreach.newProducts.index < 2} - {$product.legend|escape:html:'UTF-8'} - {/if} - {/foreach} -
-
- {foreach from=$new_products item=newproduct name=myLoop} -
{$newproduct.name|strip_tags|escape:html:'UTF-8'}
- {if $newproduct.description_short}
{$newproduct.description_short|strip_tags:'UTF-8'|truncate:75:'...'}
{l s='Read more' mod='blocknewproducts'}
{/if} - {/foreach} -
-

» {l s='All new products' mod='blocknewproducts'}

- {else} -

» {l s='No new products at this time' mod='blocknewproducts'}

- {/if} -
-
- \ No newline at end of file +{capture name=title}{l s='New arrivals' mod='blocknewproducts'}{/capture} +{include file="$tpl_dir./product-list-home.tpl" id="blocknewproducts_block" title=$smarty.capture.title products=$new_products} \ No newline at end of file diff --git a/themes/default/modules/homefeatured/homefeatured.tpl b/themes/default/modules/homefeatured/homefeatured.tpl index 89b472bf2..4a346ac11 100644 --- a/themes/default/modules/homefeatured/homefeatured.tpl +++ b/themes/default/modules/homefeatured/homefeatured.tpl @@ -22,45 +22,5 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - - - - +{capture name=title}{l s='Popular' mod='homefeatured'}{/capture} +{include file="$tpl_dir./product-list-home.tpl" id="homefeatured_block" title=$smarty.capture.title} \ No newline at end of file diff --git a/themes/default/product-list-home.tpl b/themes/default/product-list-home.tpl new file mode 100644 index 000000000..45e19689c --- /dev/null +++ b/themes/default/product-list-home.tpl @@ -0,0 +1,62 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +

{if isset($title)}{$title}{/if}

+ {if isset($products) AND $products} +
+ {assign var='liHeight' value=250} + {assign var='nbItemsPerLine' value=4} + {assign var='nbLi' value=$products|@count} + {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} + {math equation="nbLines*liHeight" nbLines=$nbLines|ceil liHeight=$liHeight assign=ulHeight} +
    + {foreach from=$products item=product name=homeProducts} + {math equation="(total%perLine)" total=$smarty.foreach.homeProducts.total perLine=$nbItemsPerLine assign=totModulo} + {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if} +
  • + {$product.name|escape:html:'UTF-8'}{if isset($product.new) && $product.new == 1}{l s='New'}{/if} +
    {$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}
    +
    {$product.description_short|strip_tags|truncate:65:'...'}
    +
    + {l s='View'} + {if isset($product.show_price) && $product.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}

    {if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}

    {else}
    {/if} + {if ((isset($product.id_product_attribute) && $product.id_product_attribute == 0) OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND (isset($product.available_for_order) && $product.available_for_order) AND !isset($restricted_country_mode) AND $product.minimal_quantity == 1 AND $product.customizable != 2 AND !$PS_CATALOG_MODE} + {if ($product.quantity > 0 OR $product.allow_oosp)} + {l s='Add to cart'} + {else} + {l s='Add to cart'} + {/if} + {else} +
    + {/if} +
    +
    • + {/foreach} +
+
+ {else} +

{l s='No products'}

+ {/if} + \ No newline at end of file From d141f5bdc0eba0bde88df13ce38fa3aea42819c1 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 4 Oct 2013 18:35:30 +0200 Subject: [PATCH 4/5] // wrong modif on ProductSale --- classes/ProductSale.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/ProductSale.php b/classes/ProductSale.php index 698306cf4..1cb8aed99 100644 --- a/classes/ProductSale.php +++ b/classes/ProductSale.php @@ -86,8 +86,7 @@ class ProductSaleCore MAX(image_shop.`id_image`) id_image, il.`legend`, ps.`quantity` AS sales, t.`rate`, pl.`meta_keywords`, pl.`meta_title`, pl.`meta_description`, DATEDIFF(p.`date_add`, DATE_SUB(NOW(), - INTERVAL '.$interval.' DAY)) > 0 AS new, - IFNULL(pa.minimal_quantity, p.minimal_quantity) as minimal_quantity + INTERVAL '.$interval.' DAY)) > 0 AS new FROM `'._DB_PREFIX_.'product_sale` ps LEFT JOIN `'._DB_PREFIX_.'product` p ON ps.`id_product` = p.`id_product` '.Shop::addSqlAssociation('product', 'p', false).' From c2ea0be841412930ec7353443dac6262677ec95a Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Fri, 4 Oct 2013 19:13:02 +0200 Subject: [PATCH 5/5] // orders WIP --- admin-dev/themes/default/css/admin-theme.css | 83 ++++---- admin-dev/themes/default/css/admin-theme.sass | 7 +- .../controllers/orders/_discount_form.tpl | 13 +- .../controllers/orders/_documents.tpl | 6 +- .../controllers/orders/_new_product.tpl | 8 +- .../controllers/orders/_product_line.tpl | 47 +++-- .../template/controllers/orders/_shipping.tpl | 5 +- .../controllers/orders/helpers/view/view.tpl | 199 ++++++++++++------ .../default/template/helpers/form/form.tpl | 2 +- controllers/admin/AdminOrdersController.php | 5 + js/admin_order.js | 41 +++- 11 files changed, 271 insertions(+), 145 deletions(-) diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 94cdaa5a5..bfe87649c 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -8146,25 +8146,26 @@ textarea { border-color: #cccccc !important; } /* line 559, admin-theme.sass */ -tr.highlight td { - background-color: #ffffc0; } +tr.highlighted td { + background-color: #1ba6e5 !important; + color: white; } -/* line 562, admin-theme.sass */ +/* line 565, admin-theme.sass */ .hook_panel { -webkit-box-shadow: rgba(255, 255, 255, 0.9) 0 0 0 1px inset; box-shadow: rgba(255, 255, 255, 0.9) 0 0 0 1px inset; padding: 10px 10px 5px 10px; margin-bottom: 3px !important; } -/* line 567, admin-theme.sass */ +/* line 570, admin-theme.sass */ .module_name { font-size: 1.2em; } -/* line 571, admin-theme.sass */ +/* line 574, admin-theme.sass */ .hook_panel_header { margin: 0 -10px 0 -10px; padding: 0 10px 10px 10px; } -/* line 574, admin-theme.sass */ +/* line 577, admin-theme.sass */ .hook_panel_header .hook_name { font-weight: 400; font-size: 1.2em; @@ -8177,15 +8178,15 @@ tr.highlight td { border: solid 1px #cccccc; background-color: white; padding: 0 4px; } -/* line 582, admin-theme.sass */ +/* line 585, admin-theme.sass */ .hook_panel_header .hook_title { text-transform: uppercase; font-size: 1em; } -/* line 585, admin-theme.sass */ +/* line 588, admin-theme.sass */ .hook_panel_header .hook_description { padding: 3px 0 0 3px; } -/* line 589, admin-theme.sass */ +/* line 592, admin-theme.sass */ .module_list .module_list_item { display: table; width: 100%; @@ -8200,7 +8201,7 @@ tr.highlight td { -o-border-radius: 3px; border-radius: 3px; } -/* line 597, admin-theme.sass */ +/* line 600, admin-theme.sass */ .module_col_select { display: table-cell; width: 22px; @@ -8209,13 +8210,13 @@ tr.highlight td { text-align: center; border-right: 1px solid #dddddd; } -/* line 604, admin-theme.sass */ +/* line 607, admin-theme.sass */ .module_col_position { display: table-cell; width: 60px; vertical-align: middle; text-align: right; } -/* line 609, admin-theme.sass */ +/* line 612, admin-theme.sass */ .module_col_position .positions { font-family: "Ubuntu", sans-serif; font-weight: 200; @@ -8233,41 +8234,41 @@ tr.highlight td { border: solid 1px #cccccc; background-color: #eeeeee; } -/* line 620, admin-theme.sass */ +/* line 623, admin-theme.sass */ .module_col_icon { display: table-cell; width: 50px; text-align: center; vertical-align: middle; } -/* line 626, admin-theme.sass */ +/* line 629, admin-theme.sass */ .module_col_infos { display: table-cell; height: 50px; vertical-align: middle; } -/* line 631, admin-theme.sass */ +/* line 634, admin-theme.sass */ .module_col_actions { display: table-cell; width: 160px; padding: 0 10px; vertical-align: middle; text-align: right; } -/* line 637, admin-theme.sass */ +/* line 640, admin-theme.sass */ .module_col_actions .btn-group { text-align: left; } -/* line 641, admin-theme.sass */ +/* line 644, admin-theme.sass */ .tree { padding: 0 0 0 20px; list-style: none; } -/* line 644, admin-theme.sass */ +/* line 647, admin-theme.sass */ .tree input { margin-right: 4px; } -/* line 646, admin-theme.sass */ +/* line 649, admin-theme.sass */ .tree i { font-size: 1.3em; } -/* line 650, admin-theme.sass */ +/* line 653, admin-theme.sass */ .tree .tree-item-name, .tree .tree-folder-name { padding: 0 5px; -webkit-border-radius: 6px; @@ -8276,17 +8277,17 @@ tr.highlight td { -o-border-radius: 6px; border-radius: 6px; font-weight: normal; } -/* line 654, admin-theme.sass */ +/* line 657, admin-theme.sass */ .tree .tree-item-name:hover, .tree .tree-folder-name:hover { background-color: #eeeeee; cursor: pointer; } -/* line 657, admin-theme.sass */ +/* line 660, admin-theme.sass */ .tree .tree-selected { background-color: #a4dcf5; } -/* line 659, admin-theme.sass */ +/* line 662, admin-theme.sass */ .tree .tree-selected i.tree-dot { background-color: #1ba6e5; } -/* line 661, admin-theme.sass */ +/* line 664, admin-theme.sass */ .tree i.tree-dot { display: inline-block; position: relative; @@ -8299,55 +8300,55 @@ tr.highlight td { -ms-border-radius: 6px; -o-border-radius: 6px; border-radius: 6px; } -/* line 669, admin-theme.sass */ +/* line 672, admin-theme.sass */ .tree .tree-item-disable, .tree .tree-folder-name-disable { color: #cccccc; } -/* line 671, admin-theme.sass */ +/* line 674, admin-theme.sass */ .tree .tree-item-disable:hover, .tree .tree-folder-name-disable:hover { color: #cccccc; background-color: none; } -/* line 675, admin-theme.sass */ +/* line 678, admin-theme.sass */ .nav-tabs { border-bottom: none; } -/* line 678, admin-theme.sass */ +/* line 681, admin-theme.sass */ .nav-tabs li.active a.tab-page { background-color: white; } -/* line 681, admin-theme.sass */ +/* line 684, admin-theme.sass */ .tree-actions { padding-bottom: 4px; display: inline-block; } -/* line 686, admin-theme.sass */ +/* line 689, admin-theme.sass */ .tt-query { border-bottom-right-radius: 3px !important; border-top-right-radius: 3px !important; } -/* line 688, admin-theme.sass */ +/* line 691, admin-theme.sass */ .tt-dropdown-menu { background-color: white; border: solid 1px #cccccc; font-size: 0.9em; text-transform: none; } -/* line 693, admin-theme.sass */ +/* line 696, admin-theme.sass */ .tt-suggestions { padding: 0 6px; -webkit-box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; } -/* line 696, admin-theme.sass */ +/* line 699, admin-theme.sass */ .tt-suggestion p { border-bottom: solid 1px #cccccc; margin: 0 !important; padding: 0 !important; } -/* line 700, admin-theme.sass */ +/* line 703, admin-theme.sass */ .tt-suggestion:last-child p { border-bottom: none; } -/* line 704, admin-theme.sass */ +/* line 707, admin-theme.sass */ .tagify-container { background-color: white; padding: 2px 6px; @@ -8361,10 +8362,10 @@ tr.highlight td { border: solid 1px #cccccc; -webkit-box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; } -/* line 712, admin-theme.sass */ +/* line 715, admin-theme.sass */ .tagify-container span { float: left; } -/* line 714, admin-theme.sass */ +/* line 717, admin-theme.sass */ .tagify-container > span { display: inline-block; padding: 3px 5px; @@ -8373,26 +8374,26 @@ tr.highlight td { border: 1px solid #1ba6e5; background-color: #60c1ed; color: white; } -/* line 722, admin-theme.sass */ +/* line 725, admin-theme.sass */ .tagify-container > span > a { padding-left: 5px; color: #1ba6e5; text-decoration: none; font-weight: bold; } -/* line 727, admin-theme.sass */ +/* line 730, admin-theme.sass */ .tagify-container > input { margin-top: 2px; border: 0 none; width: 100px; -webkit-box-shadow: none; box-shadow: none; } -/* line 732, admin-theme.sass */ +/* line 735, admin-theme.sass */ .tagify-container > input:focus { outline: 0; -webkit-box-shadow: none; box-shadow: none; } -/* line 737, admin-theme.sass */ +/* line 740, admin-theme.sass */ li.sortable-placeholder { border: 1px dashed #cccccc; background-color: #bbbbbb; diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index e62465787..906d63f45 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -556,8 +556,11 @@ textarea background-color: white border-color: #ccc!important -tr.highlight td - background-color: #FFFFC0 +tr.highlighted td + background-color: $brand-primary!important + color: white + + .hook_panel @extend .well diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl index 23ef6ee08..d4fac3786 100644 --- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl @@ -99,18 +99,17 @@ {/if} - +
- - +
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl index 853048cfd..33221b48f 100644 --- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl @@ -123,8 +123,8 @@ {if !isset($document->is_delivery)} {if $document->getRestPaid()} - - {l s='Set payment form'} + + {l s='Enter Payment'} {/if} @@ -148,7 +148,7 @@

- +

diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl index 9eb840650..325614c2b 100755 --- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl @@ -134,26 +134,38 @@ {/if} -

- {l s='Quantity:'} + +
+ +
+ +
0/{$productQuantity-$product['product_quantity_refunded']}
+
-
- - 0/{$productQuantity-$product['product_quantity_refunded']} + +
+ +
+
+ {$currency->prefix} + {$currency->suffix} +
+ +
-
- {l s='Amount:'} + +
+ {if !empty($product['amount_refund']) && $product['amount_refund'] > 0} + ({l s='%s refund' sprintf=$product['amount_refund']}) + {/if} + +
-
- {$currency->prefix} - - {$currency->suffix} -
- {if !empty($product['amount_refund']) && $product['amount_refund'] > 0} - ({l s='%s refund' sprintf=$product['amount_refund']}) - {/if} - - + {if ($can_edit && !$order->hasBeenDelivered())} @@ -198,7 +210,6 @@ {l s='Cancel'} - {/if} diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl index c40fddcef..442cc499f 100644 --- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl @@ -66,7 +66,10 @@ diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index 7645dbc16..c35d56fbc 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -119,7 +119,7 @@ {foreach from=$history item=row key=key} {if ($key == 0)} - + {$row['ostate_name']|stripslashes} {if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if} @@ -332,7 +332,7 @@ {if count($order->getOrderPayments()) > 0} -

+

{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} @@ -764,7 +764,7 @@ {/if} - {l s='Partial refund'} + {l s='Partial refund'} {if !$order->hasBeenDelivered()} @@ -788,10 +788,10 @@ {if $can_edit} {if !$order->hasBeenDelivered()}

- +
{/if} {/if} @@ -836,9 +836,13 @@ {displayPrice price=$order->total_shipping_tax_incl currency=$currency->id} - {$currency->prefix} - - {$currency->suffix} +
+
+ {$currency->prefix} + {$currency->suffix} +
+ +
@@ -851,6 +855,59 @@
+ +
@@ -872,7 +929,9 @@ {l s='Value'} - {if $can_edit}{/if} + {if $can_edit} + + {/if} @@ -908,35 +967,6 @@ {/if} {/if} - -
@@ -946,36 +976,79 @@ {l s='New message'} - -
- {l s='to add a comment or send a message to the customer.'} + +
{l s='Click here'} {l s='to see all messages.'} + -
- - {l s='Display to customer?'} - {l s='Yes'} - {l s='No'} - -

- - - - - - -
@@ -989,7 +1062,7 @@
{if ($message['is_new_for_me'])} - + {/if} {l s='At'} {dateFormat date=$message['date_add']} @@ -1003,4 +1076,8 @@ {/if} + + {/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 773e9fcef..8ef5ff597 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -368,7 +368,7 @@ {if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />