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

// Merge -> revision 7979

Browse Source
This commit is contained in:
rMalie
2011-08-10 08:36:17 +00:00
parent 894ee5e00b
commit 792ce71cd4
26 changed files with 262 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/ajax.php
+8
View File
@@ -662,6 +662,14 @@ if (Tools::isSubmit('getAdminHomeElement'))
$result['partner_preactivation'] = 'NOK';
}
// PREACTIVATION PAYPAL WARNING
$content = @file_get_contents('https://www.prestashop.com/partner/preactivation/preactivation-warnings.php?version=1.0&partner=paypal&iso_country='.Tools::strtolower(Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT'))).'&iso_lang='.Tools::strtolower(Language::getIsoById(intval($cookie->id_lang))).'&id_lang='.(int)$cookie->id_lang.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context);
$content = explode('|', $content);
if ($content[0] == 'OK')
Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', $content[1]);
else
Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', '');
// DISCOVER PRESTASHOP
$content = @file_get_contents($protocol.'://www.prestashop.com/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)$cookie->id_lang, false, $stream_context);
if (!$content)
admin-dev/header.inc.php
+6 -5
View File
@@ -117,12 +117,13 @@ foreach (QuickAccess::getQuickAccesses((int)($cookie->id_lang)) AS $quick)
echo ' </select>
</div>';
if (Shop::isMultiShopActivated())
echo '<div id="header_shoplist">'.translate('Select your shop:').' '.generateShopList().'</div>';
if (Shop::isMultiShopActivated())
echo '<div id="header_shoplist">'.translate('Select your shop:').' '.generateShopList().'</div>';
echo '<div class="flatclear">&nbsp;</div>';
echo Module::hookExec('backOfficeTop');
echo '<ul id="menu">';
echo ' <div class="flatclear">&nbsp;</div>
'.Module::hookExec('backOfficeTop').'
<ul id="menu">';
if (empty($tab))
echo '<div class="mainsubtablist" style="display:none"></div>';
admin-dev/searchcron.php
+1
View File
@@ -32,5 +32,6 @@ if (substr(_COOKIE_KEY_, 34, 8) != Tools::getValue('token'))
ini_set('max_execution_time', 7200);
Search::indexation(Tools::getValue('full'));
if (Tools::getValue('redirect'))
Tools::redirectAdmin($_SERVER['HTTP_REFERER'].'&conf=4');
admin-dev/tabs/AdminCurrencies.php
+1 -1
View File
@@ -148,7 +148,7 @@ class AdminCurrencies extends AdminTab
<fieldset>
<legend><img src="../img/admin/tab-tools.gif" />'.$this->l('Currency rates update').'</legend>
<p>'.$this->l('Place this URL in crontab or call it manually daily').':<br />
<b>'.Tools::getShopDomain(true, true).__PS_BASE_URI__.$adminDir.DIRECTORY_SEPARATOR.'cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'</b></p>
<b>'.Tools::getShopDomain(true, true). __PS_BASE_URI__.$adminDir.'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'</b></p>
</fieldset>';
}
admin-dev/tabs/AdminGroups.php
+1 -1
View File
@@ -343,7 +343,7 @@ class AdminGroups extends AdminTab
$groupReduction = new GroupReduction((int)($id_group_reductions[$key]));
$groupReduction->reduction = $reductions[$key] / 100;
if (!$groupReduction->update())
$this->errors[] = Tools::displayError('Cannot update group reductions');
$this->_errors[] = Tools::displayError('Cannot update group reductions');
}
if (!sizeof($this->_errors))
parent::postProcess();
admin-dev/tabs/AdminImport.php
+1 -1
View File
@@ -957,7 +957,7 @@ class AdminImport extends AdminTab
break;
}
if (!$id_image)
$this->_warnings[] = Tools::displayError('No image found for combination with id_product = '.$product->id.' and image position = '.(int)$info['image_position'].'.');
$this->_warnings[] = sprintf(Tools::displayError('No image found for combination with id_product = %s and image position = %s.'), $product->id, (int)$info['image_position']);
}
$id_product_attribute = $product->addProductAttribute((float)($info['price']), (float)($info['weight']), 0, (float)($info['ecotax']), (int)($info['quantity']), $id_image, strval($info['reference']), strval($info['supplier_reference']), strval($info['ean13']), (int)($info['default_on']), strval($info['upc']));
admin-dev/tabs/AdminProducts.php
+1
View File
@@ -287,6 +287,7 @@ class AdminProducts extends AdminTab
if ($product->add()
AND Category::duplicateProductCategories($id_product_old, $product->id)
AND ($combinationImages = Product::duplicateAttributes($id_product_old, $product->id)) !== false
AND GroupReduction::duplicateReduction($id_product_old, $product->id)
AND Product::duplicateAccessories($id_product_old, $product->id)
AND Product::duplicateFeatures($id_product_old, $product->id)
AND Product::duplicateSpecificPrices($id_product_old, $product->id)
admin-dev/tabs/AdminSearchConf.php
+2 -2
View File
@@ -84,8 +84,8 @@ class AdminSearchConf extends AdminPreferences
'.$this->l('Indexed products:').' <b>'.(int)($indexed).' / '.(int)($total).'</b>.
</p>
<p>'.$this->l('Building the product index can take a few minutes or more. If your server stop the process before it ends, you can resume the indexation by clicking "Add missing products".').'</p>
-&gt; <a href="searchcron.php?token='.substr(_COOKIE_KEY_, 34, 8).'" class="bold">'.$this->l('Add missing products to index.').'</a><br />
-&gt; <a href="searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8).'" class="bold">'.$this->l('Re-build entire index.').'</a><br /><br />
-&gt; <a href="searchcron.php?token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="bold">'.$this->l('Add missing products to index.').'</a><br />
-&gt; <a href="searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="bold">'.$this->l('Re-build entire index.').'</a><br /><br />
'.$this->l('You can set a cron job that will re-build your index using the following URL:').' <a href="'.$cronUrl.'">'.$cronUrl.'</a>.
</fieldset>
<div class="clear">&nbsp;</div>';