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

//fix for 1.5.2.0

Browse Source
This commit is contained in:
vAugagneur
2012-10-22 12:41:28 +00:00
parent f38ef7b915
commit fc94b42d7d
20 changed files with 266 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcart/blockcart.tpl
+5 -2
View File
@@ -30,14 +30,17 @@
{if $ajax_allowed}
<script type="text/javascript">
var CUSTOMIZE_TEXTFIELD = {$CUSTOMIZE_TEXTFIELD};
var img_dir = '{$img_dir}';
</script>
{/if}
<script type="text/javascript">
var customizationIdMessage = '{l s='Customization #' mod='blockcart' js=1}';
var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' js=1}';
var freeShippingTranslation = '{l s='Free shipping!' mod='blockcart' js=1}';
var freeProductTranslation = '{l s='Free!' mod='blockcart' js=1}';
var delete_txt = '{l s='Delete' mod='blockcart'}';
var img_dir = '{$img_dir}';
</script>
{/if}
<!-- MODULE Block cart -->
<div id="cart_block" class="block exclusive">
modules/blocklayered/blocklayered.php
+4 -4
View File
@@ -1380,14 +1380,14 @@ class BlockLayered extends Module
public function hookCategoryDeletion($params)
{
$layered_filter_list = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('SELECT * FROM '._DB_PREFIX_.'layered_filter');
$layered_filter_list = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT * FROM '._DB_PREFIX_.'layered_filter');
foreach ($layered_filter_list as $layered_filter)
{
$data = self::unSerialize($layered_filter_list['filters']);
$data = self::unSerialize($layered_filter['filters']);
if (in_array((int)$params['category']->id, $data['categories']))
{
unset($data['categories'][array_search((int)$params['category']->id, $data['categories'])]);
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'layered_filter` SET `filters` = \''.pSQL(serialize($data)).'\'');
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'layered_filter` SET `filters` = \''.pSQL(serialize($data)).'\' WHERE `id_layered_filter` = '.(int)$layered_filter['id_layered_filter'].'');
}
}
$this->buildLayeredCategories();
@@ -3959,7 +3959,7 @@ class BlockLayered extends Module
`filter_show_limit` int(10) UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (`id_layered_category`),
KEY `id_category` (`id_category`,`type`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;'); /* MyISAM + latin1 = Smaller/faster */
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;'); /* MyISAM + latin1 = Smaller/faster */
Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'layered_filter` (
modules/carriercompare/template/carriercompare.tpl
+4 -4
View File
@@ -35,9 +35,9 @@
var currencyBlank = '{$currencyBlank|intval}';
var id_carrier = '{$id_carrier|intval}';
var id_state = '{$id_state|intval}';
var SE_RedirectTS = "{l s='Refreshing page and updating cart…' mod='carriercompare'}";
var SE_RefreshStateTS = "{l s='Checking available states…' mod='carriercompare'}";
var SE_RetrievingInfoTS = "{l s='Retrieving information…' mod='carriercompare'}";
var SE_RedirectTS = "{l s='Refreshing page and updating cart...' mod='carriercompare'}";
var SE_RefreshStateTS = "{l s='Checking available states...' mod='carriercompare'}";
var SE_RetrievingInfoTS = "{l s='Retrieving information...' mod='carriercompare'}";
var SE_RefreshMethod = {$refresh_method};
var txtFree = "{l s='Free!' mod='carriercompare'}";
@@ -101,7 +101,7 @@
<p class="SE_SubmitRefreshCard">
<input class="exclusive_large" id="carriercompare_submit" type="submit" name="carriercompare_submit" value="{l s='Update Cart' mod='carriercompare'}"/>
<input id="update_carriers_list" type="button" class="exclusive_large" value="{l s='Update carrier list'}" />
<input id="update_carriers_list" type="button" class="exclusive_large" value="{l s='Update carrier list' mod='carriercompare'}" />
</p>
</fieldset>
</form>
modules/carriercompare/template/configuration.tpl
+8 -8
View File
@@ -1,27 +1,27 @@
{if isset($display_error)}
{if $display_error}
<div class="error">{l s='An error occured during the form validation'}</div>
<div class="error">{l s='An error occured during the form validation' mod='carriercompare'}</div>
{else}
<div class="conf">{l s='Configuration updated'}</div>
<div class="conf">{l s='Configuration updated' mod='carriercompare'}</div>
{/if}
{/if}
<form method="post" action="{$smarty.server.REQUEST_URI|escape:'htmlall':'UTF-8'}">
<fieldset>
<div class="warn">{l s='This module is only available on standard order process because on One Page Checkout the carrier list is already available'}.</div>
<legend>{l s='Global Configuration'}</legend>
<div class="warn">{l s='This module is only available on standard order process because on One Page Checkout the carrier list is already available' mod='carriercompare'}.</div>
<legend>{l s='Global Configuration' mod='carriercompare'}</legend>
<label for="refresh_method">Refresh carrier list method</label>
<div class="margin-form">
<select id="refresh_method" name="refresh_method">
<option value="0" {if $refresh_method == 0}selected{/if}>{l s='Anytime'}</option>
<option value="1" {if $refresh_method == 1}selected{/if}>{l s='Required all information set'}</option>
<option value="0" {if $refresh_method == 0}selected{/if}>{l s='Anytime' mod='carriercompare'}</option>
<option value="1" {if $refresh_method == 1}selected{/if}>{l s='Required all information set' mod='carriercompare'}</option>
</select>
<p>{l s='Set the way to refresh information for a customer'}</p>
<p>{l s='Set the way to refresh information for a customer' mod='carriercompare'}</p>
</div>
<div class="margin-form">
<input name="setGlobalConfiguration" type="submit" class="button" value="{l s='Submit'}">
<input name="setGlobalConfiguration" type="submit" class="button" value="{l s='Submit' mod='carriercompare'}">
</div>
</fieldset>
</form>