antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-8041' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-07 17:43:19 +02:00
commit 4148656a60
7 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
adm/tabs/AdminImport.php
View File

@ -1321,10 +1321,14 @@ class AdminImport extends AdminTab
$filesToImport = scandir(dirname(__FILE__).'/../import');
uasort($filesToImport, array('AdminImport', '_usortFiles'));
foreach ($filesToImport AS $k => &$filename)
foreach ($filesToImport AS $k => &$filename) {
//exclude . .. .svn and index.php and all hidden files
if (preg_match('/^\..*|index.php/Ui', $filename))
unset($filesToImport[$k]);
// ANTADIS - evite d'importer plusieur le même fichier
if (substr($filename, 0, 3) == 'old')
unset($filesToImport[$k]);
}
unset($filename);
echo '
<div class="space">
@ -1496,6 +1500,12 @@ class AdminImport extends AdminTab
private function closeCsvFile($handle)
{
fclose($handle);
// ANTADIS - evite d'importer plusieur le même fichier
rename(
dirname(__FILE__).'/../import/'.strval(preg_replace('/\.{2,}/', '.',Tools::getValue('csv'))),
dirname(__FILE__).'/../import/old_'.strval(preg_replace('/\.{2,}/', '.',Tools::getValue('csv')))
);
}
private function generateContentTable($current_table, $nb_table, $nb_column, $handle, $glue)
@ -1772,6 +1782,7 @@ class AdminImport extends AdminTab
default:
$this->_errors[] = $this->l('no entity selected');
}
}
parent::postProcess();

15
modules/privatesales/Sale.php
View File

