fix conflicts

This commit is contained in:
Marion Muszynski 2016-08-31 11:04:16 +02:00
commit bb5ff6ba97
16 changed files with 938 additions and 820 deletions

View File

@ -26,6 +26,7 @@ class CategoryController extends CategoryControllerCore {
'HOOK_LEFT_COLUMN_VP' => Module::hookExec('displayleftVP', array('id_category' => $id_category)),
'is_sale_home' => ($sale? $sale->id_category == $id_category: FALSE),
'other_sales' => $other_sales,
'last_qties' => (int)Configuration::get('PS_LAST_QTIES'),
'HOOK_PRIVATESALES_LISTING' => Module::hookExec('privatesales_listing', array('other_sales_category' => $other_sales, 'futuresales' => array())),
));
}

View File

@ -1682,6 +1682,7 @@ body#page-404 .footer_links {
background-color: #b5b1b1;
}
#category .content #product_list .view_button:hover{ background-color: #f45bb7;}
#header {
position: absolute;
width: 100%;
@ -6727,3 +6728,21 @@ table#carrierTable tbody td {
}
}
#product_list li div.productQuantityAlert{
position: absolute;
bottom: 55px;
text-align: center;
width: 270px;
margin: 0 !important;
padding: 5px 0 !important;
/* background-color: #fb66a9; */
left: 35px;
/* box-shadow: 0px 5px 8px -3px #b5b1b1; */
border-top: 0px;
}
.productQuantityAlert p{
color: #fb66a9;
font-size: 12px;
font-weight: bold;
}

View File

@ -31,6 +31,8 @@ var selectedCombination = new Array();
var globalQuantity = new Number;
var colors = new Array();
//check if a function exists
function function_exists(function_name)
{
@ -178,12 +180,18 @@ function updateDisplay()
//hide the availability value
$('#availability_statut:visible').hide();
}
//'last quantities' message management
if (!allowBuyWhenOutOfStock)
{
if (quantityAvailable <= maxQuantityToAllowDisplayOfLastQuantityMessage)
if (quantityAvailable <= maxQuantityToAllowDisplayOfLastQuantityMessage){
if(quantityAvailable == 1){
$('#last_quantities').text(oneQuantityAvailableSentence);
}else{
var t = quantityAvailableSentence.replace('X', quantityAvailable);
$('#last_quantities').text(t);
}
$('#last_quantities').show('slow');
}
else
$('#last_quantities').hide('slow');
}

View File

