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:
gRoussac
2013-06-24 13:54:33 +02:00
parent 21856959a2 1d5e34cb37
commit 5562b5ac92
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/ProductSale.php
+6 -2
View File
@@ -71,7 +71,11 @@ class ProductSaleCore
$groups = FrontController::getCurrentCustomerGroups();
$sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
$interval = Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20;
$prefix = '';
if ($order_by == 'date_add')
$prefix = 'p.';
$sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity,
pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`,
pl.`meta_keywords`, pl.`meta_title`, pl.`name`,
@@ -104,7 +108,7 @@ class ProductSaleCore
WHERE cg.`id_group` '.$sql_groups.'
)
GROUP BY product_shop.id_product
ORDER BY `'.pSQL($order_by).'` '.pSQL($order_way).'
ORDER BY '.$prefix.'`'.pSQL($order_by).'` '.pSQL($order_way).'
LIMIT '.(int)($page_number * $nb_products).', '.(int)$nb_products;
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
install-dev/classes/session.php
+6 -2
View File
@@ -43,13 +43,17 @@ class InstallSession
public function __construct()
{
session_name('install_'.md5(__PS_BASE_URI__));
if (!session_start()
if (!($session_started = session_start())
|| (!isset($_SESSION['session_mode']) && (isset($_POST['submitNext']) || isset($_POST['submitPrevious']) || isset($_POST['language']))))
{
InstallSession::$_cookie_mode = true;
InstallSession::$_cookie = new Cookie('ps_install', null, time() + 7200, null, true);
}
$_SESSION['session_mode'] = 'session';
if ($session_started && !isset($_SESSION['session_mode']))
{
$_SESSION['session_mode'] = 'session';
session_write_close();
}
}
public function clean()
install-dev/theme/view.css
+8 -9
View File
@@ -43,12 +43,11 @@ a {cursor:pointer;}
width:990px;
background :#fff;
}
#header {
padding:6px 16px 16px 16px;
height:68px;/* 90 */
background:#394049;
}
#header {
padding:6px 16px 16px 16px;
height:50px;
background:#394049;
}
#loaderSpace{
display:none;
z-index: 100;
@@ -77,7 +76,7 @@ div#leftpannel{
div#sheets {
float:left;
margin-top:65px;
min-height:400px;
min-height:360px;
width:700px;
background-color:#fff;
}
@@ -93,7 +92,7 @@ div#leftpannel{
div#buttons{
clear:both;
margin:0 0 0 295px;
height:70px;
height:60px;
width:650px;
}
* html div#buttons {
@@ -407,7 +406,7 @@ ul#footer a:link, ul#footer a:active, ul#footer a:visited {
}
.sheet .contentTitle {
position:absolute;
top:90px;
top:72px;
left:0;
padding:15px 25px 10px 38px;
height:28px;/* 53 */
install-dev/theme/views/header.phtml
+9 -1
View File
@@ -39,11 +39,13 @@
<li class="lnk_forum"><a href="<?php echo $this->getSupportLink() ?>" target="_blank"><?php echo $this->l('Support') ?></a></li>
<li class="lnk_forum"><a href="<?php echo $this->getDocumentationLink() ?>" target="_blank"><?php echo $this->l('Documentation') ?></a></li>
<li class="lnk_blog last"><a href="<?php echo $this->getBlogLink() ?>" target="_blank"><?php echo $this->l('Blog') ?></a></li>
<!--
<?php if ($this->getPhone()): ?>
<li id="phone_block" class="last">
<div><span><?php echo $this->l('Contact us!') ?></span><br /><?php echo $this->getPhone() ?></div>
</li>
<?php endif; ?>
-->
</ul>
<div id="PrestaShopLogo">PrestaShop</div>
@@ -69,6 +71,12 @@
<?php endif; ?>
<?php endforeach; ?>
</ol>
<?php if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3)): ?>
<iframe scrolling="no" style="height:200px;width:160px;border:none;margin-top:20px"
src="https://api.prestashop.com/iframe/install.php?step=<?php echo $this->step ?>&lang=<?php echo $this->language->getLanguageIso() ?>&country=<?php echo $this->session->shop_country ?>">
<p><?php echo $this->l('Contact us!') ?><br /><?php echo $this->getPhone() ?></p>
</iframe>
<?php endif; ?>
</div>
<!-- Page content -->
@@ -85,5 +93,5 @@
</ul>
</div>
<noscript>
<h3 class="errorBlock" style="margin-bottom:10px"><?php echo $this->l('To install PrestaShop, you need to have JavaScript enabled in your browser.') ?></h3>
<h3 class="errorBlock" style="margin-bottom:10px"><?php echo $this->l('To install PrestaShop, you need to have JavaScript enabled in your browser.') ?> <a href="<?php echo $this->l('http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript') ?>" target="_blank"><img src="theme/img/help.png" /></a></h3>
</noscript>
install-dev/theme/views/license.phtml
+2
View File
@@ -10,9 +10,11 @@
<div>
<input type="checkbox" id="set_license" class="required" name="licence_agrement" value="1" style="vertical-align: middle;float:left" <?php if ($this->session->licence_agrement): ?>checked="checked"<?php endif; ?> />
<div style="float:left;width:600px;margin-left:8px"><label for="set_license"><strong><?php echo $this->l('I agree to the above terms and conditions.') ?></strong></label></div>
<!--
<br />
<input type="checkbox" id="configuration_agrement" name="configuration_agrement" value="1" style="vertical-align: middle;float:left" <?php if ($this->session->configuration_agrement): ?>checked="checked"<?php endif; ?> />
<div style="float:left;width:600px;margin-left:8px"><label for="configuration_agrement"><strong><?php echo $this->l('I agree to participate in improving the solution by sending anonymous information about my configuration.') ?></strong></label></div>
-->
</div>
<?php $this->displayTemplate('footer') ?>