Commit Graph

1492 Commits

Author SHA1 Message Date
romainberger 876be3b452 [*] FO : removed extra slash and point 2013-09-12 14:07:45 +02:00
Fabio Chelly 9377775eca [-] MO productcomments :
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented

#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
2013-09-06 17:54:12 +02:00
gRoussac 824a6b90f3 [-] FO : Fix bug #PSCFV-10118 quantity not updated when cart rules give the same product as gift 2013-09-05 11:07:41 +02:00
Vincent Augagneur ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Rémi Gaillard a21d3fd22e // shipping block was missplaced on order-detail 2013-08-22 15:41:34 +02:00
gRoussac 533b28ce32 Merge branch 'prestarocket-duplicate_id' into release 2013-08-13 18:26:51 +02:00
gRoussac f459af7090 Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id 2013-08-13 18:26:22 +02:00
Krystian Podemski dab86dffe1 * [MO] : blocknewsletter improvements 2013-08-13 16:45:40 +02:00
Damien Metzger f9fdcb1103 [-] FO : fixed html tags that should not appear in blockcategories 2013-08-13 16:22:38 +02:00
Rémi Gaillard 284f758cb4 [-] FO: Fix quantity discount table display for non default attribute #PSCFV-9942 2013-08-12 18:40:52 +02:00
Jerome Nadaud 06cdeb45a5 [-] FO : FixBug #PSCFV-10058 - Missing required form fields in address format 2013-08-12 15:17:21 +02:00
Jerome Nadaud 4c47c980f8 // Javascript error if address does not exist 2013-08-12 11:57:40 +02:00
Jérôme Nadaud f119b8e64f [-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country 2013-08-09 19:00:18 +02:00
Jérôme Nadaud 7b41098a5d [-] FO : FixBug CGV does not pop-up in Fancy Box 2013-08-09 18:59:00 +02:00
Jerome Nadaud 8be3344e41 // W3C validation error 2013-08-09 18:49:47 +02:00
gRoussac 8733b968f5 [-] FO : input token missplaced in address.tpl 2013-08-09 14:31:59 +02:00
Jerome Nadaud a38fe5ddd3 // W3C validation error 2013-08-09 14:10:38 +02:00
Jérôme Nadaud 84ded9f3db [-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country 2013-08-08 23:30:31 +02:00
Jérôme Nadaud f5e28b9212 [-] FO : FixBug CGV does not pop-up in Fancy Box 2013-08-08 21:28:55 +02:00
Jerome Nadaud 8e72d122e6 [-] MO : blockcategories FixBug html tags in categories link title 2013-08-08 11:16:45 +02:00
Jerome Nadaud 239c5adb5a [-] BO : FixBug smarty email variable override by blockcontact 2013-08-07 15:09:14 +02:00
Jerome Nadaud a32ff1e930 [-] BO : FixBug Missing tpl dir in default layout 2013-08-07 11:17:42 +02:00
gRoussac 7089ce10ef // remove warnings in blockwishlist 2013-08-06 19:05:08 +02:00
Gregory Roussac b1ea66d510 Merge pull request #528 from ldecoker/patch-7
[-] FO : missing $tpl_dir shopping-cart.tpl pathes
2013-08-06 09:57:36 -07:00
Gregory Roussac bf355e934e Merge pull request #634 from PhpMadman/RefSort
[*] FO : Sort by Product reference
2013-08-06 09:13:06 -07:00
PhpMadman d4270289c1 Update category-product-sort.tpl 2013-08-06 16:06:03 +02:00
Damien Metzger c8564fa6b2 // Quick CSS fix 2013-08-06 16:02:22 +02:00
Jerome Nadaud 375fa451d8 [-] FO : FixBug No warning message when no carriers available from advanced stock management 2013-08-06 15:53:25 +02:00
PhpMadman 598a5b3188 [*] FO : Add reference sort to theme 2013-08-06 15:38:25 +02:00
PhpMadman cd254f8795 [*] FO : Add reference sort to theme 2013-08-06 15:37:10 +02:00
gRoussac 4bd59c14cc [*] FO : Blur for tab navigation, followup a0ee3d3, thanks @Seynaeve 2013-08-06 15:21:46 +02:00
gRoussac a739117f0d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 15:20:07 +02:00
gRoussac 8103e89874 [*] FO : Blur for tab navigation, followup a0ee3d3c34, thanks @Seynaeve 2013-08-06 15:19:47 +02:00
Gregory Roussac 12a3ef3a12 Merge pull request #486 from PhpMadman/patch-1
[-] FO : In stock sort is now removed when Stock managment is disabled
2013-08-06 15:08:55 +02:00
Seynaeve 4d29142907 Allow B2B to navigate through the form with Tab
With
$('#company').blur(function(){
VAT only appears when we leave the input and therefore does not allow to navigate through the form with Tab

With
$('#company').on('input',function(){
that work
2013-08-06 14:15:45 +02:00
Gregory Roussac 818e82c09c Merge pull request #486 from PhpMadman/patch-1
[-] FO : In stock sort is now removed when Stock managment is disabled
2013-08-06 02:49:48 -07:00
gRoussac fe0afeadc9 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu 2013-08-06 11:45:29 +02:00
gRoussac adceb5ccf5 [-] Fo : Bad date format in order-detail, merge from https://github.com/PrestaShop/PrestaShop/pull/476 thanks @gbelorgey 2013-08-05 19:16:44 +02:00
gRoussac 8c2af798a4 // small change on pack css 2013-08-05 12:01:40 +02:00
gRoussac 8a9376ae22 [-] FO : Fix bug #PSCFV-9993 could not see product quantity in pack content 2013-08-01 14:28:36 +02:00
gRoussac 2b6b65a303 // norms 2013-08-01 14:27:50 +02:00
gRoussac 184a1c561c [-] FO : Fix bug #PSCFV-9847 Cart Rule not updated when address is updated on Checkout Page 2013-08-01 11:44:00 +02:00
Jérôme Nadaud aa9a6e66b8 [-] FO : FixBug #PSCFV-9951 Syntax error - Thanks to Oleacorner-Olivier B 2013-07-29 17:44:14 +02:00
Gregory Roussac 30c689df22 Merge pull request #584 from Captain-FLAM/patch-3
[-] FO : product with declinaisons without reductions, reduction price is showed anyway
2013-07-26 00:58:00 -07:00
gRoussac ae7ee01028 [*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages 2013-07-25 12:26:57 +02:00
Jérôme Nadaud 541a4525b5 [-] FO : FixBug #PSCFV-9879 Email confirmation message not present 2013-07-24 19:24:22 +02:00
Captain FLAM 2e860d6750 Update product.js
if product with declinaison without reduction : reduction price is showed !!

because of this comparison after (line ~400):

if (productPriceWithoutReductionDisplay > productPriceDisplay)

and :

var tmp = productPriceDisplay * group_reduction;

is unused
2013-07-22 18:58:59 +01:00
gRoussac a6a700c9d8 // parse error 2013-07-18 18:40:19 +02:00
Jérôme Nadaud 2c6978e97c [-] BO : FixBug #PSCFV-6140 Pagination link error 2013-07-18 14:55:28 +02:00
gRoussac d55f31d3b5 Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment
Conflicts:
	classes/Tools.php
	controllers/front/ContactController.php
2013-07-17 15:35:18 +02:00