diff --git a/CHANGELOG b/CHANGELOG
index f17cc860f..8b88cc093 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,261 @@ International Registred Trademark & Property of PrestaShop SA
Release Notes for PrestaShop 1.4
--------------------------------
+####################################
+# v1.4.1.0 - 6030 (2011-04-21) #
+####################################
+
+ Added Features:
+
+ [+] Installer : Adding address format table
+ [+] Installer : Thanks to Michael Bangiev for german installer translation \!
+ [+] Installer : When upgrading, you can now automatically desactivate non-native modules
+ [+] Installer : added link to the online theme validator
+
+ [+] FO : Adding address formating for stores
+
+ [+] BO : Adding address formating
+ [+] BO : Adding address formating
+ [+] BO : Adding address formating
+ [+] BO : Adding address formating
+ [+] BO : Adding address formating
+ [+] BO : Adding address formating
+ [+] BO : added methods to enable/disable one or more module by name
+ [+] BO : added static method to get non native module list in ModuleCore class
+
+ [+] CORE : allow to load interface with the autoload
+
+ [+] WS : add column in the PREFIX_webservice_account table
+
+ [+] TR : translation wording
+
+ Improved/changed features:
+
+ [*] Project : added new tinyMCE version
+ [*] Project : remove old tinyMC version
+
+ [*] INSTALLER : Can manage HTML in preactivation text
+ [*] Installer : added readme_it, readme_de, and CHANGELOG to the file-to-delete list
+
+ [*] FO : #PSCFI-1537 corrects address block error
+ [*] FO : Cached queries
+ [*] FO : Display label can desactivated + Tax & Shipping simulator
+ [*] FO : Fixed link to delete customer product picture when friendly url + canonical are activated
+ [*] FO : Using geocoding for itinerary
+ [*] FO : corrects smarty2 compliance
+ [*] FO : in category view, products for which the default combination is out of stock but other combinations are still available no longer display an 'Out of stock' message.
+ [*] FO : in product view, accessories now display a message if they are out of stock or out of the default combination.
+ [*] FO : setMedia called now only in init()
+
+ [*] BO : Adding store infos templatization
+ [*] BO : Adding store infos templatization
+ [*] BO : keeping cart status on refresh
+ [*] BO : #8341 Wording: changing depth and package spelling
+ [*] BO : #8345 Deleting unused vars
+ [*] BO : #8406 Adding method to get protocol
+ [*] BO : #8406 removing hard coded http
+ [*] BO : #8419 Adding attachment name check
+ [*] BO : #8438 corrects use of uninstanciated value
+ [*] BO : #8440 restores quantity display
+ [*] BO : #8459 filtering arrow keys
+ [*] BO : #8486 changing getProtocol
+ [*] BO : #8486 changing getProtocol
+ [*] BO : #8569 removing bad redirect & cookie path for ajaxfilemanager
+ [*] BO : #8693 Adding back to category link on add doc attachment
+ [*] BO : #PSCFI-1294 wording: corrects Pproduct
+ [*] BO : Adding market place group to AdminModules
+ [*] BO : Adding missing else case
+ [*] BO : Adding store infos templatization
+ [*] BO : Adding translate for contact, Bug tracker, forum
+ [*] BO : Corrects die error is state is used
+ [*] BO : cleaning
+ [*] BO : improve loading of home page of Back office
+ [*] BO : now admin tabs defined in module use now translation in their module directory
+ [*] BO : orders don t disappear anymore if authorized localhost client
+ [*] BO : revert: Adding missing else case
+ [*] BO : reverting
+ [*] BO : reverting wording
+ [*] BO : setting re-ordeing regexp to 99 max
+ [*] BO : unsetting var after use
+ [*] BO : updating iso state code according to ISO_3166-2
+ [*] BO : wording
+
+ [*] MO : Bug fixed #PSCFI-1370 - Adding possibility to choose calcul mode for shipping cost in USPS module
+ [*] MO : Display option for eKomi module
+ [*] MO : added weight filter - removing the restriction on cache table
+ [*] MO : improvements on carriercompare (Shipping estimation) module
+ [*] MO : themeinstallator - exported themes archives now have a random md5 filename
+
+ Fixed bugs:
+
+ [-] Project : Fixed bug #PSCFI-1208 - MODULE_DIR (relative path) should be replaced with PS_MODULE_DIR (full path)
+ [-] Project : fixed json_encode and json_decode calls
+
+ [-] INSTALLER : Bug fixed on checkbox preactivation system
+ [-] INSTALLER : Preactivation prechecked bug has been fixed
+ [-] Installer : Bug Fixed #8585 - Wrong currency for reduction inserted to ps_specific_price
+ [-] Installer : Bug Fixed #PSCFI-1266 - 1.3 price reductions not applied to all groups on 1.4 upgrade
+ [-] Installer : Fixed #PSCFI-1466 - undefined constant _PS_VERSION_ was used instead of $oldversion
+ [-] Installer : Fixed #PSCFI-1496 - var name corrected in desactivatecustommodule.php
+ [-] Installer : Fixed #PSCFI-1500 - PREFIX_ / ps_ in installer
+ [-] Installer : Fixed about-us german url rewrite
+ [-] Installer : fixed bug #8477 - German friendly URLs have uppercase letters
+ [-] Installer : fixed bug #PSCFI-1381 - svn5784 upgrade sql error and cannot complete upgrade - Cannot redeclare alter_cms_block() previously declared
+ [-] Installer : fixed bug #PSCFI-1500
+ [-] Installer : fixed bug if CMS module is not installed
+
+ [-] FO : #PSCFI-1374 Fixed a bug concerning the cart without taxes
+ [-] FO : Bug Fixed #8315 - Incorrect tax for counties
+ [-] FO : Bug Fixed #PSCFI-1459 - Problem in tax summary (tax excl + ecotax)
+ [-] FO : Bug Fixed #PSCFI-1460 - Combination + overriden EcoTax
+ [-] FO : Bug Fixed #PSCFI-1516 - Incorrect cache key in price calculation
+ [-] FO : Bug fixed #8293 - Wrong price round for product
+ [-] FO : Bug fixed default picture missing in product comparison
+ [-] FO : CSS and JS files not available (404) are now empty, haven't code html of 404 page of Prestashop
+ [-] FO : Fixed #7752 - now customer image will be deleted if they remove product they attached to a product
+ [-] FO : Fixed #8418 HTTPS issue with _SERVER['HTTPS']
+ [-] FO : Fixed #PSCFI-1118 add to cart with customization
+ [-] FO : Fixed #PSCFI-1215 blockbestsellers now correctly constructs links to best-sale page
+ [-] FO : Fixed #PSCFI-1220 wrong call to setMedia()
+ [-] FO : Fixed #PSCFI-1269 undefined variable
+ [-] FO : Fixed #PSCFI-733 - fatal error when disabling shop
+ [-] FO : Fixed bug #PSCFI-1201 - Product quantities were not displayed when they should be.
+ [-] FO : Fixed bug #PSCFI-1373 - Bug with the update function when an id_lang was passed to the construct function.
+ [-] FO : Fixed bug on ssl pages
+ [-] FO : Fixed login issue when special ssl configuration
+ [-] FO : Hours can now be translated for the store locator
+ [-] FO : Remove debug comment
+ [-] FO : Smarty 2 compatibility
+ [-] FO : Use default country for default taxes
+ [-] FO : deleted the string "!" which didn't make sense in the sentence "Assign an address title for future reference".
+ [-] FO : fixed a bug when a customer have on his cookie a disabled currency
+ [-] FO : fixed bug #7991 - fixed a bug where the 'add to cart' button was still active for accessories on product pages when they are out of stock, and fixed a bug where out of stock message for products was not displayed.
+ [-] FO : fixed bug #8042 - logo and favicon were not cached properly
+ [-] FO : fixed bug #8363 - Availability in cart (green dot) wrong for products with stock 0
+ [-] FO : fixed bug #8389 - Category page not work
+ [-] FO : fixed bug #8436 - State select is invalid HTML
+ [-] FO : fixed bug #8479 - Smarty error on lines 147 and 168 of themes/prestashop/address.tpl
+ [-] FO : fixed bug #8492 - Error in cms.php?id_cms_category=1
+ [-] FO : fixed bug #8536 - Incompleted end tag
+ [-] FO : fixed bug #8555 - 1.4.0.17 h1 overlaps a background bar
+ [-] FO : fixed bug #8577 - shipping bug order OPC
+ [-] FO : fixed bug #8631 - CMS page links to other languages ignores URL rewrite (always unfriendly URL)
+ [-] FO : fixed bug #PSCFI-1290 - One Page Checkout calculates gift_price in two different ways - one right, one wrong
+ [-] FO : fixed bug #PSCFI-1296 - cart_summary is not updated after deleting items
+ [-] FO : fixed bug #PSCFI-1303 - Tag pagination with specific characters
+ [-] FO : fixed bug #PSCFI-1315 - Bug authentication and not installed newsletter module
+ [-] FO : fixed bug #PSCFI-1317 - 5 step checkout is missing address information in checkout window
+ [-] FO : fixed bug #PSCFI-1369 - svn5760 typo ("mob") in ajax.php
+ [-] FO : fixed bug #PSCFI-1395 - PackCore static function "IsInStock" doesn't work for packs
+ [-] FO : fixed bug #PSCFI-1400 - no css for search pages
+ [-] FO : fixed bug #PSCFI-1475 - An error occured because of an undefined variable $tag. The variable has been renamed as $search_tag to fix it.
+ [-] FO : fixed bug #PSCFI-1489 - Clicking on "Add to cart" - Button disables all "Add to cart"
+ [-] FO : fixed bug #PSCFI-151 - Full category list displays then shrinks
+ [-] FO : fixed bug #PSCFI-1543 - theme: "out of stock" condition may not be EXACTLY zero
+ [-] FO : fixed bug #PSCFI-1548 - Error in getPacksTable sql query
+ [-] FO : fixed bug PSCFI-1455 - Class "warning-inline" doesn't exist. Changed to "warning_inline"
+ [-] FO : fixed bug live edit now display correctly
+ [-] FO : fixed many call to unexisting css and js file after an update
+ [-] FO : fixed stylesheet bug and CCC feature
+ [-] FO :fixed a translation bug in French
+
+ [-] BO : Bug Fixed #PSCFI-1481 - IncludeTab and active action
+ [-] BO : Fix on preactivation process
+ [-] BO : Fixed #1205 error on updating product
+ [-] BO : Fixed #8513, #7932, #8040 about mail translation loss, thanks to sorsand rodt
+ [-] BO : Fixed #PSCFI-1191 - url rewrite for home page
+ [-] BO : Fixed #PSCFI-1222 - product order
+ [-] BO : Fixed #PSCFI-1394 bug while cleaning connection pages
+ [-] BO : Fixed #PSCFI-1485 - strict standard
+ [-] BO : Fixed #PSCFI-1512 - thanks to Melinda for fixing the filtering module system :)
+ [-] BO : Fixed #PSCFI-1517 - colorpicker.js issue on firefox 4
+ [-] BO : Fixed #PSCFI-1518 - now you can translate modules in a custom theme using the AdminTranslations tools
+ [-] BO : Fixed #PSCFI-858 upload flag for a language
+ [-] BO : Fixed #PSCFI-999 - generate a correct htaccess for cms and category cms
+ [-] BO : Fixed 8452 - mysql_close is not called if invalid link ressource
+ [-] BO : Fixed bug #PSCFI-1254 - Filtering manufacturers by activity would generate an incorrect sql query
+ [-] BO : Fixed bug - sql error when duplicate product
+ [-] BO : Fixed login issue when special ssl configuration
+ [-] BO : Localization pack can now be imported locally if no internet connection is available
+ [-] BO : Now .tpl are translate in root theme folder
+ [-] BO : Now when a language is added, the translation in the default language is automatically copied to the new language.
+ [-] BO : Rouding issues with float 149.42 - 149.42 = -0.0000000000012
+ [-] BO : added array_change_key_case for module translation compatibility
+ [-] BO : fixed #PSCFI-1207 - language pack import not possible with safari 5 on osx 10.6.6 and 10.6.7
+ [-] BO : fixed bad redirection
+ [-] BO : fixed bug #8391 - Currency symbol not shown in admin/products
+ [-] BO : fixed bug #8393 - Pagination was broken.
+ [-] BO : fixed bug #8414 - meta-keywords saving error
+ [-] BO : fixed bug #8563 - BO: change country to one without states
+ [-] BO : fixed bug #8576 - Illegal offset type in admin modules page
+ [-] BO : fixed bug #8636 - Fatal error during address importation
+ [-] BO : fixed bug #8649 - Suppliers Description validates wrong
+ [-] BO : fixed bug #PSCFI-1356 - Unknown object in AdminProduct due to typo
+ [-] BO : fixed bug #PSCFI-1372 - svn5757 tinymce.inc.js misses some plugins
+ [-] BO : fixed bug #PSCFI-1380 - sorting sub-categories by name in the table make back to parent category
+ [-] BO : fixed bug #PSCFI-1429 - Deleting products does not remove image files
+ [-] BO : fixed bug #PSCFI-1431 - Import error if html tag in CSV
+ [-] BO : fixed bug #PSCFI-1461 - Product updateDefaultAttribute function - small typo
+ [-] BO : fixed bug #PSCFI-1468 - Unable to delete Tax
+ [-] BO : fixed bug #PSCFI-1469 - BO Modules UI wrong collapse icon
+ [-] BO : fixed bug #PSCFI-1471 - UK localization xml was missing
+ [-] BO : fixed bug #PSCFI-1523 - Bug in saving mail subjects between translations
+ [-] BO : fixed bug #PSCFI-1560 - Carrier filter in AdminCarts Tab
+ [-] BO : fixed bug PSCFI-1557 - If a product's name include a comma, it cannot be added to a "pack" product
+ [-] BO : fixed bug in stock movements where clicking 'reset' would display an error.
+ [-] BO : fixed bug interface in AdminCountries tab
+ [-] BO : fixed bug on modules autocomplete search
+ [-] BO : fixed bug on modules filters
+ [-] BO : fixed bug scollTo bug when install new module
+ [-] BO : fixed mail subject translation (utf8, htmlentities, quotes)
+ [-] BO : fixed notice errors on product comaprison feature
+ [-] BO : install fix (now works)
+ [-] BO : liveEdit when open_basedir restriction
+ [-] BO : module can't be now transplanted anywhere, just where it can
+ [-] BO :fixed a translation bug, name files are translated with the content
+
+ [-] Classes : fixed bug #8599
+ [-] Classes : fixed bug #PSCFI-1358 - Undefined index in Tools::displayasdeprecated
+ [-] Classes : fixed bug #PSCFI-1358 - Undefined index in Tools::displayasdeprecated (another one)
+ [-] Classes : fixed bug #PSCFI-1384 - error in Class configuration
+ [-] Classes : fixed bug #PSCFI-1391 - "Reset" link on "Categories block v2.0" causes "Max depth" to be lost
+ [-] Classes : you can define encoding to strlen() method of Tools class
+
+ [-] Core : fixed bug #PSCFI-1397 - .htaccess in /download is missing
+ [-] Core : fixed little bug on validation method for iso code of state
+
+ [-] MO : Bug fixed #PSCFI-1370 - Fix on USPS module for FirstClassMailType
+ [-] MO : Translations fixed on module Twenga
+ [-] MO : TrustedShops - Integration certificate enable features
+ [-] MO : TrustedShops - Missing {literal} tags
+ [-] MO : TrustedShops, Fix a notice when a certificat doesn't exist for a language, add new translations and fix a image display
+ [-] MO : add a sentence in module producttooltip in order to indicate that statdata module must be active (PSCFI-1206)
+ [-] MO : change the way to save the serialize array, use Tools::htmlentitiesUTF8 for save in database.
+ [-] MO : fixed bug #8374 - Featured Products block issue
+ [-] MO : fixed bug #8544 - Mail alert bug
+ [-] MO : fixed bug #8567 - Search Stats not working on 1.4.0.17
+ [-] MO : fixed bug #8581 - BlockLink - SQL Error
+ [-] MO : fixed bug #PSCFI-1321 - _clearCache error in blockcategories
+ [-] MO : fixed bug #PSCFI-1378 - Socolissimo validate.php collect wrong data
+ [-] MO : fixed bug in template for productcomment module
+ [-] MO : fixed bug on DejaLa module
+ [-] MO : incorrect index array in followup.php for email
+ [-] MO : rename field id_block_cms to id_cms_block
+
+ [-] WS : Fixing PHP 5.3 compatibility bug
+ [-] WS : add the error number when a webservice error is set
+
+ [-] TR : Fixed german translation
+ [-] TR : fix german translation, thanks to the community
+ [-] TR : fixed fr mispelling at first login (please delete install dir and move admin)
+
+ [-] LO : Currency format
+
+ Deprecated methods:
+
+ [~] FO : Link->getUrlWith is deprecated
+
+
####################################
# v1.4.0.17 - 5552 (2011-03-16) #
####################################
diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php
index 00f42ec98..b10a475dc 100644
--- a/admin-dev/ajax.php
+++ b/admin-dev/ajax.php
@@ -610,7 +610,7 @@ if (Tools::isSubmit('getAdminHomeElement'))
$isoCountry = Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT'));
$context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 5)));
- $content = @file_get_contents('https://www.prestashop.com/partner/preactivation/preactivation-block.php?version=1.0&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'&protocol='.$protocol.'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)$cookie->id_lang.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $context);
+ $content = @file_get_contents('https://www.prestashop.com/partner/preactivation/preactivation-block.php?version=1.0&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'&protocol='.$protocol.'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)$cookie->id_lang.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&date_creation='._PS_CREATION_DATE_.'&v='._PS_VERSION_.'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $context);
if (!$content)
die('NOK');
$content = explode('|', $content);
@@ -629,6 +629,8 @@ if (Tools::isSubmit('getAdminHomeElement'))
}
}
}
+ else
+ $result['partner_preactivation'] = '';
// DISCOVER PRESTASHOP
$content = @file_get_contents('https://www.prestashop.com/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)$cookie->id_lang, false, $context);
@@ -648,4 +650,4 @@ if (Tools::isSubmit('getAdminHomeElement'))
die(Tools::jsonEncode($result));
-}
\ No newline at end of file
+}
diff --git a/admin-dev/tabs/AdminAddresses.php b/admin-dev/tabs/AdminAddresses.php
index c68093228..f33e3cd93b 100644
--- a/admin-dev/tabs/AdminAddresses.php
+++ b/admin-dev/tabs/AdminAddresses.php
@@ -62,7 +62,7 @@ class AdminAddresses extends AdminTab
'address1' => array('title' => $this->l('Address'), 'width' => 200),
'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 50),
'city' => array('title' => $this->l('City'), 'width' => 150),
- 'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'select' => $this->countriesArray, 'filter_key' => 'cl!id_country'));
+ 'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'select' => $this->countriesArray, 'filter_key' => 'id_country'));
parent::__construct();
}
@@ -275,6 +275,13 @@ class AdminAddresses extends AdminTab
*
';
}
+ echo '
+
+
+
+
'.$this->l('DNI / NIF / NIE').'
+
';
+
echo '
*
@@ -282,143 +289,216 @@ class AdminAddresses extends AdminTab
diff --git a/mails/fr/order_conf.txt b/mails/fr/order_conf.txt
index 39d534c04..c5581b8e3 100644
--- a/mails/fr/order_conf.txt
+++ b/mails/fr/order_conf.txt
@@ -17,25 +17,10 @@ Livraison
Transporteur : {carrier}
Adresse de livraison :
-
- {delivery_company}
- {delivery_firstname} {delivery_lastname}
- {delivery_address1}
- {delivery_address2}
- {delivery_postal_code} {delivery_city}
- {delivery_country} {delivery_state}
- {delivery_other}
+ {delivery_block_txt}
Adresse de facturation :
-
- {invoice_company}
- {invoice_vat_number}
- {invoice_firstname} {invoice_lastname}
- {invoice_address1}
- {invoice_address2}
- {invoice_postal_code} {invoice_city}
- {invoice_country} {invoice_state}
- {invoice_other}
+ {invoice_block_txt}
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse: {shop_url}guest-tracking.php
diff --git a/modules/authorizeaim/config.xml b/modules/authorizeaim/config.xml
index 49a46920b..38282953c 100755
--- a/modules/authorizeaim/config.xml
+++ b/modules/authorizeaim/config.xml
@@ -4,8 +4,9 @@
Authorize.net AIM (Advanced Integration Method)1.0Receive payment with Authorize.net
-
+ PrestaShoppayments_gateways11
+ us
\ No newline at end of file
diff --git a/modules/birthdaypresent/es.php b/modules/birthdaypresent/es.php
index 3ba2fb053..b193021ef 100644
--- a/modules/birthdaypresent/es.php
+++ b/modules/birthdaypresent/es.php
@@ -4,7 +4,7 @@ global $_MODULE;
$_MODULE = array();
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_c2796655c25e1b0b8582716036aece08'] = 'Regalo de cumpleaños';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_d1f5899bf2af57ed816390d9d740daf6'] = 'Haga a sus clientes regalos de cumpleaños automáticamente';
-$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_42f95f1b218dda65c23c52fcb205f1ed'] = 'Cree un vale descuento para los clientes que celebren su cumpleaños y que pueda usarse una sola vez';
+$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_ccfcf858237a83953c1ac03b5abde35e'] = 'Crear un bono para los clientes que celebran su cumpleaños y que tiene por lo menos un pedido válido';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_4d3d769b812b6faa6b76e1a8abaece2d'] = 'Activo';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_52292d2f9c39936bc72fbd47a3060df3'] = 'Adicionalemente, debe establecer una regla CRON que pida el archivo';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_f7e78e04cba74c610354e91e622cc105'] = 'todos los días';
@@ -24,5 +24,5 @@ $_MODULE['<{birthdaypresent}prestashop>birthdaypresent_7b6ac3f2cdb42a4462ff7ca3c
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_410008089d5bb723438103a84d48a59c'] = 'Para alcanzar este objetivo usted puede organizar:';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_3e788301a1b0ce341aa5ce15bc520545'] = 'Operaciones puntuales: recompensas comerciales (ofertas especiales personalizadas, producto o servicios ofrecidos), recompensas no comerciales (prioridad en el envío de un pedido o de un producto), recompensas pecuniarias (enlaces, cupones del descuento, prioridad en el reembolso...).';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_f299b58558601a85c98a2d1d7867d523'] = 'Operaciones sostenibles: las tarjetas de fidelidad o de puntos, que no sólo justifican la comunicación entre el comerciante y el cliente, pero también ofrecen ventajas a los clientes (ofertas, descuentos privados).';
-$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_2ac84f3e753fa299ebe4a6dfe57f1d9c'] = 'Estas operaciones animan a los clientes a comprar y también a volver a la tienda virtual regularmente.';
-$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_38241c5ab16ef8f1ba73460ecd0469e8'] = '¡Su regalo de cumpleaños!';
+$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_d434c183a411611f50fa7e121b0f6565'] = 'Estas operaciones animan a los clientes a comprar y también a volver a su tienda en línea frecuentemente.';
+$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_d46bd07675d08116e85f8a4c7866de53'] = '¡Su regalo de cumpleaños!';
diff --git a/modules/birthdaypresent/fr.php b/modules/birthdaypresent/fr.php
index 33811254b..8f83d2582 100644
--- a/modules/birthdaypresent/fr.php
+++ b/modules/birthdaypresent/fr.php
@@ -4,6 +4,7 @@ global $_MODULE;
$_MODULE = array();
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_c2796655c25e1b0b8582716036aece08'] = 'Cadeau d\'anniversaire';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_d1f5899bf2af57ed816390d9d740daf6'] = 'Offrez automatiquement à vos clients des cadeaux d\'anniversaire';
+$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_ccfcf858237a83953c1ac03b5abde35e'] = 'Créer un bon de réduction pour les clients fêtant leur anniversaire et ayant au moins une commande valide';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_4d3d769b812b6faa6b76e1a8abaece2d'] = 'Actif';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_52292d2f9c39936bc72fbd47a3060df3'] = 'De plus, vous devez installer une règle CRON qui appellera le fichier';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_f7e78e04cba74c610354e91e622cc105'] = 'chaque jour';
@@ -23,3 +24,5 @@ $_MODULE['<{birthdaypresent}prestashop>birthdaypresent_7b6ac3f2cdb42a4462ff7ca3c
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_410008089d5bb723438103a84d48a59c'] = 'Pour y parvenir, plusieurs moyens existent :';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_3e788301a1b0ce341aa5ce15bc520545'] = 'Les opérations ponctuelles : les récompenses marchandes (offres promotionnelles ciblées et personnalisées, cadeaux -produit ou service offert-), les récompenses non marchandes (traitement prioritaire d\'une commande ou d\'un produit), les récompenses pécuniaires (bons d\'achat, de réduction, de remboursement). ';
$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_f299b58558601a85c98a2d1d7867d523'] = 'Les opérations pérennes : (carte de fidélité, points de fidélité) qui non seulement justifient la communication marchand-clients, et aussi offre des avantages aux clients (offres privatives, réductions).';
+$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_d434c183a411611f50fa7e121b0f6565'] = 'Ces opérations encouragent les clients à acheter et aussi à revenir sur votre boutique en ligne régulièrement.';
+$_MODULE['<{birthdaypresent}prestashop>birthdaypresent_d46bd07675d08116e85f8a4c7866de53'] = 'Votre cadeau d\'anniversaire !';
diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php
index d8bab8caa..4a5085117 100644
--- a/modules/blockcart/blockcart.php
+++ b/modules/blockcart/blockcart.php
@@ -1,6 +1,6 @@
displayName = $this->l('Cart block');
$this->description = $this->l('Adds a block containing the customer\'s shopping cart.');
}
-
+
public function smartyAssigns(&$smarty, &$params)
{
global $errors, $cookie;
@@ -62,7 +62,7 @@ class BlockCart extends Module
}
else
$taxCalculationMethod = Group::getDefaultPriceDisplayMethod();
-
+
$useTax = !($taxCalculationMethod == PS_TAX_EXC);
$products = $params['cart']->getProducts(true);
@@ -72,13 +72,13 @@ class BlockCart extends Module
$wrappingCost = (float)($params['cart']->getOrderTotal($useTax, Cart::ONLY_WRAPPING));
$totalToPay = $params['cart']->getOrderTotal($useTax);
-
+
if ($useTax AND Configuration::get('PS_TAX_DISPLAY') == 1)
{
$totalToPayWithoutTaxes = $params['cart']->getOrderTotal(false);
$smarty->assign('tax_cost', Tools::displayPrice($totalToPay - $totalToPayWithoutTaxes, $currency));
}
-
+
$smarty->assign(array(
'products' => $products,
'customizedDatas' => Product::getAllCustomizedDatas((int)($params['cart']->id)),
@@ -88,7 +88,7 @@ class BlockCart extends Module
'nb_total_products' => (int)($nbTotalProducts),
'shipping_cost' => Tools::displayPrice($params['cart']->getOrderTotal($useTax, Cart::ONLY_SHIPPING), $currency),
'show_wrapping' => $wrappingCost > 0 ? true : false,
- 'show_tax' => (int)(Configuration::get('PS_TAX_DISPLAY')) == 1 ? true : false,
+ 'show_tax' => (int)(Configuration::get('PS_TAX_DISPLAY') == 1 && $smarty->getConfigVars('use_taxes')),
'wrapping_cost' => Tools::displayPrice($wrappingCost, $currency),
'product_total' => Tools::displayPrice($params['cart']->getOrderTotal($useTax, Cart::BOTH_WITHOUT_SHIPPING), $currency),
'total' => Tools::displayPrice($totalToPay, $currency),
@@ -125,7 +125,7 @@ class BlockCart extends Module
';
@@ -157,11 +157,10 @@ class BlockCart extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return;
-
+
global $smarty;
$smarty->assign('order_page', strpos($_SERVER['PHP_SELF'], 'order') !== false);
$this->smartyAssigns($smarty, $params);
-
return $this->display(__FILE__, 'blockcart.tpl');
}
@@ -174,20 +173,21 @@ class BlockCart extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return;
-
+
global $smarty;
$this->smartyAssigns($smarty, $params);
$res = $this->display(__FILE__, 'blockcart-json.tpl');
return $res;
}
-
+
public function hookHeader()
{
if (Configuration::get('PS_CATALOG_MODE'))
return;
-
+
Tools::addCSS(($this->_path).'blockcart.css', 'all');
if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')))
Tools::addJS(($this->_path).'ajax-cart.js');
}
}
+
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index c2c70f46f..e109bd1ad 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -40,13 +40,13 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
+{/if}
\ No newline at end of file
diff --git a/modules/blocklayered/config.xml b/modules/blocklayered/config.xml
index 033afe08e..7b53b0efd 100644
--- a/modules/blocklayered/config.xml
+++ b/modules/blocklayered/config.xml
@@ -8,4 +8,5 @@
front_office_features11
+
\ No newline at end of file
diff --git a/modules/ekomi/config.xml b/modules/ekomi/config.xml
index 9df9cf8ea..b82534953 100644
--- a/modules/ekomi/config.xml
+++ b/modules/ekomi/config.xml
@@ -2,10 +2,11 @@
ekomieKomi
- 0.8
+ 1.0Adds a eKomi blockadvertising_marketing11
-
\ No newline at end of file
+
+
diff --git a/modules/ekomi/ekomi.php b/modules/ekomi/ekomi.php
index e885091f0..f74c5e01f 100755
--- a/modules/ekomi/ekomi.php
+++ b/modules/ekomi/ekomi.php
@@ -34,7 +34,7 @@ class Ekomi extends Module
{
$this->name = 'ekomi';
$this->tab = 'advertising_marketing';
- $this->version = 0.8;
+ $this->version = 1.0;
parent::__construct();
@@ -108,9 +108,8 @@ class Ekomi extends Module
public function hookNewOrder($params)
{
- global $cookie;
if (!Configuration::get('PS_EKOMI_EMAIL'))
- return false;
+ return true;
/* Email generation */
$subject = '[Ekomi-Prestashop] '.Configuration::get('PS_SHOP_NAME');
@@ -122,8 +121,8 @@ class Ekomi extends Module
);
/* Email sending */
- if (!Mail::Send((int)($cookie->id_lang), 'ekomi', $subject, $templateVars, Configuration::get('PS_EKOMI_EMAIL'), NULL, $params['customer']->email, Configuration::get('PS_SHOP_NAME'), NULL, NULL, dirname(__FILE__).'/mails/'))
- return false;
+ if (!Mail::Send(1, 'ekomi', $subject, $templateVars, Configuration::get('PS_EKOMI_EMAIL'), NULL, $params['customer']->email, Configuration::get('PS_SHOP_NAME'), NULL, NULL, dirname(__FILE__).'/mails/'))
+ return true;
return true;
}
}
diff --git a/modules/ekomi/es.php b/modules/ekomi/es.php
index 65dd79b50..0dbc27f4a 100644
--- a/modules/ekomi/es.php
+++ b/modules/ekomi/es.php
@@ -8,7 +8,10 @@ $_MODULE['<{ekomi}prestashop>ekomi_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Confirm
$_MODULE['<{ekomi}prestashop>ekomi_c888438d14855d7d96a2724ee9c306bd'] = 'Configuración actualizada';
$_MODULE['<{ekomi}prestashop>ekomi_f4f70727dc34561dfde1a3c529b6205c'] = 'Configuración';
$_MODULE['<{ekomi}prestashop>ekomi_597b9cfa17df5ac4e2a4b1f4b6de347a'] = 'configuración eKomi';
-$_MODULE['<{ekomi}prestashop>ekomi_c48c140af813696592daafbabe6d8b9f'] = 'script eKomi';
$_MODULE['<{ekomi}prestashop>ekomi_c4fda5e26d4854b8718850c90694a54c'] = 'eKomi por e-mail';
+$_MODULE['<{ekomi}prestashop>ekomi_c48c140af813696592daafbabe6d8b9f'] = 'script eKomi';
+$_MODULE['<{ekomi}prestashop>ekomi_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Mostrar';
+$_MODULE['<{ekomi}prestashop>ekomi_b9f5c797ebbf55adccdd8539a65a0241'] = 'Ocultar';
+$_MODULE['<{ekomi}prestashop>ekomi_ccf7919cbd0248b0f86a8c39f74da5d0'] = 'Mostrar o no el bloque (los pedidos serán enviados a eKomi independientemente de que usted elija ocultar o mostrar el bloque).';
$_MODULE['<{ekomi}prestashop>ekomi_0767b05248fcba405524f792944858ef'] = 'Por favor, rellene el formulario con los datos básicos que eKomi le da.';
$_MODULE['<{ekomi}prestashop>ekomi_c9cc8cce247e49bae79f15173ce97354'] = 'Guardar';
diff --git a/modules/hipay/es.php b/modules/hipay/es.php
index 3d317fd16..c3e42de87 100644
--- a/modules/hipay/es.php
+++ b/modules/hipay/es.php
@@ -19,12 +19,15 @@ $_MODULE['<{hipay}prestashop>hipay_527557971b02f68ead6a278fb96ac396'] = 'vérifi
$_MODULE['<{hipay}prestashop>hipay_1c5f361b20c116ab2324e28b1ac54e12'] = 'Su tienda no está en línea';
$_MODULE['<{hipay}prestashop>hipay_66170e45eb6eb71c35fc3b259a866ff7'] = 'La categoría de productos Hipay no está configurada para cada ID del sitio web';
$_MODULE['<{hipay}prestashop>hipay_1a1a01512e42b64541ed9b1f43a56036'] = 'imposible recuperar las categorías Hipay. Vea el diario de errores para más información.';
-$_MODULE['<{hipay}prestashop>hipay_8f19eb452ad0295c45ca62a099f10dc6'] = 'Hipay es una cartera electrónica segura que le ofrece una paleta de herramientas y de aplicaciones para facturar difertentes tipos de contenidos y de servicios: contenidos numéricos, descargas, bienes físicos... sin necesidad de negociar con un banco y sin gastos técnicos. ';
-$_MODULE['<{hipay}prestashop>hipay_e5ac60a0713182096ea3f9590f101b25'] = 'Simple y gratuita, la implementación de la solución Hipay constituye una ventaja para un sitio de venta en línea que desea impulsarse en Europa: pagos seguros con tarjetas internacionales, soluciones de pago locales, transferencias bancarias...';
-$_MODULE['<{hipay}prestashop>hipay_01ad06b7c5887516f56ff824278feb67'] = 'Nota : Para reenvolsar integramente una transacción, vaya al sitio www.hipay.com, en la gestión de venta Hipay/gestión de las ventas.';
+$_MODULE['<{hipay}prestashop>hipay_74e0ddca931daefcd88f3c118e8eb0f1'] = 'Hipay es un monedero electrónico seguro que tiene el aval bancario europeo. Hipay le ofrece muchas posibilidades, sin necesidad de negociar con un banco. Fácil y de uso gratuito, la solución Hipay constituye una real ventaja para los sitios de venta en línea que desean expandirse por Europa: pagos seguros con tarjetas internacionales, soluciones locales de pago, transferencias bancarias ...';
+$_MODULE['<{hipay}prestashop>hipay_01ad06b7c5887516f56ff824278feb67'] = 'Nota : Para reenbolsar integramente una transacción, vaya al sitio www.hipay.com, en la gestión de venta Hipay/gestión de las ventas.';
$_MODULE['<{hipay}prestashop>hipay_254f642527b45bc260048e30704edb39'] = 'Configuración';
+$_MODULE['<{hipay}prestashop>hipay_d86590564b22be4d3b242472722bf969'] = 'La configuración de Hipay es muy fácil y funciona en 3 pasos';
$_MODULE['<{hipay}prestashop>hipay_f21850b58e4866b30f7d3724cc29edb1'] = 'Acceder a su espacio de venta Hipay';
$_MODULE['<{hipay}prestashop>hipay_dc32882bf2b1893d53aeaaa862c46d5c'] = 'Crear una cuenta Hipay';
+$_MODULE['<{hipay}prestashop>hipay_04c85eb0ee32a3a352e80c9bce37b038'] = 'Activar la solución Hipay en su PrestaShop, ¡es gratis!';
+$_MODULE['<{hipay}prestashop>hipay_b7ce0a1dce723a074049b88fb22dbb4d'] = 'Disfrutar de precios especiales en las transacciones a través de PrestaShop ';
+$_MODULE['<{hipay}prestashop>hipay_7667c2b31b9980267cb526ed2f0d235d'] = 'poniéndose en contacto con nuestro departamento de ventas';
$_MODULE['<{hipay}prestashop>hipay_08bd40c7543007ad06e4fce31618f6ec'] = 'Cuenta Hipay';
$_MODULE['<{hipay}prestashop>hipay_9596f310ab4657258496ab217d3b5d85'] = 'real / producción';
$_MODULE['<{hipay}prestashop>hipay_aeda5c9c68fbc42071d76a8d2b3d73e8'] = 'test';
diff --git a/modules/hipay/fr.php b/modules/hipay/fr.php
index 4f40bd2be..1836bab15 100644
--- a/modules/hipay/fr.php
+++ b/modules/hipay/fr.php
@@ -22,8 +22,12 @@ $_MODULE['<{hipay}prestashop>hipay_1a1a01512e42b64541ed9b1f43a56036'] = 'Impossi
$_MODULE['<{hipay}prestashop>hipay_74e0ddca931daefcd88f3c118e8eb0f1'] = 'Hipay est un portefeuille électronique sécurisé et possédant l\'agrément bancaire européen. Hipay vous offre de nombreuses possibilités sans avoir besoin de négocier avec une banque. Facile et gratuite, l’implémentation de la solution Hipay constitue un véritable atout pour un site e-commerce qui souhaite se développer en Europe : paiements sécurisés par cartes internationales, solutions de paiement locales, virements bancaires...';
$_MODULE['<{hipay}prestashop>hipay_01ad06b7c5887516f56ff824278feb67'] = 'Note : Pour rembourser intégralement une transaction, veuillez vous rendre sur le site www.hipay.com, dans la gestion marchande Hipay/gestion des ventes.';
$_MODULE['<{hipay}prestashop>hipay_254f642527b45bc260048e30704edb39'] = 'Configuration';
+$_MODULE['<{hipay}prestashop>hipay_d86590564b22be4d3b242472722bf969'] = 'La configuration de Hipay est vraiment facile et fonctionne en 3 étapes';
$_MODULE['<{hipay}prestashop>hipay_f21850b58e4866b30f7d3724cc29edb1'] = 'Accédez à votre espace marchand Hipay';
$_MODULE['<{hipay}prestashop>hipay_dc32882bf2b1893d53aeaaa862c46d5c'] = 'Créez un compte Hipay';
+$_MODULE['<{hipay}prestashop>hipay_04c85eb0ee32a3a352e80c9bce37b038'] = 'Activer la solution Hipay dans votre PrestaShop, c\'est gratuit !';
+$_MODULE['<{hipay}prestashop>hipay_b7ce0a1dce723a074049b88fb22dbb4d'] = 'Profitez de tarifs préférentiels sur les transactions via Prestashop en';
+$_MODULE['<{hipay}prestashop>hipay_7667c2b31b9980267cb526ed2f0d235d'] = 'contactant notre département des ventes';
$_MODULE['<{hipay}prestashop>hipay_08bd40c7543007ad06e4fce31618f6ec'] = 'Compte Hipay';
$_MODULE['<{hipay}prestashop>hipay_9596f310ab4657258496ab217d3b5d85'] = 'réel / production';
$_MODULE['<{hipay}prestashop>hipay_aeda5c9c68fbc42071d76a8d2b3d73e8'] = 'test';
diff --git a/modules/loyalty/es.php b/modules/loyalty/es.php
index 813171975..9ef0a0b71 100644
--- a/modules/loyalty/es.php
+++ b/modules/loyalty/es.php
@@ -48,6 +48,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_928666bdf20510dfa5c58393b77f1798'] = 'Val
$_MODULE['<{loyalty}prestashop>loyalty_a9be824aae4f2381a27b7c699b1e041e'] = 'En espera de validación';
$_MODULE['<{loyalty}prestashop>loyalty_78945de8de090e90045d299651a68a9b'] = 'Disponibles';
$_MODULE['<{loyalty}prestashop>loyalty_4cb08bf5ad3d3c7b010dde725a078b28'] = 'Convertidos';
+$_MODULE['<{loyalty}prestashop>loyalty_df05c2db84dacb19b599b489bf3963db'] = 'No disponible en los descuentos';
$_MODULE['<{loyalty}prestashop>loyalty_01371a1d58e9234c0b9dbc08cf54fa8b'] = 'No válidos en descuentos';
$_MODULE['<{loyalty}prestashop>loyalty_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mi cuenta:';
$_MODULE['<{loyalty}prestashop>loyalty_c540093e64d84440025b2d8201f04336'] = 'Mis puntos recompensa';
diff --git a/modules/loyalty/fr.php b/modules/loyalty/fr.php
index ad8b0c86c..a905233a6 100644
--- a/modules/loyalty/fr.php
+++ b/modules/loyalty/fr.php
@@ -48,6 +48,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_928666bdf20510dfa5c58393b77f1798'] = 'Val
$_MODULE['<{loyalty}prestashop>loyalty_a9be824aae4f2381a27b7c699b1e041e'] = 'En attente de validation';
$_MODULE['<{loyalty}prestashop>loyalty_78945de8de090e90045d299651a68a9b'] = 'Disponibles';
$_MODULE['<{loyalty}prestashop>loyalty_4cb08bf5ad3d3c7b010dde725a078b28'] = 'Déjà convertis';
+$_MODULE['<{loyalty}prestashop>loyalty_df05c2db84dacb19b599b489bf3963db'] = 'Non disponible sur les remises';
$_MODULE['<{loyalty}prestashop>loyalty_01371a1d58e9234c0b9dbc08cf54fa8b'] = 'Non valables sur les promotions';
$_MODULE['<{loyalty}prestashop>loyalty_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mon compte';
$_MODULE['<{loyalty}prestashop>loyalty_c540093e64d84440025b2d8201f04336'] = 'Mes points de fidélité';
diff --git a/modules/mondialrelay/es.php b/modules/mondialrelay/es.php
index 94ea02e4d..638f478d2 100644
--- a/modules/mondialrelay/es.php
+++ b/modules/mondialrelay/es.php
@@ -48,6 +48,7 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_90b95ae88150c6a34c4129dc4f1ebbd
$_MODULE['<{mondialrelay}prestashop>mondialrelay_c15b40b8c535191f6f0b6f9beaced3cf'] = 'Seguro complementario N4';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_b67a442fff3ca0a03ea253b0668f946d'] = 'Seguro complementario N5';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_33cbd0d8b6476501f55a8320481ec0f1'] = 'Lista de países :';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_aef71ba4fd060dea2e2c76d1b5076caf'] = 'Puede elegir varios países pulsando Ctrl mientras selecciona los países';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_0309a6c666a7a803fdb9db95de71cf01'] = 'Francia';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_6c1674d14bf5f95742f572cddb0641a7'] = 'Bélgica';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_06630c890abadde9228ea818ce52b621'] = 'Luxemburgo';
@@ -120,6 +121,7 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_6c530987d533793b0f25fb18807b69c
$_MODULE['<{mondialrelay}prestashop>mondialrelay_3d2da0d2e731d59465a92f13216cf82d'] = 'La página señas';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_06b3355cd8a61603396c7e453bdb1025'] = 'Dirección vacía: ¿está seguro de haber introducio una dirección válida en la página Señas?';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_2f84f9d5731852c4d07d52ef0badc42e'] = 'Problemas para obtener las direcciones de servicio web MondialRelay: los servidores de Mondial Relay pueden estar fuera de servicio';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_016854c68c7122b18d89ff0f5e40502b'] = 'No hay Punto de entrega cerca de su domicilio, por favor cambie su dirección o utilice otro modo de transporte';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_21034ae6d01a83e702839a72ba8a77b0'] = '(sin IVA)';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_1f87346a16cf80c372065de3c54c86d9'] = '(IVA incluido)';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_e7a6ca4e744870d455a57b644f696457'] = '¡Gratis!';
diff --git a/modules/productcomments/productcomments.tpl b/modules/productcomments/productcomments.tpl
index 5b04b5b8c..c3733db0c 100644
--- a/modules/productcomments/productcomments.tpl
+++ b/modules/productcomments/productcomments.tpl
@@ -55,7 +55,7 @@
{foreach from=$product_comments[$id_product] item=comment}
diff --git a/modules/producttooltip/es.php b/modules/producttooltip/es.php
index 9af41e845..2072e9955 100644
--- a/modules/producttooltip/es.php
+++ b/modules/producttooltip/es.php
@@ -10,6 +10,7 @@ $_MODULE['<{producttooltip}prestashop>producttooltip_93cba07454f06a4a960172bbd6e
$_MODULE['<{producttooltip}prestashop>producttooltip_bafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
$_MODULE['<{producttooltip}prestashop>producttooltip_2c8de3180924949acc5f6250af689802'] = 'Periodo de validez:';
$_MODULE['<{producttooltip}prestashop>producttooltip_640fd0cc0ffa0316ae087652871f4486'] = 'minutos';
+$_MODULE['<{producttooltip}prestashop>producttooltip_8a8110f8a25a0e445f51edf84fd98a96'] = 'Si activa la opción anterior, debe activar la primera opción del módulo StatData';
$_MODULE['<{producttooltip}prestashop>producttooltip_1e358b149c2d4105f3a74c1961d1d9fb'] = '¿Mostrar la fecha del último pedido?';
$_MODULE['<{producttooltip}prestashop>producttooltip_69cd5a64d37c70989558b58f0b484fb3'] = 'Si no hay pedido, ¿mostrar la última vez que un producto ha sido añadido al carrito?';
$_MODULE['<{producttooltip}prestashop>producttooltip_a536f110cc080569666e95e8f49fda9b'] = 'No mostrar los acontecimientos de más de:';
diff --git a/modules/trustedshops/config.xml b/modules/trustedshops/config.xml
index c8d9ac677..d6bb5abba 100755
--- a/modules/trustedshops/config.xml
+++ b/modules/trustedshops/config.xml
@@ -2,7 +2,7 @@
trustedshopsTrusted Shops Customer Rating
- 1.1
+ 1.2Boost consumer confidence and turn more shoppers into buyers.payment_security
diff --git a/modules/trustedshops/es.php b/modules/trustedshops/es.php
index a6fefa7f7..38f523541 100644
--- a/modules/trustedshops/es.php
+++ b/modules/trustedshops/es.php
@@ -4,6 +4,12 @@ global $_MODULE;
$_MODULE = array();
$_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops protección comprador (recomendado)';
$_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protección comprador hasta';
+$_MODULE['<{trustedshops}prestashop>display_products_a53a5a9f38f31d62a791717b943e02f3'] = 'EUR IVA incluído';
+$_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'La protección comprador Trusted Shops hace su compra en línea segura. Acepto que mi email sea trasferido y';
+$_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'guardado';
+$_MODULE['<{trustedshops}prestashop>display_products_2dc4be4d5564180e6df95d5a5a679195'] = 'para el tratamiento de la protección comprador por Trusted Shops.';
+$_MODULE['<{trustedshops}prestashop>display_products_229eb04083e06f419f9ac494329f957d'] = 'Condiciones';
+$_MODULE['<{trustedshops}prestashop>display_products_4ccaceceffe4b5e58f6a7a7ed3ced4c4'] = 'para la protección del comprador.';
$_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_7b5406da2d5f15923d6b01d3264c5619'] = 'Cuño Trusted Shops- Pulse aquí para comprobar';
$_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_4052048c767f22e9071c3e6f404d00c6'] = 'Como miembro de Trusted Shops, le ofrecemos un servicio complementario excepcional: la garantía de reembolso Trusted Shops. ';
$_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_f975f42362625cf21e592009ff4b3d7b'] = 'Inscríbase para obtener la garantía de reembolso de Trusted Shops. ';
@@ -85,6 +91,7 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_259060bb469ed1256c2e758e32
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8512ae7d57b1396273f76fe6ed341a23'] = 'idioma';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f7ea4ac740662d2427d1ef1f2695206d'] = 'ha sido suprimido';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_3fb2ea84b90d4ea9fab48ea356a2319b'] = 'Se ha añadido el login del certificado';
+$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b18f5630d5ffdfcee5ab0a44ee6e1eb6'] = 'Tiene que crear un nombre de usuario y una contraseña antes de efectuar cualquier cambio.';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_e32263743aac776e5e32fc385d8b669a'] = 'Trusted Shops es el sello de calidad europea para sitios de venta en línea con garantía de reembolso para sus clientes. En el momento de la certificación, su tienda está sometida a una auditoría que agrupa más de 1000 criterios diferentes que respetan las exigencias de las asociaciones de protección de los consumidores, así como las legislaciones nacionales y europeas. ';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_2c786e15a571a442adf85460e6358883'] = '¡Más confianza implica más ventas!';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_e06f60bb083e167516a94aafd5a3a2e2'] = 'El sello de calidad Trusted Shops es ideal para aumentar la confianza de los clientes en su tienda en línea. Cuanto más confíen los clientes en su sitio Wab, más compras realizarán el el mismo.';
@@ -92,6 +99,8 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8dd66ca6788218bd7d2ba7fe43
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_26286e2764ccde55c99d1b258315aa1a'] = 'Puede proponer a sus clientes en línea un argumento importante: la protección comprador Trusted Shops que asegura al cliente en caso de no reembolso o si no reciba la mercancía. Este seguro suplementario permite reducir la interrupción de los pedidos. ';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_710142158c105c01ef807ce959cbc451'] = 'Una fidelización clientela fructuosa y durable';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f7e15d97ad927ef705de61e787883ada'] = 'Para aumentar las compras en línea, el sello de calidad Trusted Shops con protección comprador es un criterio de calidad durable para compras en línea seguras. Es una manera de transformar clientes únicos en clientes fieles. ';
+$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_7442a1e0ab5e2e26ca9363d226b93d13'] = 'Ambiente tipo';
+$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8e77e16312de3f95afdf5b92b10232a2'] = 'En este momento está usando el modo:';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_dc62561dd8d390e274487516e869fc93'] = 'Obtenir el link de registro';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_5c93149208b3885248b960eb22e6ba49'] = 'Esta variable ha sido enviada por email por Tructed Shops';
$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_233a96df2f68dbeafaa3126edadc1ce8'] = 'Identificación interna del software de la tienda en Trusted Shops';
diff --git a/modules/trustedshops/fr.php b/modules/trustedshops/fr.php
index 51ff80f13..e7958ff0e 100644
--- a/modules/trustedshops/fr.php
+++ b/modules/trustedshops/fr.php
@@ -8,6 +8,7 @@ $_MODULE['<{trustedshops}prestashop>display_products_a53a5a9f38f31d62a791717b943
$_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'La protection acheteur Trusted Shops sécurise votre achat en ligne. J’accepte le transfert et la';
$_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'sauvegarde';
$_MODULE['<{trustedshops}prestashop>display_products_2dc4be4d5564180e6df95d5a5a679195'] = 'de mon adresse email pour le traitement de la protection acheteur par Trusted Shops.';
+$_MODULE['<{trustedshops}prestashop>display_products_229eb04083e06f419f9ac494329f957d'] = 'Conditions';
$_MODULE['<{trustedshops}prestashop>display_products_4ccaceceffe4b5e58f6a7a7ed3ced4c4'] = 'pour la protection acheteur.';
$_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_7b5406da2d5f15923d6b01d3264c5619'] = 'Sceau Trusted Shops - Cliquez pour le verifier.';
$_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_4052048c767f22e9071c3e6f404d00c6'] = 'En tant que membre Trusted Shops, nous vous offrons un service complémentaire exceptionnel: la garantie de remboursement Trusted Shops. Les frais relatifs à cette garantie sont entièrement à notre charge, alors n\'hésitez pas, il vous suffit de vous inscrire.';
diff --git a/modules/trustedshops/lib/TSBuyerProtection.php b/modules/trustedshops/lib/TSBuyerProtection.php
index e9ed3014f..5bd4bb13b 100644
--- a/modules/trustedshops/lib/TSBuyerProtection.php
+++ b/modules/trustedshops/lib/TSBuyerProtection.php
@@ -42,7 +42,7 @@ class TSBuyerProtection extends AbsTrustedShops
const DB_APPLI = 'ts_application_id';
const WEBSERVICE_BO = 'administration';
const WEBSERVICE_FO = 'front-end';
-
+
/**
* List of registration link, need to add parameters
* @see TSBuyerProtection::_getRegistrationLink()
@@ -54,7 +54,7 @@ class TSBuyerProtection extends AbsTrustedShops
'FR' => 'http://www.trustedshops.com/marchands/affiliation.html',
'PL' => 'http://www.trustedshops.pl/handlowcy/cennik.html',
);
-
+
/**
* Link to obtain the certificate about the shop.
* Use by seal of approval.
@@ -67,22 +67,22 @@ class TSBuyerProtection extends AbsTrustedShops
'FR' => 'http://www.trustedshops.fr',
'PL' => 'http://www.trustedshops.de/profil/#shop_name#_#shop_id#.html',
);
-
+
/**
* Available language for used TrustedShops Buyer Protection
* @see TSBuyerProtection::__construct()
* @var array
*/
private $available_languages = array('EN'=>'', 'FR'=>'', 'DE'=>'', 'PL'=>'', );
-
+
/**
* @todo : be sure : see TrustedShopsRating::__construct()
* @var array
*/
public $limited_countries = array('PL', 'GB', 'US', 'FR', 'DE');
-
+
/**
- * Differents urls to call for Trusted Shops API
+ * Differents urls to call for Trusted Shops API
* @var array
*/
private static $webservice_urls = array(
@@ -95,12 +95,12 @@ class TSBuyerProtection extends AbsTrustedShops
'production' => 'https://protection.trustedshops.com/ts/protectionservices/ApplicationRequestService?wsdl',
),
);
-
- // Configuration vars
+
+ // Configuration vars
private static $SHOPSW;
private static $ET_CID;
private static $ET_LID;
-
+
/**
* Its must look like :
* array(
@@ -113,19 +113,19 @@ class TSBuyerProtection extends AbsTrustedShops
private static $DEFAULT_LANG;
private static $CAT_ID;
private static $ENV_API;
-
+
/**
* save shop url
* @var string
*/
private $site_url;
-
+
/**
* Payment type used by Trusted Shops.
* @var array
*/
private static $payments_type;
-
+
public function __construct()
{
// need to set this in constructor to allow translation
@@ -177,16 +177,16 @@ class TSBuyerProtection extends AbsTrustedShops
}
}
}
-
+
public function install()
{
if (!method_exists('Tools', 'jsonDecode') || !method_exists('Tools', 'jsonEncode'))
return false;
foreach ($this->available_languages as $iso=>$lang)
- Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'CERTIFICATE_'.strtoupper($iso),
+ Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'CERTIFICATE_'.strtoupper($iso),
Tools::htmlentitiesUTF8(Tools::jsonEncode(array('stateEnum'=>'', 'typeEnum'=>'', 'url'=>'', 'tsID'=>'', 'user'=>'', 'password'=>''))));
-
+
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'SHOPSW', '');
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'ET_CID', '');
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'ET_LID', '');
@@ -206,7 +206,7 @@ class TSBuyerProtection extends AbsTrustedShops
);
';
Db::getInstance()->Execute($req);
-
+
$req = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.TSBuyerProtection::DB_APPLI.'` (
`id_application` INT NOT NULL PRIMARY KEY,
`ts_id` VARCHAR( 33 ) NOT NULL,
@@ -217,16 +217,16 @@ class TSBuyerProtection extends AbsTrustedShops
);
';
Db::getInstance()->Execute($req);
-
+
//add hidden category
$category = new Category();
$languages = Language::getLanguages(true);
- foreach ($this->available_languages as $iso=>$lang)
+ foreach ($this->available_languages as $iso=>$lang)
{
$category->name[Language::getIdByIso(strtolower($iso))] = 'Trustedshops';
$category->link_rewrite[Language::getIdByIso(strtolower($iso))] = 'trustedshops';
}
-
+
// If the default lang is different than available languages :
// (Bug occurred otherwise)
if (!array_key_exists(Language::getIsoById((int)Configuration::get('PS_LANG_DEFAULT')), $this->available_languages))
@@ -234,7 +234,7 @@ class TSBuyerProtection extends AbsTrustedShops
$category->name[(int)Configuration::get('PS_LANG_DEFAULT')] = 'Trustedshops';
$category->link_rewrite[(int)Configuration::get('PS_LANG_DEFAULT')] = 'trustedshops';
}
-
+
$category->id_parent = 0;
$category->level_depth = 0;
$category->active = 0;
@@ -242,12 +242,12 @@ class TSBuyerProtection extends AbsTrustedShops
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'CAT_ID', intval($category->id));
return true;
}
-
+
public function uninstall()
{
foreach ($this->available_languages as $iso=>$lang)
Configuration::deleteByName(TSBuyerProtection::PREFIX_TABLE.'CERTIFICATE_'.strtoupper($iso));
-
+
$category = new Category((int)TSBuyerProtection::$CAT_ID);
$category->delete();
Configuration::deleteByName(TSBuyerProtection::PREFIX_TABLE.'CAT_ID');
@@ -257,7 +257,7 @@ class TSBuyerProtection extends AbsTrustedShops
Configuration::deleteByName(TSBuyerProtection::PREFIX_TABLE.'ENV_API');
return true;
}
-
+
/**
* Just for return the file path
* @return string
@@ -266,11 +266,11 @@ class TSBuyerProtection extends AbsTrustedShops
{
return $this->site_url.'modules/'.self::$module_name.'/cron_garantee.php';
}
-
+
/**
* This method is used to access of TrustedShops API
* from a SoapClient object.
- *
+ *
* @uses TSBuyerProtection::$webservice_urls with TSBuyerProtection::$ENV_API
* To get the api url according to the environment (test or production)
* @param string $type
@@ -282,11 +282,11 @@ class TSBuyerProtection extends AbsTrustedShops
$client = new SoapClient($url);
return $client;
}
-
+
/**
* Checks the Trusted Shops IDs entered in the shop administration
* and returns the characteristics of the corresponding certificate.
- *
+ *
* @uses TSBuyerProtection::_getClient()
* @param string $certificate certificate code already send by Trusted Shops
*/
@@ -307,13 +307,13 @@ class TSBuyerProtection extends AbsTrustedShops
} catch (SoapFault $fault) {
$this->errors[] = $this->l('Code #').$fault->faultcode.', '.$this->l('message:').$fault->faultstring;
}
-
+
if(is_int($validation))
throw new TSBPException($validation, TSBPException::ADMINISTRATION);
-
+
if (!$validation OR array_key_exists($validation->stateEnum, $array_state))
{
- if ($validation->stateEnum === 'TEST' || $validation->stateEnum === 'PRODUCTION')
+ if ($validation->stateEnum === 'TEST' || $validation->stateEnum === 'PRODUCTION' || $validation->stateEnum === 'INTEGRATION')
{
$this->confirmations[] = $array_state[$validation->stateEnum];
return $validation;
@@ -329,10 +329,10 @@ class TSBuyerProtection extends AbsTrustedShops
$this->errors[] = $this->l('Unknown error.');
}
}
-
+
/**
* Checks the shop's web service access credentials.
- *
+ *
* @uses TSBuyerProtection::_getClient()
* @param string $ts_id
* @param string $user
@@ -349,14 +349,14 @@ class TSBuyerProtection extends AbsTrustedShops
}
if ($return < 0)
throw new TSBPException($return, TSBPException::ADMINISTRATION);
-
+
return true;
}
-
+
/**
- * Returns the characteristics of the buyer protection products
+ * Returns the characteristics of the buyer protection products
* that are allocated individually to each certificate by Trusted Shops.
- *
+ *
* @uses TSBuyerProtection::_getClient()
* @param string $ts_id
*/
@@ -372,10 +372,10 @@ class TSBuyerProtection extends AbsTrustedShops
return $items->item;
return false;
}
-
+
/**
* Check validity for params required for TSBuyerProtection::_requestForProtectionV2()
- *
+ *
* @param array $params
*/
private function _requestForProtectionV2ParamsValidator(array $params)
@@ -413,7 +413,7 @@ class TSBuyerProtection extends AbsTrustedShops
if(isset($key['ereg']))
$bool_flag = !preg_match($key['ereg'], $params[$key['name']]) ? false : $bool_flag ;
}
-
+
if (!$bool_flag)
{
$this->errors[] = sprintf($this->l('The field %s is wrong, please ensure it was correctly filled.'), $key['name']);
@@ -421,13 +421,13 @@ class TSBuyerProtection extends AbsTrustedShops
}
}
return $bool_flag;
-
+
}
-
+
/**
* Create the Buyer Protection application by the web service.
* Applications are saved by Trusted Shops and are processed at regular intervals.
- *
+ *
* @uses TSBuyerProtection::_getClient()
* @uses TSBuyerProtection::_requestForProtectionV2ParamsValidator()
* to check required params
@@ -445,13 +445,13 @@ class TSBuyerProtection extends AbsTrustedShops
WHERE `id_order` = "'.$params['shopOrderID'].'"
';
$order = Db::getInstance()->ExecuteS($sql);
-
+
// If an order was already added, no need to continue.
// Otherwise a new application is created by TrustedShops.
// this can occured when order confirmation page is reload.
if(isset($order[0]))
return false;
-
+
if ($testing_params)
{
try {
@@ -467,7 +467,7 @@ class TSBuyerProtection extends AbsTrustedShops
{
$date = date('Y-m-d H:i:s');
$sql = '
- INSERT INTO `'._DB_PREFIX_.TSBuyerProtection::DB_APPLI.'`
+ INSERT INTO `'._DB_PREFIX_.TSBuyerProtection::DB_APPLI.'`
(
`id_application`,
`ts_id`,
@@ -485,7 +485,7 @@ class TSBuyerProtection extends AbsTrustedShops
)
';
Db::getInstance()->Execute($sql);
-
+
// To reset product quantity in database.
$sql = '
SELECT `id_product`
@@ -501,13 +501,13 @@ class TSBuyerProtection extends AbsTrustedShops
else
$this->errors[] = $this->l('Some parameters sending to "requestForProtectionV2" method are wrong or missing.');
}
-
+
/**
* With the getRequestState() method,
- * the status of a guarantee application is requested
+ * the status of a guarantee application is requested
* and in the event of a successful transaction,
* the guarantee number is returned.
- *
+ *
* @uses TSBuyerProtection::_getClient()
* @param array $params
* @throws TSBPException
@@ -527,22 +527,22 @@ class TSBuyerProtection extends AbsTrustedShops
}
return $code;
}
-
+
/**
- * Check statut of last applications
+ * Check statut of last applications
* saved with TSBuyerProtection::_requestForProtectionV2()
- *
+ *
* Negative value means an error occured.
* Error code are managed in TSBPException.
* @see (exception) TSBPException::_getFrontEndMessage() method
- *
- * Trusted Shops recommends that the request
+ *
+ * Trusted Shops recommends that the request
* should be automated by a cronjob with an interval of 10 minutes.
* @see /../cron_garantee.php
- *
+ *
* A message is added to the sheet order in Back-office,
* @see Message class
- *
+ *
* @uses TSBuyerProtection::_getRequestState()
* @uses Message class
* @return void
@@ -584,10 +584,10 @@ class TSBuyerProtection extends AbsTrustedShops
$msg->add();
}
}
-
+
/**
* Registration link to Trusted Shops
- *
+ *
* @param string $shopsw
* @param string $et_cid
* @param string $et_lid
@@ -601,22 +601,22 @@ class TSBuyerProtection extends AbsTrustedShops
return $this->registration_link[$lang].sprintf('?shopsw=%s&et_cid=%s&et_lid=%s', urlencode($shopsw), urlencode($et_cid), urlencode($et_lid));
return false;
}
-
+
/**
* Method to display or redirect the subscription link.
- *
+ *
* @param string $link
*/
private function _getRegistrationLink($link)
{
-
+
return '
';
}
-
+
/**
* saved paramter to acces of particular subscribtion link.
- *
+ *
* @return string the registration link.
*/
private function _submitRegistrationLink()
@@ -625,7 +625,7 @@ class TSBuyerProtection extends AbsTrustedShops
TSBuyerProtection::$SHOPSW = (Validate::isCleanHtml(Tools::getValue('shopsw'))) ? Tools::getValue('shopsw') : '';
TSBuyerProtection::$ET_CID = (Validate::isCleanHtml(Tools::getValue('et_cid'))) ? Tools::getValue('et_cid') : '';
TSBuyerProtection::$ET_LID = (Validate::isCleanHtml(Tools::getValue('et_lid'))) ? Tools::getValue('et_lid') : '';
-
+
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'SHOPSW', TSBuyerProtection::$SHOPSW);
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'ET_CID', TSBuyerProtection::$ET_CID);
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'ET_LID', TSBuyerProtection::$ET_LID);
@@ -633,12 +633,12 @@ class TSBuyerProtection extends AbsTrustedShops
$this->confirmations[] = $this->l('Registration link has been created. Follow this link if you was not redirected ealier:').' >'.$this->l('Link').'<';
return $link_registration;
}
-
+
/**
* Save in special database each buyer protection product for a certificate,
* Each Trusted Shops particular characteristics is saved.
* Create a product in Prestashop database to allow added each of them in cart.
- *
+ *
* @param array|stdClass $protection_items
* @param string $ts_id
*/
@@ -651,12 +651,12 @@ class TSBuyerProtection extends AbsTrustedShops
LEFT JOIN `ps_product_lang` AS pl ON ts.`id_product` = pl.`id_product`
WHERE ts.`ts_id`="'.$ts_id.'"';
Db::getInstance()->Execute($sql);
-
+
foreach ($protection_items as $key=>$item)
{
//add hidden product
$product = new Product();
- foreach ($this->available_languages as $iso=>$lang)
+ foreach ($this->available_languages as $iso=>$lang)
{
$language = Language::getIdByIso(strtolower($iso));
if ((int)$language !== 0)
@@ -665,7 +665,7 @@ class TSBuyerProtection extends AbsTrustedShops
$product->link_rewrite[$language] = 'trustedshops_garantee';
}
}
-
+
// If the default lang is different than available languages :
// (Bug occurred otherwise)
if (!array_key_exists(Language::getIsoById((int)Configuration::get('PS_LANG_DEFAULT')), $this->available_languages))
@@ -679,7 +679,7 @@ class TSBuyerProtection extends AbsTrustedShops
$product->active = true;
$product->id_tax = 0;
$product->add();
-
+
if ($product->id)
{
$sql = '
@@ -713,11 +713,11 @@ class TSBuyerProtection extends AbsTrustedShops
}
}
}
-
+
/**
* Check and add a Trusted Shops certificate in shop.
- *
- * @uses TSBuyerProtection::_getProtectionItems()
+ *
+ * @uses TSBuyerProtection::_getProtectionItems()
* to get all buyer protection products from Trusted Shops
* @uses TSBuyerProtection::_saveProtectionItems()
* to save buyer protection products in shop
@@ -734,7 +734,7 @@ class TSBuyerProtection extends AbsTrustedShops
if ($checked_certificate)
{
TSBuyerProtection::$CERTIFICATE[strtoupper($checked_certificate->certificationLanguage)] = array('stateEnum'=>$checked_certificate->stateEnum, 'typeEnum'=>$checked_certificate->typeEnum, 'url'=>$checked_certificate->url, 'tsID'=>$checked_certificate->tsID, 'user'=>'', 'password'=>'');
-
+
// update the configuration var
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'CERTIFICATE_'.strtoupper($checked_certificate->certificationLanguage), Tools::htmlentitiesUTF8(Tools::jsonEncode(TSBuyerProtection::$CERTIFICATE[strtoupper($checked_certificate->certificationLanguage)])));
$this->confirmations[] = $this->l('Certificate has been well added.');
@@ -752,11 +752,11 @@ class TSBuyerProtection extends AbsTrustedShops
}
return false;
}
-
+
/**
* Apply delete or edit action to a certificate
- *
- * @return boolean|array
+ *
+ * @return boolean|array
* - false if action concerned multiple certificate
* (in normal way, this never occured )
* - return required $certificate to edit.
@@ -771,7 +771,7 @@ class TSBuyerProtection extends AbsTrustedShops
$this->errors[] = $this->l('You must edit or delete a Certificate one per one');
return false;
}
-
+
// delete action :
if (is_array($delete) AND isset(TSBuyerProtection::$CERTIFICATE[$delete[0]]['tsID']))
{
@@ -782,7 +782,7 @@ class TSBuyerProtection extends AbsTrustedShops
.' "'.$certificate_to_delete.'" ('.$this->l('language').' : '.$delete[0].') '
.$this->l('has been well deleted');
}
-
+
// edit action :
if (is_array($edit))
{
@@ -792,12 +792,12 @@ class TSBuyerProtection extends AbsTrustedShops
}
return true;
}
-
+
/**
* Change the certificate values.
- * concerns only excellence certificate
+ * concerns only excellence certificate
* for payment type, login and password values.
- *
+ *
* @uses TSBuyerProtection::_checkLogin()
* @return true;
*/
@@ -816,7 +816,7 @@ class TSBuyerProtection extends AbsTrustedShops
foreach ($all_payment_type as $key=>$module_id)
TSBuyerProtection::$CERTIFICATE[$iso_lang]['payment_type'][(string)$key] = $module_id;
}
-
+
$check_login = false;
try {
$check_login = $this->_checkLogin(TSBuyerProtection::$CERTIFICATE[$iso_lang]['tsID'], $user, $password);
@@ -829,7 +829,7 @@ class TSBuyerProtection extends AbsTrustedShops
TSBuyerProtection::$CERTIFICATE[$iso_lang]['password'] = $password;
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'CERTIFICATE_'.$iso_lang, Tools::htmlentitiesUTF8(Tools::jsonEncode(TSBuyerProtection::$CERTIFICATE[$iso_lang])));
$this->confirmations[] = $this->l('Certificate login has been well added.');
-
+
}
}
else
@@ -838,7 +838,7 @@ class TSBuyerProtection extends AbsTrustedShops
}
return true;
}
-
+
/**
* Change the environment for working.
* Not use anymore but keeped
@@ -859,10 +859,10 @@ class TSBuyerProtection extends AbsTrustedShops
TSBuyerProtection::$ENV_API = $env_api;
Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'ENV_API', TSBuyerProtection::$ENV_API);
}
-
+
/**
* Dispatch post process depends on each formular
- *
+ *
* @return array depend on the needs about each formular.
*/
private function _preProcess()
@@ -878,10 +878,10 @@ class TSBuyerProtection extends AbsTrustedShops
$posts_return['change_certificate'] = $this->_submitChangeCertificate();
return $posts_return;
}
-
+
/**
* Display each formaular in back-office
- *
+ *
* @see Module::getContent()
* @return string for displaying form.
*/
@@ -899,12 +899,12 @@ class TSBuyerProtection extends AbsTrustedShops
$out .= ' ';
$out .= $this->_displayFormAddCertificate();
$out .= ' ';
-
+
$bool_display_certificats = false;
if (is_array(self::$CERTIFICATE))
foreach (self::$CERTIFICATE as $certif)
$bool_display_certificats = (isset($certif['tsID']) && $certif['tsID'] != '')? true : $bool_display_certificats;
-
+
if ($bool_display_certificats)
$out .= $this->_displayFormCertificatesList();
if (isset($posts_return['edit_certificate']) && $posts_return['edit_certificate'] &&
@@ -1045,7 +1045,7 @@ class TSBuyerProtection extends AbsTrustedShops
$out .= '';
} else {
$out .= $this->l('No need');
- }
+ }
$out .= '
';
@@ -1060,16 +1060,16 @@ class TSBuyerProtection extends AbsTrustedShops
';
return $out;
}
-
+
/**
* Check if a module is payment module.
- *
- * Method instanciate a $module by its name,
- * Module::getInstanceByName() rather than Module::getInstanceById()
+ *
+ * Method instanciate a $module by its name,
+ * Module::getInstanceByName() rather than Module::getInstanceById()
* is used for cache improvement and avoid an sql request.
- *
+ *
* Method test if PaymentMethod::getCurrency() is a method from the module.
- *
+ *
* @see Module::getInstanceByName() in classes/Module.php
* @param string $module name of the module
*/
@@ -1077,7 +1077,7 @@ class TSBuyerProtection extends AbsTrustedShops
{
$return = false;
$module = Module::getInstanceByName($module);
-
+
if (method_exists($module, 'getCurrency')){
$return = clone $module;
}
@@ -1106,7 +1106,7 @@ class TSBuyerProtection extends AbsTrustedShops
});
TSPayment.init();
});
-
+
'.$this->l('Back to list').'.' "'.($value ? $this->l('Enabled') : $this->l('Disabled')).'")
';
diff --git a/classes/Cart.php b/classes/Cart.php
index 1d4c0b724..f5a4bd249 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -684,13 +684,13 @@ class CartCore extends ObjectModel
self::$_nbProducts = NULL;
if ((int)($id_customization))
{
- $productTotalQuantity = (int)(Db::getInstance()->getValue('SELECT `quantity`
- FROM `'._DB_PREFIX_.'cart_product`
+ $productTotalQuantity = (int)(Db::getInstance()->getValue('SELECT `quantity`
+ FROM `'._DB_PREFIX_.'cart_product`
WHERE `id_product` = '.(int)($id_product).' AND `id_product_attribute` = '.(int)($id_product_attribute)));
- $customizationQuantity = (int)(Db::getInstance()->getValue('SELECT `quantity`
- FROM `'._DB_PREFIX_.'customization`
- WHERE `id_cart` = '.(int)($this->id).'
- AND `id_product` = '.(int)($id_product).'
+ $customizationQuantity = (int)(Db::getInstance()->getValue('SELECT `quantity`
+ FROM `'._DB_PREFIX_.'customization`
+ WHERE `id_cart` = '.(int)($this->id).'
+ AND `id_product` = '.(int)($id_product).'
AND `id_product_attribute` = '.(int)($id_product_attribute)));
if (!$this->_deleteCustomization((int)($id_customization), (int)($id_product), (int)($id_product_attribute)))
return false;
@@ -719,7 +719,7 @@ class CartCore extends ObjectModel
}
/**
- * Delete a customization from the cart. If customization is a Picture (type=2),
+ * Delete a customization from the cart. If customization is a Picture (type=2),
* then the image is also deleted
*
* @param integer $id_customization
@@ -729,7 +729,7 @@ class CartCore extends ObjectModel
{
$result = true;
$customization = Db::getInstance()->getRow('SELECT *
- FROM `'._DB_PREFIX_.'customization`
+ FROM `'._DB_PREFIX_.'customization`
WHERE `id_customization` = '.(int)($id_customization));
if ($customization and sizeof($customization))
@@ -737,7 +737,7 @@ class CartCore extends ObjectModel
$custData = Db::getInstance()->getRow('SELECT *
FROM `'._DB_PREFIX_.'customized_data`
WHERE `id_customization` = '.(int)($id_customization));
-
+
if (isset($custData['type']) and $custData['type'] == 0)
$result &= $this->deletePictureToProduct($id_product,$custData['value']);
@@ -748,15 +748,15 @@ class CartCore extends ObjectModel
if($result)
$result &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'cart_product`
SET `quantity` = `quantity` - '.(int)($customization['quantity']).'
- WHERE `id_cart` = '.(int)($this->id).'
- AND `id_product` = '.(int)($id_product).((int)($id_product_attribute) ? '
+ WHERE `id_cart` = '.(int)($this->id).'
+ AND `id_product` = '.(int)($id_product).((int)($id_product_attribute) ? '
AND `id_product_attribute` = '.(int)($id_product_attribute) : ''));
if (!$result)
return false;
- return Db::getInstance()->Execute('DELETE
- FROM `'._DB_PREFIX_.'customization`
+ return Db::getInstance()->Execute('DELETE
+ FROM `'._DB_PREFIX_.'customization`
WHERE `id_customization` = '.(int)($id_customization));
}
@@ -829,8 +829,10 @@ class CartCore extends ObjectModel
if ($withTaxes)
{
- $total_price = ($total_price - $total_ecotax) * (1 + (float)(Tax::getProductTaxRate((int)$product['id_product'], (int)$this->{Configuration::get('PS_TAX_ADDRESS_TYPE')})) / 100);
- $total_price = Tools::ps_round($total_price - $total_ecotax, 2);
+ $total_price = ($total_price - $total_ecotax) * (1 + (float)(Tax::getProductTaxRate((int)$product['id_product'], (int)$this->{Configuration::get('PS_TAX_ADDRESS_TYPE')})) / 100);
+ $total_ecotax = $total_ecotax * (1 + Tax::getProductEcotaxRate((int)$this->{Configuration::get('PS_TAX_ADDRESS_TYPE')}) / 100);
+ $total_price = Tools::ps_round($total_price + $total_ecotax, 2);
+
}
}
else
@@ -971,18 +973,12 @@ class CartCore extends ObjectModel
// If no carrier, select default one
if (!$id_carrier)
$id_carrier = $this->id_carrier;
- if (empty($id_carrier))
- {
- $carrier = new Carrier((int)(Configuration::get('PS_CARRIER_DEFAULT')), Configuration::get('PS_LANG_DEFAULT'));
- if (($carrier->getShippingMethod() == Carrier::SHIPPING_METHOD_WEIGHT AND (Carrier::checkDeliveryPriceByWeight((int)(Configuration::get('PS_CARRIER_DEFAULT')), $this->getTotalWeight(), $id_zone)))
- OR ($carrier->getShippingMethod() == Carrier::SHIPPING_METHOD_PRICE AND (Carrier::checkDeliveryPriceByPrice((int)(Configuration::get('PS_CARRIER_DEFAULT')), $this->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING), $id_zone, (int)($this->id_currency)))))
- {
+ if ($id_carrier && !$this->isCarrierInRange($id_carrier, $id_zone))
+ $id_carrier = '';
+
+ if (empty($id_carrier) && $this->isCarrierInRange(Configuration::get('PS_CARRIER_DEFAULT'), $id_zone))
$id_carrier = (int)(Configuration::get('PS_CARRIER_DEFAULT'));
- }
-
- unset($carrier);
- }
if (empty($id_carrier))
{
@@ -1255,6 +1251,7 @@ class CartCore extends ObjectModel
$invoice = new Address((int)($this->id_address_invoice));
$total_tax = $this->getOrderTotal() - $this->getOrderTotal(false);
+
if ($total_tax < 0)
$total_tax = 0;
@@ -1540,5 +1537,31 @@ class CartCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'cart` ca ON (ca.`id_customer` = cu.`id_customer`)
WHERE ca.`id_cart` = '.(int)$id_cart);
}
+
+ /**
+ * isCarrierInRange
+ *
+ * Check if the specified carrier is in range
+ *
+ * @id_carrier int
+ * @id_zone int
+ */
+ public function isCarrierInRange($id_carrier, $id_zone)
+ {
+ $carrier = new Carrier((int)$id_carrier, Configuration::get('PS_LANG_DEFAULT'));
+ $is_in_zone = false;
+ $order_total = $this->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING);
+
+ if (($carrier->getShippingMethod() == Carrier::SHIPPING_METHOD_WEIGHT
+ AND (Carrier::checkDeliveryPriceByWeight((int)$id_carrier, $this->getTotalWeight(), $id_zone)))
+ OR ($carrier->getShippingMethod() == Carrier::SHIPPING_METHOD_PRICE
+ AND (Carrier::checkDeliveryPriceByPrice((int)$id_carrier, $order_total, $id_zone, (int)($this->id_currency)))))
+ {
+ $is_in_zone = true;
+ }
+
+ unset($carrier);
+ return $is_in_zone;
+ }
}
diff --git a/classes/Country.php b/classes/Country.php
index 07a4c214c..ce4cad4fe 100644
--- a/classes/Country.php
+++ b/classes/Country.php
@@ -56,6 +56,9 @@ class CountryCore extends ObjectModel
/** @var string Zip Code Format */
public $zip_code_format;
+ /** @var boolean Display or not the tax incl./tax excl. mention in the front office */
+ public $display_tax_label = true;
+
/** @var boolean Status for delivery */
public $active = true;
@@ -63,9 +66,9 @@ class CountryCore extends ObjectModel
protected $tables = array ('country', 'country_lang');
- protected $fieldsRequired = array('id_zone', 'id_currency', 'iso_code', 'contains_states', 'need_identification_number');
+ protected $fieldsRequired = array('id_zone', 'id_currency', 'iso_code', 'contains_states', 'need_identification_number', 'display_tax_label');
protected $fieldsSize = array('iso_code' => 3);
- protected $fieldsValidate = array('id_zone' => 'isUnsignedId', 'id_currency' => 'isUnsignedId', 'call_prefix' => 'isInt', 'iso_code' => 'isLanguageIsoCode', 'active' => 'isBool', 'contains_states' => 'isBool', 'need_identification_number' => 'isBool', 'need_zip_code' => 'isBool', 'zip_code_format' => 'isZipCodeFormat');
+ protected $fieldsValidate = array('id_zone' => 'isUnsignedId', 'id_currency' => 'isUnsignedId', 'call_prefix' => 'isInt', 'iso_code' => 'isLanguageIsoCode', 'active' => 'isBool', 'contains_states' => 'isBool', 'need_identification_number' => 'isBool', 'need_zip_code' => 'isBool', 'zip_code_format' => 'isZipCodeFormat', 'display_tax_label' => 'isBool');
protected $fieldsRequiredLang = array('name');
protected $fieldsSizeLang = array('name' => 64);
protected $fieldsValidateLang = array('name' => 'isGenericName');
@@ -93,6 +96,7 @@ class CountryCore extends ObjectModel
$fields['need_identification_number'] = (int)($this->need_identification_number);
$fields['need_zip_code'] = (int)($this->need_zip_code);
$fields['zip_code_format'] = $this->zip_code_format;
+ $fields['display_tax_label'] = $this->display_tax_label;
return $fields;
}
@@ -291,27 +295,27 @@ class CountryCore extends ObjectModel
AND `id_lang` = '.(int)$id_lang
);
}
-
+
public function isNeedDni()
{
return (bool)self::isNeedDniByCountryId($this->id);
}
-
+
static public function isNeedDniByCountryId($id_country)
{
return (bool)Db::getInstance()->getValue('
- SELECT `need_identification_number`
+ SELECT `need_identification_number`
FROM `'._DB_PREFIX_.'country`
WHERE `id_country` = '.(int)$id_country);
}
-
+
static public function containsStates($id_country)
{
return (bool)Db::getInstance()->getValue('
- SELECT `contains_states`
+ SELECT `contains_states`
FROM `'._DB_PREFIX_.'country`
WHERE `id_country` = '.(int)$id_country);
}
-
+
}
diff --git a/classes/FrontController.php b/classes/FrontController.php
index ebf321d0f..638dc188f 100755
--- a/classes/FrontController.php
+++ b/classes/FrontController.php
@@ -71,7 +71,7 @@ class FrontControllerCore
public function init()
{
global $cookie, $smarty, $cart, $iso, $defaultCountry, $protocol_link, $protocol_content, $link, $css_files, $js_files;
-
+
$css_files = array();
$js_files = array();
@@ -135,7 +135,10 @@ class FrontControllerCore
if ($cart->OrderExists())
unset($cookie->id_cart, $cart);
/* Delete product of cart, if user can't make an order from his country */
- elseif (intval(Configuration::get('PS_GEOLOCATION_ENABLED')) AND !in_array(strtoupper($cookie->iso_code_country), explode(';', Configuration::get('PS_ALLOWED_COUNTRIES'))) AND $cart->nbProducts() AND intval(Configuration::get('PS_GEOLOCATION_NA_BEHAVIOR')) != -1)
+ elseif (intval(Configuration::get('PS_GEOLOCATION_ENABLED')) AND
+ !in_array(strtoupper($cookie->iso_code_country), explode(';', Configuration::get('PS_ALLOWED_COUNTRIES'))) AND
+ $cart->nbProducts() AND intval(Configuration::get('PS_GEOLOCATION_NA_BEHAVIOR')) != -1 AND
+ !self::isInWhitelistForGeolocation())
unset($cookie->id_cart, $cart);
elseif ($cookie->id_customer != $cart->id_customer OR $cookie->id_lang != $cart->id_lang OR $cookie->id_currency != $cart->id_currency)
{
@@ -203,6 +206,15 @@ class FrontControllerCore
Product::initPricesComputation();
+ $display_tax_label = $defaultCountry->display_tax_label;
+ if ($cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')})
+ {
+ $infos = Address::getCountryAndState((int)($cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')}));
+ $country = new Country((int)$infos['id_country']);
+ if (Validate::isLoadedObject($country))
+ $display_tax_label = $country->display_tax_label;
+ }
+
$smarty->assign(array(
'link' => $link,
'cart' => $cart,
@@ -225,6 +237,7 @@ class FrontControllerCore
'shop_name' => Configuration::get('PS_SHOP_NAME'),
'roundMode' => (int)Configuration::get('PS_PRICE_ROUND_MODE'),
'use_taxes' => (int)Configuration::get('PS_TAX'),
+ 'display_tax_label' => (bool)$display_tax_label,
'vat_management' => (int)Configuration::get('VATNUMBER_MANAGEMENT'),
'opc' => (bool)Configuration::get('PS_ORDER_PROCESS_TYPE'),
'PS_CATALOG_MODE' => (bool)Configuration::get('PS_CATALOG_MODE')
@@ -275,7 +288,7 @@ class FrontControllerCore
if (Tools::isSubmit('live_edit') AND $ad = Tools::getValue('ad') AND (Tools::getValue('liveToken') == sha1(Tools::getValue('ad')._COOKIE_KEY_)))
if (!is_dir(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$ad))
die(Tools::displayError());
-
+
$this->iso = $iso;
$this->setMedia();
@@ -284,7 +297,7 @@ class FrontControllerCore
/* Display a maintenance page if shop is closed */
protected function displayMaintenancePage()
{
-
+
if (!in_array(Tools::getRemoteAddr(), explode(',', Configuration::get('PS_MAINTENANCE_IP'))))
{
header('HTTP/1.1 503 temporarily overloaded');
@@ -297,7 +310,7 @@ class FrontControllerCore
protected function displayRestrictedCountryPage()
{
global $smarty;
-
+
header('HTTP/1.1 503 temporarily overloaded');
$smarty->display(_PS_THEME_DIR_.'restricted-country.tpl');
exit;
@@ -306,7 +319,7 @@ class FrontControllerCore
protected function canonicalRedirection()
{
global $link, $cookie;
-
+
if (Configuration::get('PS_CANONICAL_REDIRECT'))
{
// Automatically redirect to the canonical URL if needed
@@ -392,13 +405,13 @@ class FrontControllerCore
public function setMedia()
{
global $cookie;
-
+
Tools::addCSS(_THEME_CSS_DIR_.'global.css', 'all');
Tools::addJS(array(_PS_JS_DIR_.'tools.js', _PS_JS_DIR_.'jquery/jquery-1.4.4.min.js', _PS_JS_DIR_.'jquery/jquery.easing.1.3.js'));
if (Tools::isSubmit('live_edit') AND $ad = Tools::getValue('ad') AND (Tools::getValue('liveToken') == sha1(Tools::getValue('ad')._COOKIE_KEY_)))
{
Tools::addJS(array(
- _PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js',
+ _PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js',
_PS_JS_DIR_.'jquery/jquery.fancybox-1.3.4.js',
_PS_JS_DIR_.'hookLiveEdit.js')
);
@@ -453,7 +466,7 @@ class FrontControllerCore
if (Configuration::get('PS_JS_THEME_CACHE'))
Tools::cccJs();
}
-
+
self::$smarty->assign('css_files', $css_files);
self::$smarty->assign('js_files', array_unique($js_files));
self::$smarty->display(_PS_THEME_DIR_.'header.tpl');
diff --git a/classes/Language.php b/classes/Language.php
index 4e13a1f80..bd0d2aa60 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -277,6 +277,7 @@ class LanguageCore extends ObjectModel
$langTables[] = $t;
Db::getInstance()->Execute('SET @id_lang_default = (SELECT c.`value` FROM `'._DB_PREFIX_.'configuration` c WHERE c.`name` = \'PS_LANG_DEFAULT\' LIMIT 1)');
+ $return = true;
foreach($langTables as $name)
{
$fields = '';
@@ -293,8 +294,9 @@ class LanguageCore extends ObjectModel
$sql .= '(SELECT `'.$column['Field'].'` FROM `'.$name.'` tl WHERE tl.`id_lang` = @id_lang_default AND tl.`'.$identifier.'` = `'.str_replace('_lang', '', $name).'`.`'.$identifier.'`), ';
$sql = rtrim($sql, ', ');
$sql .= ' FROM `'._DB_PREFIX_.'lang` CROSS JOIN `'.str_replace('_lang', '', $name).'`) ;';
- Db::getInstance()->Execute(pSQL($sql));
+ $return &= Db::getInstance()->Execute(pSQL($sql));
}
+ return $return;
}
public static function recurseDeleteDir($dir)
diff --git a/classes/Module.php b/classes/Module.php
index eb426db1e..932520c06 100644
--- a/classes/Module.php
+++ b/classes/Module.php
@@ -539,6 +539,7 @@ abstract class ModuleCore
*/
public static function getNonNativeModuleList()
{
+ $db = Db::getInstance();
$modulesDirOnDisk = Module::getModulesDirOnDisk();
$module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'modules_list.xml';
@@ -552,7 +553,7 @@ abstract class ModuleCore
$arrNativeModules[] = '"'.pSQL($module['name']).'"';
}
- return Db::getInstance()->ExecuteS('
+ return $db->ExecuteS('
SELECT *
FROM `'._DB_PREFIX_.'module` m
WHERE name NOT IN ('.implode(',',$arrNativeModules).') ');
diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 3306d1e6b..aa0aafcc8 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -452,7 +452,15 @@ abstract class ObjectModelCore
return ((is_array($_FIELDS) AND array_key_exists($key, $_FIELDS)) ? ($htmlentities ? htmlentities($_FIELDS[$key], ENT_QUOTES, 'utf-8') : $_FIELDS[$key]) : $field);
}
+ /**
+ * TODO: refactor rename all calls to this to validateController
+ */
public function validateControler($htmlentities = true)
+ {
+ return $this->validateController($htmlentities);
+ }
+
+ public function validateController($htmlentities = true)
{
$errors = array();
diff --git a/classes/Order.php b/classes/Order.php
index 9abf777fb..2fcc7a497 100644
--- a/classes/Order.php
+++ b/classes/Order.php
@@ -288,17 +288,25 @@ class OrderCore extends ObjectModel
$this->total_products -= $productPriceWithoutTax;
$this->total_products_wt -= $productPrice;
$this->total_shipping = $cart->getOrderShippingCost();
+
/* It's temporary fix for 1.3 version... */
if ($orderDetail->product_quantity_discount != '0.000000')
$this->total_paid -= ($productPrice + $shippingDiff);
else
$this->total_paid = $cart->getOrderTotal();
+
$this->total_paid_real -= ($productPrice + $shippingDiff);
/* Prevent from floating precision issues (total_products has only 2 decimals) */
if ($this->total_products < 0)
$this->total_products = 0;
+ if ($this->total_paid < 0)
+ $this->total_paid = 0;
+
+ if ($this->total_paid_real < 0)
+ $this->total_paid_real = 0;
+
/* Prevent from floating precision issues */
$this->total_paid = number_format($this->total_paid, 2, '.', '');
$this->total_paid_real = number_format($this->total_paid_real, 2, '.', '');
diff --git a/classes/PDF.php b/classes/PDF.php
index 4fe6c70f0..24dc60df8 100644
--- a/classes/PDF.php
+++ b/classes/PDF.php
@@ -278,23 +278,51 @@ class PDFCore extends PDF_PageGroupCore
$pdf->SetY(25);
$pdf->SetFont(self::fontname(), '', 9);
- if (!empty($delivery_address->company))
+
+
+ $ordered_adr_fields = AddressFormat::getOrderedAddressFields($invoice_address->id_country);
+
+ $optional_fields = array(
+ 'address2' => 1
+ , 'company' => 1
+ );
+ $ignore_fields = array(
+ 'phone' => 1
+ , 'mobile_phone' =>1
+ );
+
+ foreach ($ordered_adr_fields as $adr_line)
{
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->company), 0, 'L');
- $pdf->Ln(5);
+ $line_fields = explode(" ", trim($adr_line));
+ $tmp_dlv_vals = array();
+
+ foreach($line_fields as $field_name)
+ {
+ // if not skip
+ if (!isset($ignore_fields[$field_name]))
+ {
+ $tmp_dlv = $delivery_address->{$field_name};
+
+ if (!((empty($tmp_dlv) || $tmp_dlv == '') && isset($optional_fields[$field_name])))
+ {
+ $tmp_dlv = ($field_name == "country") ? $tmp_dlv.($deliveryState ? ' - '.$deliveryState->name : ''): $tmp_dlv;
+ $tmp_dlv_vals[] = Tools::iconv('utf-8', self::encoding(), $tmp_dlv);
+ }
+ }
+ }
+ $str_dlv_vals = implode(" ", $tmp_dlv_vals);
+
+ $need_nl = false;
+ if (!empty($str_dlv_vals) && $str_dlv_vals != '' && $str_dlv_vals != ' ')
+ {
+ $need_nl = true;
+ $pdf->Cell($width, 10, $str_dlv_vals, 0, 'L');
+ }
+
+ if ($need_nl)
+ $pdf->Ln(5);
+
}
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->firstname).' '.Tools::iconv('utf-8', self::encoding(), $delivery_address->lastname), 0, 'L');
- $pdf->Ln(5);
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->address1), 0, 'L');
- $pdf->Ln(5);
- if (!empty($delivery_address->address2))
- {
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->address2), 0, 'L');
- $pdf->Ln(5);
- }
- $pdf->Cell($width, 10, $delivery_address->postcode.' '.Tools::iconv('utf-8', self::encoding(), $delivery_address->city), 0, 'L');
- $pdf->Ln(5);
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->country.($deliveryState ? ' - '.$deliveryState->name : '')), 0, 'L');
/*
* display order information
@@ -403,6 +431,17 @@ class PDFCore extends PDF_PageGroupCore
$delivery_address = new Address((int)($order->id_address_delivery));
$deliveryState = $delivery_address->id_state ? new State($delivery_address->id_state) : false;
+ $ordered_adr_fields = AddressFormat::getOrderedAddressFields($invoice_address->id_country);
+
+ $optional_fields = array(
+ 'address2' => 1
+ , 'company' => 1
+ );
+ $ignore_fields = array(
+ 'phone' => 1
+ , 'mobile_phone' =>1
+ );
+
$width = 100;
$pdf->SetX(10);
@@ -413,30 +452,53 @@ class PDFCore extends PDF_PageGroupCore
$pdf->Ln(5);
$pdf->SetFont(self::fontname(), '', 9);
- if (!empty($delivery_address->company) OR !empty($invoice_address->company))
+
+ foreach ($ordered_adr_fields as $adr_line)
{
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->company), 0, 'L');
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $invoice_address->company), 0, 'L');
- $pdf->Ln(5);
+ $line_fields = explode(" ", trim($adr_line));
+
+ $tmp_inv_vals = array();
+ $tmp_dlv_vals = array();
+
+ foreach($line_fields as $field_name)
+ {
+ // if not skip
+ if (!isset($ignore_fields[$field_name]))
+ {
+ $tmp_inv = $invoice_address->{$field_name};
+ $tmp_dlv = $delivery_address->{$field_name};
+ if (!((empty($tmp_inv) || $tmp_inv == '') && isset($optional_fields[$field_name])))
+ {
+ $tmp_inv = ($field_name == "country") ? $tmp_inv.($deliveryState ? ' - '.$deliveryState->name : ''): $tmp_inv;
+ $tmp_inv_vals[] = Tools::iconv('utf-8', self::encoding(), $tmp_inv);
+ }
+ if (!((empty($tmp_dlv) || $tmp_dlv == '') && isset($optional_fields[$field_name])))
+ {
+ $tmp_dlv = ($field_name == "country") ? $tmp_dlv.($deliveryState ? ' - '.$deliveryState->name : ''): $tmp_dlv;
+ $tmp_dlv_vals[] = Tools::iconv('utf-8', self::encoding(), $tmp_dlv);
+ }
+ }
+ }
+ $str_inv_vals = implode(" ", $tmp_inv_vals);
+ $str_dlv_vals = implode(" ", $tmp_dlv_vals);
+
+ $need_nl = false;
+ if (!empty($str_dlv_vals) && $str_dlv_vals != '' && $str_dlv_vals != ' ')
+ {
+ $need_nl = true;
+ $pdf->Cell($width, 10, $str_dlv_vals, 0, 'L');
+ }
+ if (!empty($str_inv_vals) && $str_inv_vals != '' && $str_inv_vals != ' ')
+ {
+ $need_nl = true;
+ $pdf->Cell($width, 10, $str_inv_vals, 0, 'L');
+ }
+
+ if ($need_nl)
+ $pdf->Ln(5);
+
}
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->firstname).' '.Tools::iconv('utf-8', self::encoding(), $delivery_address->lastname), 0, 'L');
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $invoice_address->firstname).' '.Tools::iconv('utf-8', self::encoding(), $invoice_address->lastname), 0, 'L');
- $pdf->Ln(5);
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->address1), 0, 'L');
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $invoice_address->address1), 0, 'L');
- $pdf->Ln(5);
- if (!empty($invoice_address->address2) OR !empty($delivery_address->address2))
- {
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->address2), 0, 'L');
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $invoice_address->address2), 0, 'L');
- $pdf->Ln(5);
- }
- $pdf->Cell($width, 10, $delivery_address->postcode.' '.Tools::iconv('utf-8', self::encoding(), $delivery_address->city), 0, 'L');
- $pdf->Cell($width, 10, $invoice_address->postcode.' '.Tools::iconv('utf-8', self::encoding(), $invoice_address->city), 0, 'L');
- $pdf->Ln(5);
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $delivery_address->country.($deliveryState ? ' - '.$deliveryState->name : '')), 0, 'L');
- $pdf->Cell($width, 10, Tools::iconv('utf-8', self::encoding(), $invoice_address->country.($invoiceState ? ' - '.$invoiceState->name : '')), 0, 'L');
- $pdf->Ln(5);
+
if (Configuration::get('VATNUMBER_MANAGEMENT') AND !empty($invoice_address->vat_number))
{
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 2d8fb2c8c..725e4e0e7 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -367,6 +367,19 @@ abstract class PaymentModuleCore extends Module
'{firstname}' => $customer->firstname,
'{lastname}' => $customer->lastname,
'{email}' => $customer->email,
+ '{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"),
+ '{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"),
+ '{delivery_block_html}' => $this->_getFormatedAddress($delivery, "
'.$this->l('Layered navigation database was initialized successfully').'
@@ -147,21 +130,20 @@ class BlockLayered extends Module
}
elseif (Tools::isSubmit('submitLayeredSettings'))
{
- echo '
+ $html .= '
'.$this->l('This module is in beta version and will be improved in PrestaShop v1.4.1').'
'.$this->l('message:').$fault->faultstring; } - + if(is_int($validation)) throw new TSBPException($validation, TSBPException::ADMINISTRATION); - + if (!$validation OR array_key_exists($validation->stateEnum, $array_state)) { - if ($validation->stateEnum === 'TEST' || $validation->stateEnum === 'PRODUCTION') + if ($validation->stateEnum === 'TEST' || $validation->stateEnum === 'PRODUCTION' || $validation->stateEnum === 'INTEGRATION') { $this->confirmations[] = $array_state[$validation->stateEnum]; return $validation; @@ -329,10 +329,10 @@ class TSBuyerProtection extends AbsTrustedShops $this->errors[] = $this->l('Unknown error.'); } } - + /** * Checks the shop's web service access credentials. - * + * * @uses TSBuyerProtection::_getClient() * @param string $ts_id * @param string $user @@ -349,14 +349,14 @@ class TSBuyerProtection extends AbsTrustedShops } if ($return < 0) throw new TSBPException($return, TSBPException::ADMINISTRATION); - + return true; } - + /** - * Returns the characteristics of the buyer protection products + * Returns the characteristics of the buyer protection products * that are allocated individually to each certificate by Trusted Shops. - * + * * @uses TSBuyerProtection::_getClient() * @param string $ts_id */ @@ -372,10 +372,10 @@ class TSBuyerProtection extends AbsTrustedShops return $items->item; return false; } - + /** * Check validity for params required for TSBuyerProtection::_requestForProtectionV2() - * + * * @param array $params */ private function _requestForProtectionV2ParamsValidator(array $params) @@ -413,7 +413,7 @@ class TSBuyerProtection extends AbsTrustedShops if(isset($key['ereg'])) $bool_flag = !preg_match($key['ereg'], $params[$key['name']]) ? false : $bool_flag ; } - + if (!$bool_flag) { $this->errors[] = sprintf($this->l('The field %s is wrong, please ensure it was correctly filled.'), $key['name']); @@ -421,13 +421,13 @@ class TSBuyerProtection extends AbsTrustedShops } } return $bool_flag; - + } - + /** * Create the Buyer Protection application by the web service. * Applications are saved by Trusted Shops and are processed at regular intervals. - * + * * @uses TSBuyerProtection::_getClient() * @uses TSBuyerProtection::_requestForProtectionV2ParamsValidator() * to check required params @@ -445,13 +445,13 @@ class TSBuyerProtection extends AbsTrustedShops WHERE `id_order` = "'.$params['shopOrderID'].'" '; $order = Db::getInstance()->ExecuteS($sql); - + // If an order was already added, no need to continue. // Otherwise a new application is created by TrustedShops. // this can occured when order confirmation page is reload. if(isset($order[0])) return false; - + if ($testing_params) { try { @@ -467,7 +467,7 @@ class TSBuyerProtection extends AbsTrustedShops { $date = date('Y-m-d H:i:s'); $sql = ' - INSERT INTO `'._DB_PREFIX_.TSBuyerProtection::DB_APPLI.'` + INSERT INTO `'._DB_PREFIX_.TSBuyerProtection::DB_APPLI.'` ( `id_application`, `ts_id`, @@ -485,7 +485,7 @@ class TSBuyerProtection extends AbsTrustedShops ) '; Db::getInstance()->Execute($sql); - + // To reset product quantity in database. $sql = ' SELECT `id_product` @@ -501,13 +501,13 @@ class TSBuyerProtection extends AbsTrustedShops else $this->errors[] = $this->l('Some parameters sending to "requestForProtectionV2" method are wrong or missing.'); } - + /** * With the getRequestState() method, - * the status of a guarantee application is requested + * the status of a guarantee application is requested * and in the event of a successful transaction, * the guarantee number is returned. - * + * * @uses TSBuyerProtection::_getClient() * @param array $params * @throws TSBPException @@ -527,22 +527,22 @@ class TSBuyerProtection extends AbsTrustedShops } return $code; } - + /** - * Check statut of last applications + * Check statut of last applications * saved with TSBuyerProtection::_requestForProtectionV2() - * + * * Negative value means an error occured. * Error code are managed in TSBPException. * @see (exception) TSBPException::_getFrontEndMessage() method - * - * Trusted Shops recommends that the request + * + * Trusted Shops recommends that the request * should be automated by a cronjob with an interval of 10 minutes. * @see /../cron_garantee.php - * + * * A message is added to the sheet order in Back-office, * @see Message class - * + * * @uses TSBuyerProtection::_getRequestState() * @uses Message class * @return void @@ -584,10 +584,10 @@ class TSBuyerProtection extends AbsTrustedShops $msg->add(); } } - + /** * Registration link to Trusted Shops - * + * * @param string $shopsw * @param string $et_cid * @param string $et_lid @@ -601,22 +601,22 @@ class TSBuyerProtection extends AbsTrustedShops return $this->registration_link[$lang].sprintf('?shopsw=%s&et_cid=%s&et_lid=%s', urlencode($shopsw), urlencode($et_cid), urlencode($et_lid)); return false; } - + /** * Method to display or redirect the subscription link. - * + * * @param string $link */ private function _getRegistrationLink($link) { - + return ' '; } - + /** * saved paramter to acces of particular subscribtion link. - * + * * @return string the registration link. */ private function _submitRegistrationLink() @@ -625,7 +625,7 @@ class TSBuyerProtection extends AbsTrustedShops TSBuyerProtection::$SHOPSW = (Validate::isCleanHtml(Tools::getValue('shopsw'))) ? Tools::getValue('shopsw') : ''; TSBuyerProtection::$ET_CID = (Validate::isCleanHtml(Tools::getValue('et_cid'))) ? Tools::getValue('et_cid') : ''; TSBuyerProtection::$ET_LID = (Validate::isCleanHtml(Tools::getValue('et_lid'))) ? Tools::getValue('et_lid') : ''; - + Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'SHOPSW', TSBuyerProtection::$SHOPSW); Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'ET_CID', TSBuyerProtection::$ET_CID); Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'ET_LID', TSBuyerProtection::$ET_LID); @@ -633,12 +633,12 @@ class TSBuyerProtection extends AbsTrustedShops $this->confirmations[] = $this->l('Registration link has been created. Follow this link if you was not redirected ealier:').' >'.$this->l('Link').'<'; return $link_registration; } - + /** * Save in special database each buyer protection product for a certificate, * Each Trusted Shops particular characteristics is saved. * Create a product in Prestashop database to allow added each of them in cart. - * + * * @param array|stdClass $protection_items * @param string $ts_id */ @@ -651,12 +651,12 @@ class TSBuyerProtection extends AbsTrustedShops LEFT JOIN `ps_product_lang` AS pl ON ts.`id_product` = pl.`id_product` WHERE ts.`ts_id`="'.$ts_id.'"'; Db::getInstance()->Execute($sql); - + foreach ($protection_items as $key=>$item) { //add hidden product $product = new Product(); - foreach ($this->available_languages as $iso=>$lang) + foreach ($this->available_languages as $iso=>$lang) { $language = Language::getIdByIso(strtolower($iso)); if ((int)$language !== 0) @@ -665,7 +665,7 @@ class TSBuyerProtection extends AbsTrustedShops $product->link_rewrite[$language] = 'trustedshops_garantee'; } } - + // If the default lang is different than available languages : // (Bug occurred otherwise) if (!array_key_exists(Language::getIsoById((int)Configuration::get('PS_LANG_DEFAULT')), $this->available_languages)) @@ -679,7 +679,7 @@ class TSBuyerProtection extends AbsTrustedShops $product->active = true; $product->id_tax = 0; $product->add(); - + if ($product->id) { $sql = ' @@ -713,11 +713,11 @@ class TSBuyerProtection extends AbsTrustedShops } } } - + /** * Check and add a Trusted Shops certificate in shop. - * - * @uses TSBuyerProtection::_getProtectionItems() + * + * @uses TSBuyerProtection::_getProtectionItems() * to get all buyer protection products from Trusted Shops * @uses TSBuyerProtection::_saveProtectionItems() * to save buyer protection products in shop @@ -734,7 +734,7 @@ class TSBuyerProtection extends AbsTrustedShops if ($checked_certificate) { TSBuyerProtection::$CERTIFICATE[strtoupper($checked_certificate->certificationLanguage)] = array('stateEnum'=>$checked_certificate->stateEnum, 'typeEnum'=>$checked_certificate->typeEnum, 'url'=>$checked_certificate->url, 'tsID'=>$checked_certificate->tsID, 'user'=>'', 'password'=>''); - + // update the configuration var Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'CERTIFICATE_'.strtoupper($checked_certificate->certificationLanguage), Tools::htmlentitiesUTF8(Tools::jsonEncode(TSBuyerProtection::$CERTIFICATE[strtoupper($checked_certificate->certificationLanguage)]))); $this->confirmations[] = $this->l('Certificate has been well added.'); @@ -752,11 +752,11 @@ class TSBuyerProtection extends AbsTrustedShops } return false; } - + /** * Apply delete or edit action to a certificate - * - * @return boolean|array + * + * @return boolean|array * - false if action concerned multiple certificate * (in normal way, this never occured ) * - return required $certificate to edit. @@ -771,7 +771,7 @@ class TSBuyerProtection extends AbsTrustedShops $this->errors[] = $this->l('You must edit or delete a Certificate one per one'); return false; } - + // delete action : if (is_array($delete) AND isset(TSBuyerProtection::$CERTIFICATE[$delete[0]]['tsID'])) { @@ -782,7 +782,7 @@ class TSBuyerProtection extends AbsTrustedShops .' "'.$certificate_to_delete.'" ('.$this->l('language').' : '.$delete[0].') ' .$this->l('has been well deleted'); } - + // edit action : if (is_array($edit)) { @@ -792,12 +792,12 @@ class TSBuyerProtection extends AbsTrustedShops } return true; } - + /** * Change the certificate values. - * concerns only excellence certificate + * concerns only excellence certificate * for payment type, login and password values. - * + * * @uses TSBuyerProtection::_checkLogin() * @return true; */ @@ -816,7 +816,7 @@ class TSBuyerProtection extends AbsTrustedShops foreach ($all_payment_type as $key=>$module_id) TSBuyerProtection::$CERTIFICATE[$iso_lang]['payment_type'][(string)$key] = $module_id; } - + $check_login = false; try { $check_login = $this->_checkLogin(TSBuyerProtection::$CERTIFICATE[$iso_lang]['tsID'], $user, $password); @@ -829,7 +829,7 @@ class TSBuyerProtection extends AbsTrustedShops TSBuyerProtection::$CERTIFICATE[$iso_lang]['password'] = $password; Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'CERTIFICATE_'.$iso_lang, Tools::htmlentitiesUTF8(Tools::jsonEncode(TSBuyerProtection::$CERTIFICATE[$iso_lang]))); $this->confirmations[] = $this->l('Certificate login has been well added.'); - + } } else @@ -838,7 +838,7 @@ class TSBuyerProtection extends AbsTrustedShops } return true; } - + /** * Change the environment for working. * Not use anymore but keeped @@ -859,10 +859,10 @@ class TSBuyerProtection extends AbsTrustedShops TSBuyerProtection::$ENV_API = $env_api; Configuration::updateValue(TSBuyerProtection::PREFIX_TABLE.'ENV_API', TSBuyerProtection::$ENV_API); } - + /** * Dispatch post process depends on each formular - * + * * @return array depend on the needs about each formular. */ private function _preProcess() @@ -878,10 +878,10 @@ class TSBuyerProtection extends AbsTrustedShops $posts_return['change_certificate'] = $this->_submitChangeCertificate(); return $posts_return; } - + /** * Display each formaular in back-office - * + * * @see Module::getContent() * @return string for displaying form. */ @@ -899,12 +899,12 @@ class TSBuyerProtection extends AbsTrustedShops $out .= '
'; $out .= $this->_displayFormAddCertificate(); $out .= '
'; - + $bool_display_certificats = false; if (is_array(self::$CERTIFICATE)) foreach (self::$CERTIFICATE as $certif) $bool_display_certificats = (isset($certif['tsID']) && $certif['tsID'] != '')? true : $bool_display_certificats; - + if ($bool_display_certificats) $out .= $this->_displayFormCertificatesList(); if (isset($posts_return['edit_certificate']) && $posts_return['edit_certificate'] && @@ -1045,7 +1045,7 @@ class TSBuyerProtection extends AbsTrustedShops $out .= ''; } else { $out .= $this->l('No need'); - } + } $out .= '