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

// merge 6001,6010,6012,6013

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6018 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-04-21 08:01:09 +00:00
parent 2430f917d5
commit 38cf360a0b
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminCarts.php
+1 -1
View File
@@ -49,7 +49,7 @@ class AdminCarts extends AdminTab
'id_cart' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'customer' => array('title' => $this->l('Customer'), 'width' => 80, 'filter_key' => 'c!lastname'),
'total' => array('title' => $this->l('Total'), 'callback' => 'getOrderTotalUsingTaxCalculationMethod', 'orderby' => false, 'search' => false, 'width' => 50, 'align' => 'right', 'prefix' => '<b>', 'suffix' => '</b>', 'currency' => true),
'carrier' => array('title' => $this->l('Carrier'), 'width' => 25, 'align' => 'center', 'callback' => 'replaceZeroByShopName'),
'carrier' => array('title' => $this->l('Carrier'), 'width' => 25, 'align' => 'center', 'callback' => 'replaceZeroByShopName', 'filter_key' => 'ca!name'),
'date_add' => array('title' => $this->l('Date'), 'width' => 90, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'));
parent::__construct();
}
admin-dev/tabs/AdminProducts.php
+2 -1
View File
@@ -3556,7 +3556,7 @@ class AdminProducts extends AdminTab
</td>
</div>
</tr>';
// param multipleSeparator:'||' ajouté à cause de bug dans lib autocomplete
echo '<script type="text/javascript">
urlToCall = null;
/* function autocomplete */
@@ -3571,6 +3571,7 @@ class AdminProducts extends AdminTab
mustMatch:true,
scroll:false,
cacheLength:0,
multipleSeparator:\'||\',
formatItem: function(item) {
return item[1]+\' - \'+item[0];
}
classes/Pack.php
+4 -3
View File
@@ -119,12 +119,13 @@ class PackCore extends Product
public static function getPacksTable($id_product, $id_lang, $full = false, $limit = NULL)
{
$packs = Db::getInstance()->getValue('
SELECT GROUP_CONCAT(a.`id_product_pack`, ",")
SELECT GROUP_CONCAT(a.`id_product_pack`)
FROM `'._DB_PREFIX_.'pack` a
WHERE a.`id_product_item` = '.(int)$id_product.')');
WHERE a.`id_product_item` = '.(int)$id_product);
if (!(int)$packs)
return array();
$sql = '
SELECT p.*, pl.*, i.`id_image`, il.`legend`, t.`rate`
FROM `'._DB_PREFIX_.'product` p
themes/prestashop/product.tpl
+5 -5
View File
@@ -320,7 +320,7 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}><label for="product_reference">{l s='Reference :'} </label><span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span></p>
<!-- quantity wanted -->
<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity == 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<label>{l s='Quantity :'}</label>
<input type="text" name="qty" id="quantity_wanted" class="text" value="{if isset($quantityBackup)}{$quantityBackup|intval}{else}{if $product->minimal_quantity > 1}{$product->minimal_quantity}{else}1{/if}{/if}" size="2" maxlength="3" {if $product->minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} />
</p>
@@ -334,10 +334,10 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
{/if}
<!-- availability -->
<p id="availability_statut"{if ($product->quantity == 0 && !$product->available_later && $allow_oosp) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<p id="availability_statut"{if ($product->quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<span id="availability_label">{l s='Availability:'}</span>
<span id="availability_value"{if $product->quantity == 0} class="warning_inline"{/if}>
{if $product->quantity == 0}{if $allow_oosp}{$product->available_later}{else}{l s='This product is no longer in stock'}{/if}{else}{$product->available_now}{/if}
<span id="availability_value"{if $product->quantity <= 0} class="warning_inline"{/if}>
{if $product->quantity <= 0}{if $allow_oosp}{$product->available_later}{else}{l s='This product is no longer in stock'}{/if}{else}{$product->available_now}{/if}
</span>
</p>
@@ -354,7 +354,7 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
{$HOOK_PRODUCT_OOS}
</p>
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity == 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>
{if $product->online_only}
<p>{l s='Online only'}</p>
themes/prestashop/products-comparison.tpl
+3 -3
View File
@@ -67,10 +67,10 @@
{/if}
<!-- availability -->
<p class="comparison_availability_statut">
{if !(($product->quantity == 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)}
{if !(($product->quantity <= 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)}
<span id="availability_label">{l s='Availability:'}</span>
<span id="availability_value"{if $product->quantity == 0} class="warning-inline"{/if}>
{if $product->quantity == 0}
<span id="availability_value"{if $product->quantity <= 0} class="warning-inline"{/if}>
{if $product->quantity <= 0}
{if $allow_oosp}
{$product->available_later|escape:'htmlall':'UTF-8'}
{else}