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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Gregory Roussac
2013-02-20 14:27:05 +01:00
parent 30e1ef8cc1 755573184c
commit e389d1dd70
9 changed files with 100 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin.css
+24 -7
View File
@@ -47,7 +47,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
#header #header_infos{ position:relative; margin: 0; padding:0; height:60px; }
#header #header_shopname {float: left; margin:10px 15px 0 10px;}
#header #employee_box {float: right; display:block;}
#header #employee_infos {display:block; margin:10px 15px 0 10px;}
#header #employee_infos {display:block; margin:5px 15px 0 10px;}
#header #employee_infos a{color:#BABABA; text-transform:capitalize;margin-right: 5px}
#header #employee_infos a:hover {color:#fff;}
#header #employee_infos .employee_name { float:left; color:#fff;padding: 0 20px 0 0;}
@@ -518,20 +518,31 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
#moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
/*TAB MODULES LIST*/
#modules_list_container_tab #modules_list_container_content{
list-style-type:none;
padding:0;
margin:0;
white-space: nowrap;
overflow: auto;
height: 335px;
}
#modules_list_container_tab #modules_list_container_content li{display:inline-block;}
#modules_list_container_tab table tr th { height:40px;}
#modules_list_container_tab table tr td { font-size:12px; padding: 3px 3px 3px; border-top:1px solid #ccc; border-bottom:none;}
#modules_list_container_tab table tr td tr td {border: none}
#modules_list_container_tab table tr:first-child {border-top:1px solid #ccc}
#modules_list_container_tab table td.tab_modules_actions_row {border-top:1px solid #ccc}
#modules_list_container_tab .imgm {width:32px;}
#modules_list_container_tab .moduleDesc { font-size:12px;}
#modules_list_container_tab .moduleDesc h3 { color:#3A6EA7;margin: 0;font-size: 1.1em;text-align: left}
#modules_list_container_tab .moduleDesc { font-size:12px;width: 238px;}
#modules_list_container_tab .moduleDesc h3 { color:#3A6EA7;margin: 0;font-size: 1.1em;text-align: left;white-space: normal;}
#modules_list_container_tab .moduleDesc .metadata { float:left; display:block; margin:5px 0;}
#modules_list_container_tab .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
#modules_list_container_tab .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
#modules_list_container_tab .moduleDesc .metadata dl dd { padding-right:10px;}
#modules_list_container_tab .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
#modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; display:block; clear:both;text-align: left}
#modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; padding:2px 3px; display: inline-block; border-radius:3px;}
#modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; text-align: left;white-space: normal;}
#modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:2px 10px; display: inline-block; border-radius:3px;}
#modules_list_container_tab .row-actions-module {float: right;}
#modules_list_container_tab .setup.non-install { background-color:#ec7000;}
#modules_list_container_tab .setup.must-have { background-color: #ec7000;}
@@ -545,9 +556,16 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
#modules_list_container_tab ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
.default_modules_list_display_type #modules_list_container_content li table tr td{border: none}
.default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 115px}
.default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 140px;width: 100%;margin-bottom:15px}
#modules_list_container_tab ul li {margin:5px;height:140px}
/******** ie7 ******/
.ie7 #modules_list_container_tab #modules_list_container_content li{zoom:1;display:inline;}
.ie7 #modules_list_container_content li table {width: 21%;}
.ie7 #modules_list_container_content li table td .btn_right{width:100%;float:right;}
.ie7 #modules_list_container_content li table td .btn_right select{float:left;}
.ie7 #modules_list_container_content li table td a.button{display:block;float:right;}
/*MODULE POSITION*/
.blocLiveEdit { float:right; clear:right; background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block; width:250px;}
.blocLiveEdit h2 { background: transparent url('../img/live_edit.png') no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;}
@@ -636,4 +654,3 @@ ul.listForm li {padding-bottom:3px;}
background: linear-gradient(top, #ddd, #aaa);
color: #666
}
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+2 -2
View File
@@ -77,7 +77,7 @@
<div class="info-customer-right">
<div style="float: right">
<a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}">
<a href="{$current}&updatecustomer&id_customer={$customer->id}&token={$token}">
<img src="../img/admin/edit.gif" />
</a>
</div>
@@ -154,7 +154,7 @@
<h2>
{l s='Groups'} ({count($groups)})
<a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}">
<a href="{$current}&updatecustomer&id_customer={$customer->id}&token={$token}">
<img src="../img/admin/edit.gif" />
</a>
</h2>
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
+51 -50
View File
@@ -25,57 +25,58 @@
*}
<tr class="{$class_row}">
<td>
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="60" valign="top" width="75">
<img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}">
</td>
<td height="60" width="220" valign="top">
<div class="moduleDesc" id="anchor{$module->name|ucfirst}">
<h3>{$module->displayName|truncate:40:'…'} {$module->version}
</h3>
<p class="desc">
{if isset($module->description) && $module->description ne ''}
{$module->description|truncate:100:'…'}
<td>
<table border="0" cellpadding="0" cellspacing="5">
<tr>
<td height="60" valign="top" width="75" align="center">
<img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}">
</td>
<td height="60" width="100" valign="top">
<div class="moduleDesc" id="anchor{$module->name|ucfirst}">
<h3>{$module->displayName|truncate:40:'…'} {$module->version}
</h3>
<p class="desc">
{if isset($module->description) && $module->description ne ''}
{$module->description|truncate:100:'…'}
{else}
&nbsp;
{/if}
</p>
</div>
</td>
</tr>
<tr>
<td border="0" height="20" width="75" align="left" valign="bottom">
{if isset($module->id) && $module->id gt 0 }
{if $module->active}
<span class="setup">{l s='Enabled'}</span>
{else}
&nbsp;
<span class="setup off">{l s='Disabled'}</span>
{/if}
</p>
</div>
</td>
</tr>
<tr>
<td border="0" height="20" width="75" style="text-align:center" valign="bottom">
{if isset($module->id) && $module->id gt 0 }
{if $module->active}
<span class="setup">{l s='Enabled'}</span>
{else}
<span class="setup off">{l s='Disabled'}</span>
{if isset($module->type) && $module->type == 'addonsMustHave'}
<span class="setup must-have">{l s='Must Have'}</span>
{else}
<span class="setup off">{l s='Not installed'}</span>
{/if}
{/if}
{else}
{if isset($module->type) && $module->type == 'addonsMustHave'}
<span class="setup must-have">{l s='Must Have'}</span>
{else}
<span class="setup off">{l s='Not installed'}</span>
{/if}
{/if}
</td>
<td class="tab_modules_actions_row" height="20" border="0" width="220" valign="bottom">
<div style="float:right">
{if isset($module->type) && $module->type == 'addonsMustHave'}
<a href="{$module->addons_buy_url}" target="_blank" class="button updated">
<span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{displayPrice price=$module->price currency=$module->id_currency}</span></a>
{else if !isset($module->not_on_disk)}
{$module->optionsHtml}
<a href="#" class="button action_tab_module" data-option="select_{$module->name}" class="button">Valider</a>
{else}
<a href="{$module->options.install_url}" class="button action_tab_module">{l s='Install'}</a>
{/if}
</div>
</td>
</tr>
</table>
</td>
</td>
<td class="tab_modules_actions_row" height="20" border="0" valign="bottom" align="right">
<div class="btn_right">
{if isset($module->type) && $module->type == 'addonsMustHave'}
<a href="{$module->addons_buy_url}" target="_blank" class="button updated">
<span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{displayPrice price=$module->price currency=$module->id_currency}</span></a>
{else if !isset($module->not_on_disk)}
{$module->optionsHtml}
<a href="#" class="button action_tab_module" data-option="select_{$module->name}" class="button">Valider</a>
{else}
<a href="{$module->options.install_url}" class="button action_tab_module">{l s='Install'}</a>
{/if}
</div>
</td>
</tr>
</table>
</td>
</tr>
admin-dev/themes/default/template/helpers/modules_list/list.tpl
+12 -6
View File
@@ -25,13 +25,19 @@
<h2 style="margin-top:0">{l s='Modules list'}</h2>
<div id="modules_list_container_tab" class="default_modules_list_display_type">
<ul id="modules_list_container_content" style="list-style-type:none; padding:0; margin:0;">
<ul id="modules_list_container_content">
{if count($modules_list)}
{foreach from=$modules_list item=module}
<li style="display:block;float:left;">
{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",row alt"}}
</li>
{/foreach}
<li>
{counter start=1 assign="count"}
{foreach from=$modules_list item=module}
{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",row alt"}}
{if $count %2 == 0}
</li>
<li>
{/if}
{counter}
{/foreach}
</li>
{else}
<tr><td><b>{l s='No modules available in this section.'}</b></td></tr>
{/if}
classes/controller/FrontController.php
-16
View File
@@ -406,22 +406,6 @@ class FrontControllerCore extends Controller
}
public function postProcess()
{
/*// For retrocompatibility with versions before 1.5, preProcess support will be removed on next release
if (method_exists(get_class($this), 'preProcess'))
{
$reflection = new ReflectionClass($this);
if (!in_array($reflection->getMethod('preProcess')->class, array('FrontController', 'FrontControllerCore')))
{
Tools::displayAsDeprecated('Method preProcess() is deprecated in controllers, use method postProcess() instead');
$this->preProcess();
}
}*/
//$this->preProcess();
}
public function preProcess()
{
}
controllers/front/CompareController.php
+1 -1
View File
@@ -55,7 +55,7 @@ class CompareControllerCore extends FrontController
}
else if (Tools::getValue('action') == 'remove')
{
if (isset(self::$cookie->id_compare))
if (isset($this->context->cookie->id_compare))
CompareProduct::removeCompareProduct((int)$this->context->cookie->id_compare, (int)Tools::getValue('id_product'));
else
die('0');
controllers/front/OrderOpcController.php
+1 -1
View File
@@ -323,7 +323,7 @@ class OrderOpcControllerCore extends ParentOrderController
'genders' => Gender::getGenders(),
));
/* Call a hook to display more information on form */
self::$smarty->assign(array(
$this->context->smarty->assign(array(
'HOOK_CREATE_ACCOUNT_FORM' => Hook::exec('displayCustomerAccountForm'),
'HOOK_CREATE_ACCOUNT_TOP' => Hook::exec('displayCustomerAccountFormTop')
));
controllers/front/StoresController.php
+1 -1
View File
@@ -136,7 +136,7 @@ class StoresControllerCore extends FrontController
}
$smarty->assign('days_datas', $days_datas);
$smarty->assign('id_country', $store['id_country']);
return self::$smarty->fetch(_PS_THEME_DIR_.'store_infos.tpl');
return $this->context->smarty->fetch(_PS_THEME_DIR_.'store_infos.tpl');
}
return false;
}
themes/default/js/product.js
+8 -20
View File
@@ -303,10 +303,8 @@ function updateDisplay()
var tax = (taxRate / 100) + 1;
var display_specific_price;
if (selectedCombination.specific_price)
{
display_specific_price = selectedCombination.specific_price['price'];
if (selectedCombination['specific_price'].reduction_type == 'percentage')
{
$('#reduction_amount').hide();
@@ -322,11 +320,8 @@ function updateDisplay()
}
}
else
{
display_specific_price = product_specific_price['price'];
if (product_specific_price['reduction_type'] == 'percentage')
$('#reduction_percent_display').html(product_specific_price['specific_price'].reduction_percent);
}
if (product_specific_price['reduction_type'] != '' || selectedCombination['specific_price'].reduction_type != '')
$('#discount_reduced_price,#old_price').show();
@@ -337,28 +332,21 @@ function updateDisplay()
$('#reduction_percent').show();
else
$('#reduction_percent').hide();
if (display_specific_price)
if (product_specific_price['price'] || selectedCombination.specific_price['price'])
$('#not_impacted_by_discount').show();
else
$('#not_impacted_by_discount').hide();
var taxExclPrice = (display_specific_price && display_specific_price >= 0 ? (specific_currency ? display_specific_price : display_specific_price * currencyRate) : priceTaxExclWithoutGroupReduction) + selectedCombination['price'] * currencyRate;
if (display_specific_price)
productPriceWithoutReduction = priceTaxExclWithoutGroupReduction + selectedCombination['price'] * currencyRate; // Need to be global => no var
if (selectedCombination.specific_price['price'] && selectedCombination.specific_price['price'] >=0)
var taxExclPrice = (specific_currency ? selectedCombination.specific_price['price'] : selectedCombination.specific_price['price'] * currencyRate);
else
var taxExclPrice = priceTaxExclWithoutGroupReduction + (selectedCombination['price'] * currencyRate);
if (!displayPrice && !noTaxForThisProduct)
{
productPrice = taxExclPrice * tax; // Need to be global => no var
if (display_specific_price)
productPriceWithoutReduction = ps_round(productPriceWithoutReduction * tax, 2);
}
else
{
productPrice = ps_round(taxExclPrice, 2); // Need to be global => no var
if (display_specific_price)
productPriceWithoutReduction = ps_round(productPriceWithoutReduction, 2);
}
var reduction = 0;
if (selectedCombination['specific_price'].reduction_price || selectedCombination['specific_price'].reduction_percent)
@@ -375,6 +363,7 @@ function updateDisplay()
if (product_specific_price.reduction_price && (displayPrice || noTaxForThisProduct))
reduction = ps_round(reduction / tax, 6);
}
productPriceWithoutReduction = productPrice * group_reduction;
productPrice -= reduction;
@@ -385,7 +374,6 @@ function updateDisplay()
productPrice += ecotaxAmount;
productPriceWithoutReduction += ecotaxAmount;
//productPrice = ps_round(productPrice * currencyRate, 2);
var our_price = '';
if (productPrice > 0) {
our_price = formatCurrency(productPrice, currencyFormat, currencySign, currencyBlank);
@@ -727,4 +715,4 @@ function checkUrl()
window.location = url.substring(0, url.indexOf('#'));
}
}
}
}