533b28ce32
Merge branch 'prestarocket-duplicate_id' into release
2013-08-13 18:26:51 +02:00
f459af7090
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
f9fdcb1103
[-] FO : fixed html tags that should not appear in blockcategories
2013-08-13 16:22:38 +02:00
284f758cb4
[-] FO: Fix quantity discount table display for non default attribute #PSCFV-9942
2013-08-12 18:40:52 +02:00
06cdeb45a5
[-] FO : FixBug #PSCFV-10058 - Missing required form fields in address format
2013-08-12 15:17:21 +02:00
4c47c980f8
// Javascript error if address does not exist
2013-08-12 11:57:40 +02:00
f119b8e64f
[-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country
2013-08-09 19:00:18 +02:00
7b41098a5d
[-] FO : FixBug CGV does not pop-up in Fancy Box
2013-08-09 18:59:00 +02:00
8be3344e41
// W3C validation error
2013-08-09 18:49:47 +02:00
8733b968f5
[-] FO : input token missplaced in address.tpl
2013-08-09 14:31:59 +02:00
7089ce10ef
// remove warnings in blockwishlist
2013-08-06 19:05:08 +02:00
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
bf355e934e
Merge pull request #634 from PhpMadman/RefSort
...
[*] FO : Sort by Product reference
2013-08-06 09:13:06 -07:00
d4270289c1
Update category-product-sort.tpl
2013-08-06 16:06:03 +02:00
c8564fa6b2
// Quick CSS fix
2013-08-06 16:02:22 +02:00
375fa451d8
[-] FO : FixBug No warning message when no carriers available from advanced stock management
2013-08-06 15:53:25 +02:00
598a5b3188
[*] FO : Add reference sort to theme
2013-08-06 15:38:25 +02:00
cd254f8795
[*] FO : Add reference sort to theme
2013-08-06 15:37:10 +02:00
4bd59c14cc
[*] FO : Blur for tab navigation, followup a0ee3d3, thanks @Seynaeve
2013-08-06 15:21:46 +02:00
a739117f0d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 15:20:07 +02:00
8103e89874
[*] FO : Blur for tab navigation, followup a0ee3d3c34, thanks @Seynaeve
2013-08-06 15:19:47 +02:00
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
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
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
fe0afeadc9
[-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu
2013-08-06 11:45:29 +02:00
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
8c2af798a4
// small change on pack css
2013-08-05 12:01:40 +02:00
8a9376ae22
[-] FO : Fix bug #PSCFV-9993 could not see product quantity in pack content
2013-08-01 14:28:36 +02:00
2b6b65a303
// norms
2013-08-01 14:27:50 +02:00
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
aa9a6e66b8
[-] FO : FixBug #PSCFV-9951 Syntax error - Thanks to Oleacorner-Olivier B
2013-07-29 17:44:14 +02:00
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
ae7ee01028
[*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages
2013-07-25 12:26:57 +02:00
541a4525b5
[-] FO : FixBug #PSCFV-9879 Email confirmation message not present
2013-07-24 19:24:22 +02:00
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
a6a700c9d8
// parse error
2013-07-18 18:40:19 +02:00
2c6978e97c
[-] BO : FixBug #PSCFV-6140 Pagination link error
2013-07-18 14:55:28 +02:00
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
6ea4a2c553
[-] FO : Fix bug #PSCFV-9662 udpate payments means after delete thanks @maofree
2013-07-15 10:08:16 +02:00
9c44faf295
[-] FO : Fix bug #PSCFV-9754 do not use back url on cart summary link in steps
2013-07-12 16:59:11 +02:00
105ae7e59f
[*] FO : Retrieve invoice address in OPC + guest checkout, thanks @Piotr Moćko
2013-07-10 18:16:09 +02:00
8b16bd44aa
[*] FO : Fix bug #PSCFV-9440 add another address in guest checkout in OPC
2013-07-10 17:43:36 +02:00
cf849077ed
// small css fix on history
2013-07-05 17:43:10 +02:00
9f0867b700
[-] FO : could not see old_price_display when specific price on one combination
2013-07-05 14:42:39 +02:00
91cd196cf6
// remove console.log sorry bad commit
2013-07-05 12:29:29 +02:00
128ceffcc0
[-] FO : Bad specific price for a combination // sorry
2013-07-05 12:28:10 +02:00
268f1fd030
[-] FO : Bad specific price for a combination
2013-07-05 12:11:02 +02:00
df7b5c9861
[-] FO : Fix bug #PSCFV-9669, update total price on order-payment
2013-07-04 17:25:00 +02:00
1da44dbb7a
[-] Mobile : Bug fix - Order address template fixed
2013-07-01 16:52:16 +02:00
68cb702350
[-] Mobile : Bug fix : Authentication & phone number
2013-07-01 11:08:14 +02:00
gRoussac