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

// Merge -> revision 9385

Browse Source
This commit is contained in:
rMalie
2011-10-17 09:55:33 +00:00
parent e6f45e54a6
commit f1d5a3bf77
15 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminTranslations.php
+2 -1
View File
@@ -1488,6 +1488,7 @@ class AdminTranslations extends AdminTab
_PS_ROOT_DIR_.'/controllers',
_PS_ROOT_DIR_.'/classes',
_PS_ADMIN_DIR_.'/tabs',
PS_ADMIN_DIR,
);
$arr_files_to_parse = array_merge($arr_files_to_parse, $modules_has_mails);
foreach ($arr_files_to_parse as $path) {
@@ -1612,7 +1613,7 @@ class AdminTranslations extends AdminTab
if ($tab2 && isset($tab2[1]))
{
$tab2[1] = trim(str_replace('\'', '', $tab2[1]));
if (preg_match('/Mail::l\(\''._PS_TRANS_PATTERN_.'\'/s', $tab2[2], $tab3))
if (preg_match('/Mail::l\(\''._PS_TRANS_PATTERN_.'\'(\)|,)/s', $tab2[2], $tab3))
$tab2[2] = $tab3[1];
$subject_mail[$tab2[1]] = $tab2[2];
}
modules/authorizeaim/validation.php
+2 -2
View File
@@ -42,8 +42,8 @@ foreach ($_POST AS $key => $value)
$postString .= $key.'='.urlencode($value).'&';
$postString .= 'x_exp_date='.str_pad($_POST["x_exp_date_m"], 2, "0",STR_PAD_LEFT).$_POST["x_exp_date_y"];
if (Tools::getValue('x_test_request'))
$postString .= 'Test_Mode=1';
if (Tools::getValue('AUTHORIZE_AIM_DEMO'))
$postString .= 'Test_Mode=TRUE';
/* Do the CURL request ro Authorize.net */
$request = curl_init('https://secure.authorize.net/gateway/transact.dll');
modules/blockcategories/blockcategories.php
+17 -2
View File
@@ -85,6 +85,9 @@ class BlockCategories extends Module
Configuration::updateValue('BLOCK_CATEG_MAX_DEPTH', (int)($maxDepth));
Configuration::updateValue('BLOCK_CATEG_DHTML', (int)($dhtml));
Configuration::updateValue('BLOCK_CATEG_NBR_COLUMN_FOOTER', $nbrColumns);
Configuration::updateValue('BLOCK_CATEG_SORT_WAY', Tools::getValue('BLOCK_CATEG_SORT_WAY'));
Configuration::updateValue('BLOCK_CATEG_SORT', Tools::getValue('BLOCK_CATEG_SORT'));
$this->_clearBlockcategoriesCache();
$output .= '<div class="conf confirm"><img src="../img/admin/ok.gif" alt="'.$this->l('Confirmation').'" />'.$this->l('Settings updated').'</div>';
}
@@ -112,6 +115,18 @@ class BlockCategories extends Module
<label class="t" for="dhtml_off"> <img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" /></label>
<p class="clear">'.$this->l('Activate dynamic (animated) mode for sublevels').'</p>
</div>
<label>'.$this->l('Sort').'</label>
<div class="margin-form">
<input type="radio" name="BLOCK_CATEG_SORT" id="sort_on" value="0" '.(!Tools::getValue('BLOCK_CATEG_SORT', Configuration::get('BLOCK_CATEG_SORT')) ? 'checked="checked" ' : '').'/>
<label class="t" for="sort_on"> <img src="../modules/'.$this->name.'/sort_number.png" alt="'.$this->l('Enabled').'" title="'.$this->l('By position').'" />'.$this->l('By position').'</label>
<input type="radio" name="BLOCK_CATEG_SORT" id="sort_off" value="1" '.(Tools::getValue('BLOCK_CATEG_SORT', Configuration::get('BLOCK_CATEG_SORT')) ? 'checked="checked" ' : '').'/>
<label class="t" for="sort_off"> <img src="../modules/'.$this->name.'/sort_alphabet.png" alt="'.$this->l('Disabled').'" title="'.$this->l('By name').'" />'.$this->l('By name').'</label> -
<select name="BLOCK_CATEG_SORT_WAY">
<option value="0" '.(!Tools::getValue('BLOCK_CATEG_SORT_WAY', Configuration::get('BLOCK_CATEG_SORT_WAY')) ? 'selected="selected" ' : '').'>'.$this->l('Ascending').'</option>
<option value="1" '.(Tools::getValue('BLOCK_CATEG_SORT_WAY', Configuration::get('BLOCK_CATEG_SORT_WAY')) ? 'selected="selected" ' : '').'>'.$this->l('Descending').'</option>
</select>
</div>
<label>'.$this->l('Footer columns number').'</label>
<div class="margin-form">
<input type="text" name="nbrColumns" value="'.Configuration::get('BLOCK_CATEG_NBR_COLUMN_FOOTER').'" />
@@ -165,7 +180,7 @@ class BlockCategories extends Module
'.((int)($maxdepth) != 0 ? ' AND `level_depth` <= '.(int)($maxdepth) : '').'
AND cg.`id_group` IN ('.pSQL($groups).')
GROUP BY id_category
ORDER BY `level_depth` ASC, c.`position` ASC')
ORDER BY `level_depth` ASC, '.(Configuration::get('BLOCK_CATEG_SORT') ? 'cl.`name`' : 'c.`position`').' '.(Configuration::get('BLOCK_CATEG_SORT_WAY') ? 'DESC' : 'ASC'))
)
return;
@@ -237,7 +252,7 @@ class BlockCategories extends Module
WHERE (c.`active` = 1 OR c.`id_category` = 1)
'.((int)($maxdepth) != 0 ? ' AND `level_depth` <= '.(int)($maxdepth) : '').'
AND cg.`id_group` IN ('.pSQL($groups).')
ORDER BY `level_depth` ASC, c.`position` ASC')
ORDER BY `level_depth` ASC, '.(Configuration::get('BLOCK_CATEG_SORT') ? 'cl.`name`' : 'c.`position`').' '.(Configuration::get('BLOCK_CATEG_SORT_WAY') ? 'DESC' : 'ASC'))
)
return;
$resultParents = array();
modules/blockcategories/fr.php
+5
View File
@@ -15,6 +15,11 @@ $_MODULE['<{blockcategories}prestashop>blockcategories_971fd8cc345d8bd9f92e9f7d8
$_MODULE['<{blockcategories}prestashop>blockcategories_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
$_MODULE['<{blockcategories}prestashop>blockcategories_b9f5c797ebbf55adccdd8539a65a0241'] = 'Desactivé';
$_MODULE['<{blockcategories}prestashop>blockcategories_2c1199ee18b344152f35ec237acb5796'] = 'Activer l\'arbre dynamique (animé)';
$_MODULE['<{blockcategories}prestashop>blockcategories_6b46ae48421828d9973deec5fa9aa0c3'] = 'Trier';
$_MODULE['<{blockcategories}prestashop>blockcategories_883f0bd41a4fcee55680446ce7bec0d9'] = 'par position';
$_MODULE['<{blockcategories}prestashop>blockcategories_54e4f98fb34254a6678f0795476811ed'] = 'par nom';
$_MODULE['<{blockcategories}prestashop>blockcategories_cf3fb1ff52ea1eed3347ac5401ee7f0c'] = 'croissant';
$_MODULE['<{blockcategories}prestashop>blockcategories_e3cf5ac19407b1a62c6fccaff675a53b'] = 'décroissant';
$_MODULE['<{blockcategories}prestashop>blockcategories_4f32360218e145e3ba681a2343015eb3'] = 'Nombre de colonnes pour le footer';
$_MODULE['<{blockcategories}prestashop>blockcategories_3d81ca758785a8528208613752ad2c81'] = 'Détermine le nombre de colonne pour le footer';
$_MODULE['<{blockcategories}prestashop>blockcategories_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
modules/blockcategories/sort_alphabet.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 588 B

modules/blockcategories/sort_number.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 431 B

modules/blockrss/blockrss.php
+1 -1
View File
@@ -79,7 +79,7 @@ class Blockrss extends Module
elseif (stristr($urlfeed, $_SERVER['HTTP_HOST'].__PS_BASE_URI__))
$errors[] = $this->l('You have selected a feed URL on your own website. Please choose another URL');
elseif (!($contents = @file_get_contents($urlfeed)))
$errors[] = $this->l('Feed is unreacheable, check your URL');
$errors[] = $this->l('Feed is unreachable, check your URL');
/* Even if the feed was reachable, We need to make sure that the feed is well formated */
else
{
modules/blockrss/fr.php
+1 -1
View File
@@ -9,7 +9,7 @@ $_MODULE['<{blockrss}prestashop>blockrss_6706b6d8ba45cc4f0eda0506ba1dc3c8'] = 'U
$_MODULE['<{blockrss}prestashop>blockrss_36ed65ce17306e812fd68d9f634c0c57'] = 'Titre invalide';
$_MODULE['<{blockrss}prestashop>blockrss_1b3d34e25aef32a3c8daddfff856577f'] = 'Nombre de flux invalide';
$_MODULE['<{blockrss}prestashop>blockrss_e423bd72f5aa1be13216c5abbd3deb45'] = 'Vous avez choisi le flux RSS de votre site. Veuillez choisir une autre URL';
$_MODULE['<{blockrss}prestashop>blockrss_7a82db9ac04c55697040556e5cc9dc7c'] = 'Flux introuvable, vérifez votre URL';
$_MODULE['<{blockrss}prestashop>blockrss_bef637cd0e222a8b56676cb64ce75258'] = 'Le flux est inaccessible, vérifiez votre URL';
$_MODULE['<{blockrss}prestashop>blockrss_1844ef1bfaa030dc8423c4645a43525c'] = 'Flux invalide :';
$_MODULE['<{blockrss}prestashop>blockrss_c888438d14855d7d96a2724ee9c306bd'] = 'Paramètres mis à jour';
$_MODULE['<{blockrss}prestashop>blockrss_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres';
modules/importerosc/importerosc.php
+8 -4
View File
@@ -115,7 +115,11 @@ class importerosc extends ImportModule
public function getLangagues($limit = 0, $nrb_import = 100)
{
$identifier = 'id_lang';
$langagues = $this->executeS('SELECT languages_id as id_lang, name as name, code as iso_code, 1 as active FROM `'.bqSQL($this->prefix).'languages` LIMIT '.(int)($limit).' , '.(int)$nrb_import);
$langagues = $this->ExecuteS('
SELECT languages_id as id_lang, name as name, code as iso_code, 1 as active, (\'m/j/Y\') as date_format_lite, (\'m/j/Y H:i:s\') as date_format_full
FROM `'.bqSQL($this->prefix).'languages`
LIMIT '.(int)$limit.' , '.(int)$nrb_import);
return $this->autoFormat($langagues, $identifier);
}
@@ -218,7 +222,7 @@ class importerosc extends ImportModule
$categories = $this->executeS('
SELECT c.categories_id as id_category, c.parent_id as id_parent, 0 as level_depth, cd.language_id as id_lang, cd.categories_name as name , 1 as active, categories_image as images
FROM `'.bqSQL($this->prefix).'categories` c
FROM `'.bqSQL($this->prefix).'categories` c
LEFT JOIN `'.bqSQL($this->prefix).'categories_description` cd ON (c.categories_id = cd.categories_id)
WHERE cd.categories_name IS NOT NULL AND cd.language_id IS NOT NULL
ORDER BY c.categories_id, cd.language_id
@@ -238,7 +242,7 @@ class importerosc extends ImportModule
$identifier = 'id_attribute_group';
$countries = $this->executeS('
SELECT products_options_id as id_attribute_group, products_options_name as name , products_options_name as public_name, language_id as id_lang, 0 as is_color_group
FROM `'.bqSQL($this->prefix).'products_options`
FROM `'.bqSQL($this->prefix).'products_options`
LIMIT '.(int)($limit).' , '.(int)$nrb_import);
return $this->autoFormat($countries, $identifier, $keyLanguage, $multiLangFields);
}
@@ -267,7 +271,7 @@ class importerosc extends ImportModule
pd.products_description as description, CONCAT(\''.pSQL(Tools::getProtocol()).pSQL(Tools::getValue('shop_url')).'\/images/\',p.`products_image`) as images,
(SELECT ptc.categories_id FROM `'.bqSQL($this->prefix).'products_to_categories` ptc WHERE ptc.`products_id` = p.`products_id` LIMIT 1) as id_category_default,
p.`products_date_added` as date_add
FROM `'.bqSQL($this->prefix).'products` p
FROM `'.bqSQL($this->prefix).'products` p
LEFT JOIN `'.bqSQL($this->prefix).'products_description` pd ON (p.products_id = pd.products_id)
WHERE pd.products_name IS NOT NULL AND pd.language_id IS NOT NULL
LIMIT '.(int)($limit).' , '.(int)$nrb_import);
modules/moneybookers/de.php
+1 -1
View File
@@ -60,7 +60,7 @@ $_MODULE['<{moneybookers}prestashop>moneybookers_bd8df5ae85f76ba759fa979ada8566e
$_MODULE['<{moneybookers}prestashop>moneybookers_558b256c79bbcf473cc7347ec1ca9d54'] = 'Ihr Konto bestätigen ';
$_MODULE['<{moneybookers}prestashop>moneybookers_71b5b9efebe9c2f73fad6dd1849b4312'] = 'Mein Konto bestätigen';
$_MODULE['<{moneybookers}prestashop>moneybookers_ece6bf0de28bb0442df6e3a1fd7657d4'] = 'Wenn Sie Hilfe benötigen, lesen Sie das Aktivierungshandbuch';
$_MODULE['<{moneybookers}prestashop>moneybookers_4d8e842055eff4180273c00c3c6dbb51'] = 'Sie können Moneybookers paiement mit dem Test-Account testaccount2@moneybookers.com und das geheime Wort MBTest testen.';
$_MODULE['<{moneybookers}prestashop>moneybookers_32e70e9f3def9ebdcdbc872b739b919f'] = 'Sie können Moneybookers paiement mit dem Test-Account testaccount2@moneybookers.com und das geheime Wort MBTest testen.';
$_MODULE['<{moneybookers}prestashop>moneybookers_f5944cfc42cfb20119407c59a97bd9d1'] = 'Vorsicht, dies ist nur ein Test-Account: Sie erhalten keine Geld, wenn Sie diesen Test-Account auf Ihrem Shop zu nutzen. So empfangen Sie Geld, müssen Sie den Login und das Passwort Ihrer persönlichen Moneybookers-Konto zu verwenden!';
$_MODULE['<{moneybookers}prestashop>moneybookers_0b65457508cf73c9ed8c96f56b8910ce'] = 'Kennwortbestätigung';
$_MODULE['<{moneybookers}prestashop>moneybookers_e44efbda9396a5641d730f0ac4866e52'] = 'Ihr Kennwort wurde aktiviert';
modules/moneybookers/fr.php
+1 -1
View File
@@ -59,7 +59,7 @@ $_MODULE['<{moneybookers}prestashop>moneybookers_bd8df5ae85f76ba759fa979ada8566e
$_MODULE['<{moneybookers}prestashop>moneybookers_558b256c79bbcf473cc7347ec1ca9d54'] = 'votre compte Moneybookers';
$_MODULE['<{moneybookers}prestashop>moneybookers_71b5b9efebe9c2f73fad6dd1849b4312'] = 'Valider mon compte';
$_MODULE['<{moneybookers}prestashop>moneybookers_ece6bf0de28bb0442df6e3a1fd7657d4'] = 'Si vous avez besoin d\'aide, lisez le manuel d\'activation';
$_MODULE['<{moneybookers}prestashop>moneybookers_4d8e842055eff4180273c00c3c6dbb51'] = 'Vous pouvez tester le paiement Moneybookers avec le compte testaccount2@moneybookers.com et le mot secret mbtest.';
$_MODULE['<{moneybookers}prestashop>moneybookers_32e70e9f3def9ebdcdbc872b739b919f'] = 'Vous pouvez tester le paiement Moneybookers avec le compte testaccount2@moneybookers.com et le mot secret mbtest.';
$_MODULE['<{moneybookers}prestashop>moneybookers_f5944cfc42cfb20119407c59a97bd9d1'] = 'Attention, ceci est juste un compte test : vous ne recevrez pas d’argent si vous utilisez ce compte sur votre boutique. Pour recevoir de l’argent, il faut utiliser le login et mot secret de votre compte Moneybookers ! »';
$_MODULE['<{moneybookers}prestashop>moneybookers_0b65457508cf73c9ed8c96f56b8910ce'] = 'Validation de votre mot secret';
$_MODULE['<{moneybookers}prestashop>moneybookers_e44efbda9396a5641d730f0ac4866e52'] = 'Votre mot secret a bien été validé';
modules/moneybookers/it.php
+1 -1
View File
@@ -60,7 +60,7 @@ $_MODULE['<{moneybookers}prestashop>moneybookers_bd8df5ae85f76ba759fa979ada8566e
$_MODULE['<{moneybookers}prestashop>moneybookers_558b256c79bbcf473cc7347ec1ca9d54'] = 'convalidare il tuo account';
$_MODULE['<{moneybookers}prestashop>moneybookers_71b5b9efebe9c2f73fad6dd1849b4312'] = 'Convalida il mio account';
$_MODULE['<{moneybookers}prestashop>moneybookers_ece6bf0de28bb0442df6e3a1fd7657d4'] = 'Se hai bisogno di aiuto, leggi il manuale di attivazione';
$_MODULE['<{moneybookers}prestashop>moneybookers_4d8e842055eff4180273c00c3c6dbb51'] = 'È possibile verificare paiement Moneybookers con il test e il conto testaccount2@moneybookers.com mbtest parola segreta.';
$_MODULE['<{moneybookers}prestashop>moneybookers_32e70e9f3def9ebdcdbc872b739b919f'] = 'È possibile verificare paiement Moneybookers con il test e il conto testaccount2@moneybookers.com mbtest parola segreta.';
$_MODULE['<{moneybookers}prestashop>moneybookers_f5944cfc42cfb20119407c59a97bd9d1'] = 'Attenzione, questo è solo un account di prova: non riceverete denaro se si utilizza questo account di prova sul tuo negozio. Per ricevere i soldi, devi usare il login e password del tuo conto personale Moneybookers!';
$_MODULE['<{moneybookers}prestashop>moneybookers_0b65457508cf73c9ed8c96f56b8910ce'] = 'Convalida parola segreta';
$_MODULE['<{moneybookers}prestashop>moneybookers_e44efbda9396a5641d730f0ac4866e52'] = 'La tua parola segreta è stata attivata';
modules/moneybookers/moneybookers.php
+1 -1
View File
@@ -456,7 +456,7 @@ class MoneyBookers extends PaymentModule
<input type="submit" name="SubmitValidation" class="button" value="'.$this->l('Validate my account').'" /></p>
<p style="font-size: 14px;"><a href="'.$manual_links[$iso_manual].'" target="_blank"><img src="../img/admin/pdf.gif" alt="" /></a><a href="'.$manual_links[$iso_manual].'" target="_blank"><b>'.$this->l('For help, refer to the activation manual.').'</b></a></p>
<p style="font-size: 12px;">
'.$this->l('You can test Moneybookers paiement with the test account testaccount2@moneybookers.com and the secret word mbtest.').'<br />
'.$this->l('You can test Moneybookers payment with the test account testaccount2@moneybookers.com and the secret word mbtest.').'<br />
'.$this->l('Beware, this is only a test account: you will not receive money if you use this test account on your shop. To receive money, you have to use the login and password of your personal Moneybookers account !').'
</p>
</fieldset>
modules/shopimporter/shopimporter.php
+10 -1
View File
@@ -729,7 +729,7 @@ class shopimporter extends ImportModule
foreach($item['order_products'] as $k => $order_products)
{
foreach($order_products as $key => $val)
if (array_key_exists($key, $foreignKey) OR $key == 'product_id')
if (array_key_exists($key, $foreignKey) || $key == 'product_id')
//patch to correct a mistake naming column in the database
if ($key == 'product_id')
$item['order_products'][$k]['product_id'] = $foreignKey['id_product'][$val];
@@ -1449,6 +1449,15 @@ class shopimporter extends ImportModule
$order->total_paid_real = (float)$item['total_paid_real'];
$order->invoice_date = '0000-00-00 00:00:00';
$order->delivery_date = '0000-00-00 00:00:00';
if(array_key_exists('date_add', $item))
$order->date_add = $item['date_add'];
if(array_key_exists('date_upd', $item))
$order->date_upd = $item['date_upd'];
//test valid paid
if($item['total_paid'] == $item['total_paid_real'])
$order->valid = 1;
else
$order->valid = 0;
$order->save(false, false);
$this->saveMatchId('order', (int)$order->id, (int)$item['id_cart']);
themes/prestashop/authentication.tpl
+1 -1
View File
@@ -140,7 +140,7 @@ $(function(){ldelim}
<div id="opc_account_form" style="display: block; ">
<!-- Account -->
<p class="required text">
<label for="email">{l s='E-mail address'}</label>
<label for="guest_email">{l s='E-mail address'}</label>
<input type="text" class="text" id="guest_email" name="guest_email" value="{if isset($smarty.post.guest_email)}{$smarty.post.guest_email}{/if}">
<sup>*</sup>
</p>