Commit Graph

148 Commits

Author SHA1 Message Date
François Gaillard 8bc725f4b6 // Release branch merged 2013-03-27 10:25:16 +01:00
Rémi Gaillard 6b4738c7ef // fix for price computation with combination in product page FO 2013-03-26 11:04:07 +01:00
gRoussac bfa12cca54 [-] FO : Customization delete when quantity custo is one, sorry about this bad commit last time 2013-03-22 19:18:35 +01:00
gRoussac 19e0f138e3 [-] FO : Fix bug #PSCFV-8364 block cart hidden or products are doubled 2013-03-22 16:47:00 +01:00
gRoussac e6172fb6e9 [-] FO : update total_product_price_X when customized product after login 2013-03-21 15:22:42 +01:00
gRoussac 905c1b2018 [-] FO : Fix bug #PSCFV-8028 refactoring customization 2013-03-21 14:05:36 +01:00
gRoussac 14627d4d75 [-] FO : Fix bug #PSCFV-8028 refactoring customization 2013-03-21 12:02:13 +01:00
vAugagneur ac764f0d81 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 09:36:22 +01:00
vAugagneur 9efa51e704 //fixed multi-shipping bug 2013-03-14 09:36:17 +01:00
gRoussac be6ad7855a [-] FO : Check for cart rules before diplaying shopping cart in OPC 2013-03-13 18:42:40 +01:00
vAugagneur 37f64664d3 //small js fix 2013-03-13 18:21:21 +01:00
gRoussac ee570bbca7 [-] FO : Avoid flashing of availability_statut 2013-03-12 18:34:24 +01:00
gRoussac 3c6ac17a72 [-] FO : Fix bug #PSCFV-7946 delete customized product with several custos 2013-03-11 12:35:23 +01:00
Rémi Gaillard 833a529689 [-] FO: Fix #PSCFV-8083 display of initial price with quantity discount and cart refreshment 2013-03-04 11:12:51 +01:00
gRoussac 6925ce0188 [-] FO : Fix bug isGuest not defined, set id_carrier in base at login 2013-02-26 14:27:48 +01:00
Rémi Gaillard 379381a5aa [-] FO: Fix display specific prices for combinations in product page #PSCFV-7807 2013-02-18 20:30:53 +01:00
gRoussac d9fbe89270 [-] FO : Fix Bug #PSCFV-7339 available date on product page 2013-02-12 16:40:26 +01:00
gRoussac 68673f92d1 [-] FO : Fix bug #PSCFI-6864 #PSCFV-6516 Issue with deleted address blocking order process 2013-01-31 19:06:19 +01:00
Gregory Roussac a7e4ad9e90 [-] FO : 'undefined' is undefined =) 2013-01-29 10:56:28 +01:00
vAugagneur 42c150e2a7 [-] FO : fixed bug #PSCFV-7381 - free shipping when no carrier available 2013-01-25 09:54:08 +01:00
gRoussac 31e3d9d388 [-] FO : No error on first consultation of shopping cart with minimum purchase 2013-01-24 10:22:29 +01:00
gRoussac f81e0c51fa [-] FO : adding values to empty parameters in ajax of cart-summary.js 2013-01-23 18:36:20 +01:00
gRoussac a48d2668d3 [-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries 2013-01-23 15:48:15 +01:00
gRoussac 1ed094abfb [-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC 2013-01-22 16:32:55 +01:00
gRoussac 7349259ec5 [-] FO : Bad checkbox behavior in FF in OPC 2013-01-08 10:04:30 +01:00
gRoussac 6a7795a92f [-] FO : Fix #PSCFV-5544 same alias is no more rejected in OPC 2013-01-07 16:54:42 +01:00
Gregory Roussac ae117c2457 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 16:32:45 +01:00
gRoussac 51517e14a3 [-] FO : Fix #PSCFV-4885 for DNI field, states and postcode display 2013-01-04 16:31:05 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur 2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
Gregory Roussac 3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Gregory Roussac 4ed4905f1a [-] FO : Fixed message & entity 2012-12-26 18:58:17 +01:00
Damien Metzger 532583b3ab [-] FO : fixed usage of "&" in the order messages added by the customers 2012-12-26 12:50:34 +01:00
vAugagneur a7ad0d9b30 revert modif on product.js 2012-12-17 18:05:22 +01:00
vAugagneur 367a442c08 //order opc js fix 2012-12-13 14:55:26 +01:00
Vincent Augagneur 0cd93a517b Merge pull request #79 from PrestaEdit/PSCFV-3877
[-] FO : mobile template - states management
2012-12-12 03:34:09 -08:00
Jonathan Danse 9d5611f9fe [*] FO : mobile template - states management
Put "p" and "div" in the same selector
2012-12-12 12:30:10 +01:00
PrestaEdit 5e563f2a48 [-] FO : mobile template - states management 2012-12-08 23:46:14 +01:00
Rémi Gaillard 0e0f6ee641 [-] FO: Fix cart summary ajax refreshment 2012-12-06 11:58:29 +01:00
vAugagneur 51d8ef576b //small fix with js on product page 2012-12-03 14:47:38 +01:00
Milow 2118118cfa Fixup js/tools/statesManagement.js
Replace == with === and != with !==
2012-11-23 23:02:28 -06:00
Milow bceb2ee3f9 Fixup js/tools.js
1. Replace == with === and != with !==
2. Add missing semicolons to lines 238 and 241
2012-11-23 22:58:54 -06:00
Milow 1a2a714a16 Fixup js/stores.js
1. Replace == with === and != with !==
2. Fixed variable scrope issue
3. Added missing () to constructors on lines 165 and 186
2012-11-23 22:53:44 -06:00
Milow f6e26c66cb Fixup js/scenes.js
Replace == with ===
2012-11-23 22:49:34 -06:00
Milow 4e46f39360 Fix up js/products-comparison.js
Replace == with ===
2012-11-23 22:48:16 -06:00
Milow f15e8399ff Fixup js/product.js
Error fixes:
1. Added missing semicolons to lines 94, 103, and 680

General fixes:
1. Replace new Array() with []
2. Replace new Number with simply 0. If not, === checks will be broken
3. Replace == with === and != with !==
4. Fixed a couple variable scopes
5. Removed var from line 423 that was not needed because it was already
defined
6. Added vars to for loops
2012-11-23 22:45:47 -06:00
Milow b6052413c6 Fixup js/order-opc.js
Error fixes:
1. Added missing var on line 89
2. Added missing semicolons on lines 98, 104, 110, 181, 766, 781

General fixes:
1. Replace == with === and != with !==
2. Added missing var to for loops
3. Moved a few var scopes to the correct location
2012-11-23 22:23:28 -06:00
Milow 0f6d6e9747 Fixup js/order-address.js
Replace == with === and != with !==
Added var to for loop
2012-11-23 22:09:15 -06:00
Milow 766a9677e2 Fixup js/history.js
Change == to === and != to !==
2012-11-23 22:06:11 -06:00
Milow 2ed7b970a8 Fixup js/cart-summary.js
Cleanup of cart-summary.js

Error fixes:
1. Added two missing semicolons on line 34 and line 622
2. Fix var scrope around lines 229 and 805

General fixes:
1. Changed all == to === and != to !==
2. Added missing var to undefined variables in for loops
2012-11-23 22:02:11 -06:00