@ -3,7 +3,6 @@
global $_LANG;
$_LANG = array();
$_LANG['404_1d3ac0a5826e47e3c2761085e97877f6'] = 'Page not available';
$_LANG['404_902b0d55fddef6f8d651fe1035b7d4bd'] = 'Error';
$_LANG['404_4f4816c6984e3c832882b39d8fecbd2c'] = 'We\'re sorry, but the Web address you entered is no longer available';
$_LANG['404_21dfea356c48679a5ce6671ee307d2a4'] = 'To find a product, please type its name in the field below';
$_LANG['404_a68ba7d969d1294a35138fa501dfb078'] = 'Search our product catalog:';
@ -12,8 +11,7 @@ $_LANG['404_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['address_3908e1afa0ff22fbf112aff3c5ba55c1'] = 'Your addresses';
$_LANG['address_e9b6b3aa3cab28048d3879710882e1de'] = 'Modify address';
$_LANG['address_d7f172af352aa5232de5295afeaa68e5'] = 'To add a new address, please fill out the form below.';
$_LANG['address_455175f3f5be6306247babb349c0515a'] = 'Your address';
$_LANG['address_393d8c6bc7a04264bd9523dc8c92b818'] = 'New address';
$_LANG['address_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
$_LANG['address_b60bb13a87fe3ae5463aeb0980a5a8a1'] = 'Identification number';
$_LANG['address_ea318a4ad37f0c2d2c368e6c958ed551'] = 'DNI / NIF / NIE';
$_LANG['address_7cb32e708d6b961d476baced73d362bb'] = 'VAT number';
@ -34,7 +32,6 @@ $_LANG['address_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Assign an address title fo
$_LANG['address_ae7bdef7fe2bbbbf02c11e92c5fceb40'] = 'My address';
$_LANG['address_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['address_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_LANG['address_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
$_LANG['addresses_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['addresses_e45be0a0d4a0b62b15694c1a631e6e62'] = 'My addresses';
$_LANG['addresses_f8fe2f1fff8cf1e32b1891fd7b4a65fe'] = 'Please configure the desired billing and delivery addresses to be preselected when placing an order. You may also add additional addresses, which can be useful for sending gifts or receiving an order at your office.';
@ -44,16 +41,13 @@ $_LANG['addresses_06933067aafd48425d67bcb01bba5cb6'] = 'Update';
$_LANG['addresses_729a51874fe901b092899e9e8b31c97a'] = 'Are you sure?';
$_LANG['addresses_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_LANG['addresses_b32dd33df738183cb85ab8ea714f8026'] = 'No addresses available.';
$_LANG['addresses_bed08e8af70a98c1a8361f13ec477be0'] = 'Add new address';
$_LANG['addresses_3c7d34ae915c6664189dab2aebb02307'] = 'Add an address';
$_LANG['addresses_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['addresses_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['addresses_3c7d34ae915c6664189dab2aebb02307'] = 'Add an address';
$_LANG['authentication_99dea78007133396a7b8ed70578ac6ae'] = 'Login';
$_LANG['authentication_bffe9a3c9a7e00ba00a11749e022d911'] = 'Log in';
$_LANG['authentication_5bef23eb7efff2736c5583bda59e5eb7'] = 'Create your account';
$_LANG['authentication_d726bc5637e9f053917227ec02f6c9d7'] = 'Enter your e-mail address to create an account';
$_LANG['authentication_8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
$_LANG['authentication_5f0258bf719ab828e20edf91e4fb24a7'] = 'Already registered?';
$_LANG['authentication_8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
$_LANG['authentication_dc647eb65e6711e155375218212b3964'] = 'Password';
$_LANG['authentication_01a569ddc6cf67ddec2a683f0a5f5956'] = 'Forgot your password?';
$_LANG['authentication_766d4aaf3e045538be23f9a9e17a1593'] = 'Instant Checkout';
@ -95,15 +89,6 @@ $_LANG['authentication_a0bfb8e59e6c13fc8d990781f77694fe'] = 'Continue';
$_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Your personal information';
$_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
$_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 characters min.)';
$_LANG['authentication_455175f3f5be6306247babb349c0515a'] = 'Your address';
$_LANG['authentication_ae47812e00631626815f5f75ad1abbbd'] = 'Street address, P.O. box, company name, c/o';
$_LANG['authentication_846a54955f32846032981f8fe48c35ff'] = 'Address (Line 2)';
$_LANG['authentication_092daa39d2b825e4a7fe9b31c2080ecb'] = 'Apartment, suite, unit, building, floor, etc.';
$_LANG['authentication_0f68b904e33d9ac04605aecc958bcf52'] = 'Additional information';
$_LANG['authentication_39916f579f264041641c122e68e545d5'] = 'You must register at least one phone number';
$_LANG['authentication_fe66abce284ec8589e7d791185b5c442'] = 'Home phone';
$_LANG['authentication_41c2fff4867cc204120f001e7af20f7a'] = 'Mobile phone';
$_LANG['authentication_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Assign an address alias for future reference';
$_LANG['authentication_0ba7583639a274c434bbe6ef797115a4'] = 'Register';
$_LANG['best-sales_3cb29f0ccc5fd220a97df89dafe46290'] = 'Top sellers';
$_LANG['best-sales_32af07c9205de16855c50c3d20a51698'] = 'No top sellers.';
@ -132,7 +117,6 @@ $_LANG['contact-form_4ec1c39345fe8820d68463eea8803b0f'] = 'Your message has been
$_LANG['contact-form_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['contact-form_7c9d4636fc5ed97bb78bc2aac486beab'] = 'Your message has already been sent.';
$_LANG['contact-form_0880266daff3ed4c441adb888658c47c'] = 'For questions about an order or for more information about our products';
$_LANG['contact-form_cc5fd9b9f1cad59fcff97a1f21f34304'] = 'Send a message';
$_LANG['contact-form_6c27c08f40e1b0d9901deb9ff5f722f7'] = 'Subject Heading';
$_LANG['contact-form_7bc873cba11f035df692c3549366c722'] = '-- Choose --';
$_LANG['contact-form_8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
@ -156,7 +140,6 @@ $_LANG['discount_93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
$_LANG['discount_bafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
$_LANG['discount_f4a0d7cb0cd45214c8ca5912c970de13'] = 'Tax included';
$_LANG['discount_5b54dccf3cb10410cee693309f409324'] = 'You do not have any vouchers.';
$_LANG['discount_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['discount_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['errors_6357d3551190ec7e79371a8570121d3a'] = 'There are';
$_LANG['errors_4ce81305b7edb043d0a7a5c75cab17d0'] = 'There is';
@ -197,7 +180,6 @@ $_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
$_LANG['history_27792947ed5d5da7c0d1f43327ed9dab'] = 'details';
$_LANG['history_332c80b1838dc515f5031e09da3b7f3f'] = 'Reorder';
$_LANG['history_5acc2ceeb883ba07cef2d02ea382f242'] = 'You have not placed any orders.';
$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to Your Account';
$_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['identity_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['identity_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Your personal information';
@ -231,7 +213,6 @@ $_LANG['identity_6f6162d3a052bb330e9c60285c74c6c9'] = 'Sign up for our newslette
$_LANG['identity_ac135c86084a47630c9eadb4edd5ef75'] = 'Receive special offers from our partners';
$_LANG['identity_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_LANG['identity_b340f66ef028af40a01d073966d593a9'] = '[Insert customer data privacy clause or law here, if applicable]';
$_LANG['identity_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['identity_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['maintenance_e1d4f332b928d40fa3f9df3b7795da4f'] = 'In order to perform site maintenance, our online shop is closed temporarily. We apologize for the inconvenience and ask that you please try again later.';
$_LANG['manufacturer-list_2377be3c2ad9b435ba277a73f0f1ca76'] = 'Manufacturers';
@ -269,10 +250,10 @@ $_LANG['order-address_8a8c9edb5531fa2f822295d1830d090f'] = 'Your delivery addres
$_LANG['order-address_06933067aafd48425d67bcb01bba5cb6'] = 'Update';
$_LANG['order-address_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Addresses';
$_LANG['order-address_d0748d2df4aed77bd7591b3ac6c52c83'] = 'Choose a delivery address:';
$_LANG['order-address_d40f5cb3e1fbb5760a8d2a44a1241d4d'] = 'Use the delivery address as the billing address.';
$_LANG['order-address_82a7d396bbd6f6fef648578b4ae2ea81'] = 'Choose a billing address:';
$_LANG['order-address_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
$_LANG['order-address_b15e1100a6196acba01ef7aaa5b2a9e5'] = 'Add a new address';
$_LANG['order-address_d40f5cb3e1fbb5760a8d2a44a1241d4d'] = 'Use the delivery address as the billing address.';
$_LANG['order-address_82a7d396bbd6f6fef648578b4ae2ea81'] = 'Choose a billing address:';
$_LANG['order-address_617096c86d35478132502be00e12e016'] = 'If you would like to add a comment about your order, please write it below.';
$_LANG['order-address_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['order-address_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
@ -371,7 +352,6 @@ $_LANG['order-follow_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['order-follow_cc894fffb019b528d12951b74d6d2b6e'] = 'Order return';
$_LANG['order-follow_daf51d7d9e10e6a469434ae548d9a173'] = 'Print out';
$_LANG['order-follow_3976e0f730b236b1cf619dc80f78488e'] = 'You have no return merchandise authorizations.';
$_LANG['order-follow_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['order-follow_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['order-opc-new-account_08bd40c7543007ad06e4fce31618f6ec'] = 'Account';
$_LANG['order-opc-new-account_db879b00e657fc85f7873343f11df21c'] = 'Already registered?';
@ -490,7 +470,6 @@ $_LANG['order-slip_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['order-slip_591286c3b4f075453e55532838ce0044'] = 'Order slip';
$_LANG['order-slip_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
$_LANG['order-slip_0ba830b7ca1513a4882ce5aac84030b8'] = 'You have not received any credit slips.';
$_LANG['order-slip_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['order-slip_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['order-steps_290612199861c31d1036b185b4e69b75'] = 'Summary';
$_LANG['order-steps_99dea78007133396a7b8ed70578ac6ae'] = 'Login';
@ -507,7 +486,6 @@ $_LANG['password_10911a0ad07a041ea43230e25faad2d7'] = 'A confirmation e-mail has
$_LANG['password_55ad28443587997ac4fa56386ec2fc1d'] = 'Please enter the e-mail address used to register. We will send your new password to that address.';
$_LANG['password_df1555fe48479f594280a2e03f9a8186'] = 'E-mail:';
$_LANG['password_0d0e2934af7d3bc4e7263fcb1f9bc51c'] = 'Retrieve Password';
$_LANG['password_d28f8b8bba7b45bc5103b23b4f21b4fd'] = 'Return to Login';
$_LANG['password_95e6faaba5e8b016e5f9bcf5ea6c8270'] = 'Back to Login';
$_LANG['prices-drop_c8f312df214e2295809027c6ca79d232'] = 'Price drop';
$_LANG['prices-drop_62e15ca272c14c03aa52b64c8caf2334'] = 'No price drop.';
@ -516,13 +494,14 @@ $_LANG['product-compare_fe22c6b5957bca5380f9cf6529fea8c5'] = 'You cannot add mor
$_LANG['product-compare_1a3addc6c8dccf79752c39ca4a3b6423'] = 'product(s) to the product comparison';
$_LANG['product-compare_7eece51cf3938103677db7a5051ef8f5'] = 'Compare';
$_LANG['product-list_03c2e7e41ffc181a4e84080b4710e81e'] = 'New';
$_LANG['product-list_62d6acaf1651581b3997c040ad383303'] = 'Warning : 1 item in stock !';
$_LANG['product-list_d4c56106032bdc1466602ea78e753210'] = 'Warning :';
$_LANG['product-list_800e90e940e7f1fb938b0fda5137f38c'] = 'On sale!';
$_LANG['product-list_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduced price!';
$_LANG['product-list_d0fcb89c94b29d6ab2db749ff688dc7c'] = 'Online only!';
$_LANG['product-list_78945de8de090e90045d299651a68a9b'] = 'Available';
$_LANG['product-list_cb3c718c905f00adbb6735f55bfb38ef'] = 'Product available with different options';
$_LANG['product-list_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
$_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
$_LANG['product-list_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
$_LANG['product-list_78945de8de090e90045d299651a68a9b'] = 'Available';
$_LANG['product-list_4351cfebe4b61d8aa5efa1d020710005'] = 'View';
$_LANG['product-list_77798ad342555ffa834758a2aaa6fc11'] = 'Select to compare';
$_LANG['product-sort_cfab1ba8c67c7c838db98d666f02a132'] = '--';
@ -537,19 +516,21 @@ $_LANG['product_bc0f7082192ef02e934a036cf4991789'] = 'This product is no longer
$_LANG['product_9173701581f0213f0104e064479e4ca3'] = 'with those attributes but is available with others';
$_LANG['product_78a2d6a3d6741d9d2cbff658d5df7cd8'] = 'Uploading in progress, please wait...';
$_LANG['product_c1f25211403ec7459f265788cdbee403'] = 'Please fill in all required fields, then save the customization.';
$_LANG['product_43c936b309c81e341da9c4e93acb2bb2'] = 'Warning : X items in stock!';
$_LANG['product_62d6acaf1651581b3997c040ad383303'] = 'Warning : 1 item in stock!';
$_LANG['product_f9ddd507fdf437437efdcb333a0f4ff0'] = 'This product is not visible to your customers.';
$_LANG['product_110a4b01beabd53b661a47d4b44bd7a8'] = 'Publish';
$_LANG['product_0557fa923dcee4d0f86b1409f5c2167f'] = 'Back';
$_LANG['product_9981d2af851e4b4a4ea612d59f08ab9c'] = 'Other views';
$_LANG['product_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['product_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
$_LANG['product_ea4788705e6873b424c65e91c2846b19'] = 'Cancel';
$_LANG['product_02ea084dc2ef3e9965dbba4ec87d2f9b'] = 'Display all pictures';
$_LANG['product_13dba24862cf9128167a59100e154c8d'] = 'Print';
$_LANG['product_c6beb9157a0e29e604ad5ec484488608'] = 'View full size';
$_LANG['product_2b56b60f878922093facd42284848a0c'] = 'More details';
$_LANG['product_e54a973d0c3342dac6ee7d9e145c6f83'] = 'Pack content';
$_LANG['product_98b0a68a7e4c7b265a5ca9a0b733d96e'] = 'Pick a color:';
$_LANG['product_ea23e12cae068315b351f8d36d432d76'] = 'Reference:';
$_LANG['product_2c59ffd0a6631127450d729861975719'] = 'Quantity:';
$_LANG['product_07d814a3df5cfd2d637e77b215519034'] = 'You must add';
$_LANG['product_f3bbad73b35f19730399b3da21c3ef32'] = 'as a minimum quantity to buy this product.';
$_LANG['product_588907ab2d492aca0b07b5bf9c931eea'] = 'On sale';
$_LANG['product_800e90e940e7f1fb938b0fda5137f38c'] = 'On sale!';
$_LANG['product_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduced price!';
@ -562,20 +543,12 @@ $_LANG['product_d436eb0fd9de10b54a828ce6435f7e81'] = 'include';
$_LANG['product_f85524c253c150e88136df3999ac3fd4'] = 'for green tax';
$_LANG['product_a134618182b99ff9151d7e0b6b92410a'] = '(not impacted by the discount)';
$_LANG['product_fe3838c7c11aa406dd956566e17360d5'] = 'per';
$_LANG['product_ea23e12cae068315b351f8d36d432d76'] = 'Reference:';
$_LANG['product_2c59ffd0a6631127450d729861975719'] = 'Quantity:';
$_LANG['product_07d814a3df5cfd2d637e77b215519034'] = 'You must add';
$_LANG['product_f3bbad73b35f19730399b3da21c3ef32'] = 'as a minimum quantity to buy this product.';
$_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
$_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Availability:';
$_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'item in stock';
$_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'items in stock';
$_LANG['product_0d83f0026f6d2923b2aa3a208156918c'] = 'Warning: Last items in stock!';
$_LANG['product_03de921a8ea82897e13d33d66c28b4db'] = 'Online only';
$_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
$_LANG['product_47f1a471a7f6a74053869cdb9cbf05bb'] = 'Quantity discount';
$_LANG['product_8beee69f53dcd358f9e333de43a3f506'] = 'quantities';
$_LANG['product_221d2a4bfdae13dbd5aeff3b02adb8c1'] = 'quantity';
$_LANG['product_71948aa4f6e12cdaa5e2e63a5eb8f142'] = 'More info';
$_LANG['product_d4c56106032bdc1466602ea78e753210'] = 'Warning :';
$_LANG['product_98b0a68a7e4c7b265a5ca9a0b733d96e'] = 'Pick a color:';
$_LANG['product_7dcd185f890fd28f69d1ed210292d77f'] = 'Data sheet';
$_LANG['product_801ab24683a4a8c433c6eb40c48bcd9d'] = 'Download';
$_LANG['product_98edb85b00d9527ad5acebe451b3fae6'] = 'Accessories';
@ -583,6 +556,9 @@ $_LANG['product_d3da97e2d9aee5c8fbe03156ad051c99'] = 'More';
$_LANG['product_4351cfebe4b61d8aa5efa1d020710005'] = 'View';
$_LANG['product_cb3c718c905f00adbb6735f55bfb38ef'] = 'Product available with different options';
$_LANG['product_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
$_LANG['product_47f1a471a7f6a74053869cdb9cbf05bb'] = 'Quantity discount';
$_LANG['product_8beee69f53dcd358f9e333de43a3f506'] = 'quantities';
$_LANG['product_221d2a4bfdae13dbd5aeff3b02adb8c1'] = 'quantity';
$_LANG['product_54c02ba7929b1fda4847991a45b58a48'] = 'Product customization';
$_LANG['product_d5a90effea572da2df11559161c0930b'] = 'After saving your customized product, remember to add it to your cart.';
$_LANG['product_e5a75e83f9fd2f5fdff337a46227b3c3'] = 'Allowed file formats are: GIF, JPG, PNG';
@ -661,7 +637,6 @@ $_LANG['shopping-cart_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_LANG['shopping-cart_c8cd21bd2e33378f10611bc4498cf96f'] = 'Delete this customization';
$_LANG['shopping-cart_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
$_LANG['shopping-cart_1d9baf077ee87921f57a8fe42d510b65'] = 'Subtract';
$_LANG['shopping-cart_a82868319826fb092b73968e661b5b38'] = 'Vouchers';
$_LANG['shopping-cart_bcc7582c9a66be8187578997794a9c1f'] = 'Code:';
$_LANG['shopping-cart_f7b96335c6a33477579e43f3da368507'] = 'Take advantage of our offers:';
$_LANG['shopping-cart_af0f5bdc5be121b9307687aeeae38c17'] = 'Delivery address';

View File

@ -570,6 +570,9 @@ $_LANG['product-compare_7eece51cf3938103677db7a5051ef8f5'] = 'Comparar';
$_LANG['product-list_f1ff9682123b76dfd732618ad1891d1c'] = 'Coup de coeur';
$_LANG['product-list_03c2e7e41ffc181a4e84080b4710e81e'] = 'Nuevo';
$_LANG['product-list_614391032716f509b5bb9e0c0b3ed305'] = 'en vez de';
$_LANG['product-list_62d6acaf1651581b3997c040ad383303'] = '¡Atención! 1 unidad en stock';
$_LANG['product-list_d4c56106032bdc1466602ea78e753210'] = '¡Atención!';
$_LANG['product-list_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'unidades en stock';
$_LANG['product-list_800e90e940e7f1fb938b0fda5137f38c'] = '¡En rebajas!';
$_LANG['product-list_ca2bf12169883f4982d8fe34b7e3c618'] = '¡Precio rebajado!';
$_LANG['product-list_d0fcb89c94b29d6ab2db749ff688dc7c'] = '¡Solo por Internet!';
@ -592,6 +595,8 @@ $_LANG['product_bc0f7082192ef02e934a036cf4991789'] = 'Este producto ya no está
$_LANG['product_9173701581f0213f0104e064479e4ca3'] = 'con esas opciones , pero está disponible con otras';
$_LANG['product_78a2d6a3d6741d9d2cbff658d5df7cd8'] = 'En curso, por favor, espere ...';
$_LANG['product_c1f25211403ec7459f265788cdbee403'] = 'Rellene todos los campos y guarda la personalización';
$_LANG['product_43c936b309c81e341da9c4e93acb2bb2'] = '¡Atención! X unidades en stock';
$_LANG['product_62d6acaf1651581b3997c040ad383303'] = '¡Atención! 1 unidad en stock';
$_LANG['product_f9ddd507fdf437437efdcb333a0f4ff0'] = 'Este producto no está visible para sus clientes. ';
$_LANG['product_110a4b01beabd53b661a47d4b44bd7a8'] = 'Publicar';
$_LANG['product_0557fa923dcee4d0f86b1409f5c2167f'] = 'Volver';
@ -620,7 +625,7 @@ $_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Añadir a la cesta';
$_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Disponibilidad:';
$_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'artículo disponible';
$_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'artículos disponibles';
$_LANG['product_0d83f0026f6d2923b2aa3a208156918c'] = 'Advertencia: ¡Últimos artículos en stock!';
$_LANG['product_d4c56106032bdc1466602ea78e753210'] = '¡Atención!';
$_LANG['product_0da35a562542f7e441f8226c875375f5'] = 'Bébé Boutik destaca este producto: porque es innovador y práctico, porque estimula a tus hijos gracias a su color, textura, y función, o porque lo viste de forma suave y original. ¡Bebé Boutik te lo recomienda!';
$_LANG['product_98b0a68a7e4c7b265a5ca9a0b733d96e'] = 'Elija un color:';
$_LANG['product_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Descripción';

View File

@ -574,6 +574,9 @@ $_LANG['product-compare_fe22c6b5957bca5380f9cf6529fea8c5'] = 'Vous ne pouvez pas
$_LANG['product-compare_1a3addc6c8dccf79752c39ca4a3b6423'] = 'produits dans le comparateur.';
$_LANG['product-compare_7eece51cf3938103677db7a5051ef8f5'] = 'Comparer';
$_LANG['product-list_03c2e7e41ffc181a4e84080b4710e81e'] = 'Nouveau';
$_LANG['product-list_62d6acaf1651581b3997c040ad383303'] = 'Attention : 1 pièce en stock !';
$_LANG['product-list_d4c56106032bdc1466602ea78e753210'] = 'Attention :';
$_LANG['product-list_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'pièces en stock';
$_LANG['product-list_800e90e940e7f1fb938b0fda5137f38c'] = 'En solde !';
$_LANG['product-list_ca2bf12169883f4982d8fe34b7e3c618'] = 'Prix réduit !';
$_LANG['product-list_d0fcb89c94b29d6ab2db749ff688dc7c'] = 'Exclusivité web !';
@ -594,6 +597,8 @@ $_LANG['product_bc0f7082192ef02e934a036cf4991789'] = 'Ce produit n\'est plus en
$_LANG['product_9173701581f0213f0104e064479e4ca3'] = 'avec ces options mais reste disponible avec d\'autres options';
$_LANG['product_78a2d6a3d6741d9d2cbff658d5df7cd8'] = 'Envoi en cours, merci de bien vouloir patienter...';
$_LANG['product_c1f25211403ec7459f265788cdbee403'] = 'Merci de remplir tous les champs, ensuite enregistrez votre personnalisation';
$_LANG['product_43c936b309c81e341da9c4e93acb2bb2'] = 'Attention : X pièces en stock!';
$_LANG['product_62d6acaf1651581b3997c040ad383303'] = 'Attention : 1 pièce en stock!';
$_LANG['product_f9ddd507fdf437437efdcb333a0f4ff0'] = 'Ce produit n\'est pas visible par vos clients.';
$_LANG['product_110a4b01beabd53b661a47d4b44bd7a8'] = 'Publier';
$_LANG['product_0557fa923dcee4d0f86b1409f5c2167f'] = 'Retour';
@ -622,7 +627,7 @@ $_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Ajouter au panier';
$_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Disponibilité :';
$_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'pièce disponible';
$_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'pièces disponibles';
$_LANG['product_0d83f0026f6d2923b2aa3a208156918c'] = 'Attention : dernières pièces disponibles !';
$_LANG['product_d4c56106032bdc1466602ea78e753210'] = 'Attention :';
$_LANG['product_f1ff9682123b76dfd732618ad1891d1c'] = 'Coup de coeur';
$_LANG['product_0da35a562542f7e441f8226c875375f5'] = 'Bébé Boutik aime ce produit : parce quil est innovant, pratique, parce quil éveille votre enfant par ses couleurs, sa texture, ses fonctions, ou parce quil lhabille avec douceur et originalité, Bébé Boutik vous le recommande !';
$_LANG['product_98b0a68a7e4c7b265a5ca9a0b733d96e'] = 'Choisissez un coloris :';

View File

@ -33,7 +33,23 @@
{else}
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} /></a>
{/if}
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{elseif $product.quantity <= $last_qties && $product.quantity > 0}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{*<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'}</a></p>*}
</div>
<div class="right_block">

View File

@ -36,7 +36,7 @@
</div>
{/if}
<h3>{if isset($product.new) && $product.new == 1}<span class="new">{l s='New'}</span>{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:64:'...'|escape:'htmlall':'UTF-8'}</a></h3>
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.av3ailable_for_order) && $product.available_for_order)))}
<div>
{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}
<span class="price">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span>
@ -62,7 +62,23 @@
{else}
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} height="{$homeSize.height}"{/if} /></a>
{/if}
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{elseif $product.quantity <= $last_qties && $product.quantity > 0}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{*<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'}</a></p>*}
</div>
<div class="right_block">

View File

@ -105,6 +105,10 @@ var doesntExistNoMoreBut = '{l s='with those attributes but is available with ot
var uploading_in_progress = '{l s='Uploading in progress, please wait...' js=1}';
var fieldRequired = '{l s='Please fill in all required fields, then save the customization.' js=1}';
var quantityAvailableSentence = '{l s='Warning: X items in stock!' js=1}';
var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if isset($groups)}
// Combinations
{foreach from=$combinations key=idCombination item=combination}
@ -392,7 +396,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</p>
{/if}
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style='display: none;'{/if} >{l s='Warning :'} {$product->quantity} {l s='items in stock'}</p>
{if $product->online_only}
<div class="coeur">

View File

@ -4890,3 +4890,20 @@ body#product #best-sellers_block_product{
width: 200px;
}
*/
#product_list li div.productQuantityAlert{
text-align: center;
width: 250px;
margin: 0 !important;
padding: 5px 0 !important;
/* background-color: #f49cc3;
box-shadow: 0px 5px 8px -3px #b5b1b1; */
background-color: #fff;
position: absolute;
bottom: 0px;
left: 0;
}
.productQuantityAlert p{
color: #e36ea2;
font-size: 12px;
font-weight: 600;
}

View File

@ -181,8 +181,16 @@ function updateDisplay()
//'last quantities' message management
if (!allowBuyWhenOutOfStock)
{
if (quantityAvailable <= maxQuantityToAllowDisplayOfLastQuantityMessage)
if (quantityAvailable <= maxQuantityToAllowDisplayOfLastQuantityMessage){
if(quantityAvailable == 1){
$('#last_quantities').text(oneQuantityAvailableSentence);
}else{
console.log('t');
var t = quantityAvailableSentence.replace('X', quantityAvailable);
$('#last_quantities').text(t);
}
$('#last_quantities').show('slow');
}
else
$('#last_quantities').hide('slow');
}

View File

@ -731,5 +731,9 @@ $_LANG['live_edit_79030d996976f29a5e986a42d8f026e5'] = 'Imposible guardar la pos
$_LANG['live_edit_3c5b87f318f203adbfcc5d6a68959359'] = 'Imposible cargar la lista de los módulos';
$_LANG['live_edit_c9cc8cce247e49bae79f15173ce97354'] = 'Guardar';
$_LANG['live_edit_d8dcfab18b3a6eba56d617dd1dcb1ba7'] = 'Cerrar Live Edit';
$_LANG['product_43c936b309c81e341da9c4e93acb2bb2'] = '¡Atención! X unidades en stock';
$_LANG['product_62d6acaf1651581b3997c040ad383303'] = '¡Atención! 1 unidad en stock';
$_LANG['product-list_62d6acaf1651581b3997c040ad383303'] = '¡Atención! 1 unidad en stock';
$_LANG['product-list_d4c56106032bdc1466602ea78e753210'] = '¡Atención!';
?>

View File

@ -741,5 +741,9 @@ $_LANG['live_edit_79030d996976f29a5e986a42d8f026e5'] = 'Impossible d\'enregistre
$_LANG['live_edit_3c5b87f318f203adbfcc5d6a68959359'] = 'Impossible de charger la liste des modules';
$_LANG['live_edit_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
$_LANG['live_edit_d8dcfab18b3a6eba56d617dd1dcb1ba7'] = 'Fermer Live Edit';
$_LANG['product_43c936b309c81e341da9c4e93acb2bb2'] = 'Attention : X pièces en stock!';
$_LANG['product_62d6acaf1651581b3997c040ad383303'] = 'Attention : 1 pièce en stock!';
$_LANG['product-list_62d6acaf1651581b3997c040ad383303'] = 'Attention : 1 pièce en stock !';
$_LANG['product-list_d4c56106032bdc1466602ea78e753210'] = 'Attention :';
$_LANG['product-list_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'pièces en stock';
?>

View File

@ -28,6 +28,23 @@
{assign var=product_reduction value=($product.reduction * (1 + $product.rate / 100) * 100 / $product.price_without_reduction)}
{if $product_reduction>0}
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{elseif $product.quantity <= $last_qties && $product.quantity > 0}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{/if}
{/if}
<span class="gradient">

View File

@ -56,6 +56,23 @@
{if $product_reduction>0}
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
{/if}
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{elseif $product.quantity <= $last_qties && $product.quantity > 0}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{/if}
{/if}
<span class="gradient">

View File

@ -104,6 +104,8 @@ var doesntExistNoMore = '{l s='This product is no longer in stock' js=1}';
var doesntExistNoMoreBut = '{l s='with those attributes but is available with others' js=1}';
var uploading_in_progress = '{l s='Uploading in progress, please wait...' js=1}';
var fieldRequired = '{l s='Please fill in all required fields, then save the customization.' js=1}';
var quantityAvailableSentence = '{l s='Warning: X items in stock!' js=1}';
var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if isset($groups)}
// Combinations
@ -396,7 +398,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</p>
{/if}
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style='display: none;'{/if} >{l s='Warning :'} {$product->quantity} {l s='items in stock'}</p>
<!-- {if $product->online_only}
<p>{l s='Online only'}</p>