@ -1484,10 +1484,17 @@ class Sale {
if ($this->id_category == 1) {
return FALSE;
}
$this->enabled = FALSE;
$this->save();
Db::getInstance()->Execute('
UPDATE `'._DB_PREFIX_.'privatesale`
SET `enabled` = 0
WHERE `id_sale` = '.(int) $this->id.'
LIMIT 1
');
// $this->enabled = FALSE;
// $this->save();
$categories = Sale::flatRecurseCategory($this->id_category);
$products = $this->getProducts();

3
themes/site/lang/es.php
View File

@ -272,6 +272,8 @@ $_LANG['order-address_da9d6ec2998a07c31ec9eb93c9f254ed'] = 'Su dirección de fac
$_LANG['order-address_8a8c9edb5531fa2f822295d1830d090f'] = 'Su dirección de entrega';
$_LANG['order-address_06933067aafd48425d67bcb01bba5cb6'] = 'Actualizar';
$_LANG['order-address_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Direcciones';
$_LANG['order-address_4ce81305b7edb043d0a7a5c75cab17d0'] = 'Hay';
$_LANG['order-address_cb5e100e5a9a3e7f6d1fd97512215282'] = 'un error';
$_LANG['order-address_d0748d2df4aed77bd7591b3ac6c52c83'] = 'Elija una dirección de entrega:';
$_LANG['order-address_ec211f7c20af43e742bf2570c3cb84f9'] = 'Añadir';
$_LANG['order-address_b15e1100a6196acba01ef7aaa5b2a9e5'] = 'Añadir nueva dirección';
@ -554,6 +556,7 @@ $_LANG['product-add_to_cart_3075148ed2cb5479e9e9c1cfd8fd8be0'] = 'Cerrar ventana
$_LANG['product-add_to_cart_1b27b371c9e7d0298eab533bffae53b7'] = 'Cantidad';
$_LANG['product-add_to_cart_7255b165f0be9f2380465cd98f9f1e41'] = 'Todas las ventas';
$_LANG['product-add_to_cart_9056510ed1245d5000afd43cf2816902'] = 'Ver cesta';
$_LANG['product-add_to_cart_f507368685bf131d9a5940b2e24f2602'] = 'Recuerda que puedes añadir a tu cesta productos de las diferentes ventas y realizar así un pedido único, para pagar los gastos de envío solamente una vez';
$_LANG['product-add_to_cart_5af6614a8af23ed2fdba3b0f47b40128'] = 'Nuestras mejores ventas';
$_LANG['product-compare_97f014aa339f5b37951f100fb1a086d8'] = 'Debe elegir al menos un producto';
$_LANG['product-compare_fe22c6b5957bca5380f9cf6529fea8c5'] = 'No puede añadir más de ';

1
themes/site/lang/fr.php
View File

@ -566,6 +566,7 @@ $_LANG['product-add_to_cart_3075148ed2cb5479e9e9c1cfd8fd8be0'] = 'Fermer la fen
$_LANG['product-add_to_cart_1b27b371c9e7d0298eab533bffae53b7'] = 'Quantité';
$_LANG['product-add_to_cart_7255b165f0be9f2380465cd98f9f1e41'] = 'Toutes les ventes';
$_LANG['product-add_to_cart_9056510ed1245d5000afd43cf2816902'] = 'Voir mon panier';
$_LANG['product-add_to_cart_f507368685bf131d9a5940b2e24f2602'] = 'Commandez dans plusieurs ventes au sein du même panier et profitez de frais de port uniques';
$_LANG['product-add_to_cart_5af6614a8af23ed2fdba3b0f47b40128'] = 'Nos meilleures ventes';
$_LANG['product-compare_97f014aa339f5b37951f100fb1a086d8'] = 'Merci de choisir au moins 1 produit.';
$_LANG['product-compare_fe22c6b5957bca5380f9cf6529fea8c5'] = 'Vous ne pouvez pas ajouter plus de';

1
themes/site/modules/blockcartex/fr.php
View File

@ -2,6 +2,7 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{blockcartex}site>ajax_cart_f507368685bf131d9a5940b2e24f2602'] = 'Commandez dans plusieurs ventes au sein du même panier et profitez de frais de port uniques';
$_MODULE['<{blockcartex}site>blockcart_20351b3328c35ab617549920f5cb4939'] = 'Personnalisation ';
$_MODULE['<{blockcartex}site>blockcart_ed6e9a09a111035684bb23682561e12d'] = 'supprimer cet article du panier';
$_MODULE['<{blockcartex}site>blockcart_4b7d496eedb665d0b5f589f2f874e7cb'] = 'Détails de l\'article';

2
themes/site/modules/paypal/es.php
View File

@ -10,4 +10,4 @@ $_MODULE['<{paypal}site>express_checkout_payment_3075148ed2cb5479e9e9c1cfd8fd8be
$_MODULE['<{paypal}site>express_checkout_payment_e987971c599a2c106478fa0f3ae7f33d'] = 'Si has pasado un pedido en Bébé Boutik, nuestra web puede memorizar los datos de tu cuenta Paypal. Estos datos se grabarán en los servidores Paypal. Así, para un próximo pedido, nuestra web te propondrá usar esta cuenta y no tendrás que volver a introducir los datos manualmente. ';
$_MODULE['<{paypal}site>express_checkout_payment_5b16e231e4c246564699cca3d2d5a9da'] = 'Te informamos de que solamente Paypal tendrá acceso a tus datos, en ningún caso Bébé Boutik.';
$_MODULE['<{paypal}site>express_checkout_payment_6236894cc2defd44de4e696c9757b581'] = 'Además, en todo momento podrás ver y suprimir tus cuentas Paypal memorizadas en la página “Gestionar métodos de pago” dentro del menú “Mi cuenta”. ';
$_MODULE['<{paypal}site>express_checkout_payment_c5cf5dfb2a962d94e48a1a662ca2f7d3'] = 'Tienes cuentas Paypal guardadas que puedes usar para realizar el pago\r\n';
$_MODULE['<{paypal}site>express_checkout_payment_c5cf5dfb2a962d94e48a1a662ca2f7d3'] = 'Tienes cuentas Paypal guardadas que puedes usar para realizar el pagorn';

1
themes/site_mobile/lang/es.php
View File

@ -515,6 +515,7 @@ $_LANG['product-add_to_cart_3075148ed2cb5479e9e9c1cfd8fd8be0'] = 'Cerrar ventana
$_LANG['product-add_to_cart_1b27b371c9e7d0298eab533bffae53b7'] = 'Cantidad';
$_LANG['product-add_to_cart_7255b165f0be9f2380465cd98f9f1e41'] = 'Todas las ventas';
$_LANG['product-add_to_cart_9056510ed1245d5000afd43cf2816902'] = 'Ver cesta';
$_LANG['product-add_to_cart_f507368685bf131d9a5940b2e24f2602'] = 'Recuerda que puedes añadir a tu cesta productos de las diferentes ventas y realizar así un pedido único, para pagar los gastos de envío solamente una vez';
$_LANG['product-compare_97f014aa339f5b37951f100fb1a086d8'] = 'Debe elegir al menos un producto';
$_LANG['product-compare_fe22c6b5957bca5380f9cf6529fea8c5'] = 'No puede añadir más de ';
$_LANG['product-compare_1a3addc6c8dccf79752c39ca4a3b6423'] = 'productos en el comparador.';