914 Commits

Author SHA1 Message Date
Vincent Augagneur 901c08cac8 [-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed 2013-08-27 18:13:22 +02:00
Rémi Gaillard 2435edc98c // small fix 2013-08-26 17:17:26 +02:00
Rémi Gaillard 1b26cfffd9 // small fix 2013-08-26 17:13:29 +02:00
Jerome Nadaud 94133bf734 [-] FO : FixBug duplicate fields for delivery address in OPC mode 2013-08-22 16:45:52 +02:00
Vincent Augagneur 8a0745e8de [-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore 2013-08-19 17:21:03 +02:00
Jerome Nadaud c180a20cf9 [-] BO : FixBug #PSCFV-7571 Error checking available product quantity 2013-08-14 17:16:41 +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 1359f46bae [-] FO : FixBug #PSCFV-10090 urlencode syntax error - Thanks Duarte 2013-08-12 14:37:32 +02:00
gRoussac e923455f6d // revert from https://github.com/PrestaShop/PrestaShop/commit/589052325b121282d091986cd64b5d82e8890ecd 2013-08-08 18:58:04 +02:00
Rémi Gaillard 589052325b // Fix cart with ssl 2013-08-08 15:52:16 +02:00
Gregory Roussac ba69e48f72 Merge pull request #488 from camlafit/pr-countriesbrowser
[*] FO : Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE
2013-08-06 03:07:13 -07:00
gRoussac 6449437f58 // norms 2013-08-06 11:38:34 +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
jeromenadaud a93667a58b [-] FO : FixBug Wrong offset in more than one shipping address 2013-07-30 17:03:15 +02:00
Gregory Roussac 3896453c7c Merge pull request #352 from sdevilcry/development
[-] CORE : Fix issue after a payment redirection error, delivery_option is not sent
2013-07-25 06:11:51 -07:00
Jérôme Nadaud 7b980217b5 // norm 2013-07-25 08:49:40 +02:00
Jérôme Nadaud 541a4525b5 [-] FO : FixBug #PSCFV-9879 Email confirmation message not present 2013-07-24 19:24:22 +02:00
Gregory Roussac c025b8cb2b Merge pull request #568 from urecheatu007/development
[-] CORE : setMedia() proper order for typewatch and cart-summary.js
2013-07-23 10:15:43 -07:00
gRoussac 3483706951 [-] FO : Prevent unsassigned category id, thans @PrestaCaptainFLAM 2013-07-20 19:07:10 +02:00
Jérôme Nadaud dd78e97b4a [-] FO : FixBug #PSCFV-7723 Bad manufacturers list pagination 2013-07-18 17:09:44 +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
gRoussac ca4a73ddf4 // avoid copy paste mistake with trailing space 2013-07-15 15:34:34 +02:00
gRoussac f1dcf02caf //fix warnings #PSCFV-9786 2013-07-15 14:25:58 +02:00
Cosmin Hutanu 324dff0595 ParentOrderController->setMedia() proper order for typewatch and cart-summary
In the original class, typewatch is inserted after cart-summary, but it is used for the quantity input in cart-summary.js, so we need to have typewatch first.
2013-07-15 00:56:56 +03:00
Rémi Gaillard d8a444335f Merge pull request #524 from ChristopheBoucaut/development
Update OrderDetailController.php
2013-07-11 08:26:13 -07:00
Damien Metzger d772d97bfa [-] BO : you can now have different mail topic for one mail template #PSCFV-9617 2013-07-11 14:27:40 +02:00
gRoussac 105ae7e59f [*] FO : Retrieve invoice address in OPC + guest checkout, thanks @Piotr Moćko 2013-07-10 18:16:09 +02:00
gRoussac 5e0893979b [-] FO : Fix bug #PSCFV-9021 : bad category id for breadcrumb on product when url rewrite is on 2013-07-09 16:06:21 +02:00
gRoussac 19c9ae0a5c [-] FO : Fix bug #PSCFV-9653 could not return a custom product 2013-07-05 18:15:27 +02:00
Staging 68cb702350 [-] Mobile : Bug fix : Authentication & phone number 2013-07-01 11:08:14 +02:00
Fabio Chelly 668181d8ec Newsletter field is always shown in create account form even if blocknewsletter module is disabled 2013-06-28 18:11:44 +02:00
Rémi Gaillard c025024b40 // fix php warning if no image is associated to the producr 2013-06-27 18:14:07 +02:00
ChristopheBoucaut 0de8c2dbc6 Update OrderDetailController.php
Fixed link between thread and an order's product
2013-06-27 15:49:40 +02:00
Vincent Augagneur 56e75d0e9a [-] CORE : fixed bug #PSCFV-8745 Contact form e-mail template with incomplete information 2013-06-26 18:01:26 +02:00
Vincent Augagneur 3d2e46b14f [-] FO : fixed bug #PSCFV-9388 - newsletter is required error, showing two times 2013-06-26 11:46:02 +02:00
Vincent Augagneur cc4c8bfbe7 [-] CORE : fixed bug #PSCFV-9460 2013-06-25 15:25:08 +02:00
gRoussac 4dbaf98cc8 [-] FO : Fix one_phone_at_leastphone again when PS_REGISTRATION_PROCESS_TYPE = 1 && PS_ORDER_PROCESS_TYPE =0 2013-06-25 10:44:41 +02:00
gRoussac 21856959a2 [-] Fix bug #PSCFV-9414 bad check on states when PS_REGISTRATION_PROCESS_TYPE = 0 2013-06-24 13:54:02 +02:00
gRoussac 2e8c89e543 [-] FO : Fix #PSCFV-9414 submitGuestAccount is not submitAccount 2013-06-21 10:39:58 +02:00
gRoussac 55414552d4 [-] FO : Fix #PSCFV-7388 again Instant checkout - State validation 2013-06-19 14:45:01 +02:00
Damien Metzger 76f686a95b Merge pull request #496 from matthieume/master
[*] FO : NewProductController: new products page must display latest products first.
2013-06-14 00:28:39 -07:00
MatthieuB cafbed08ee NewProductController: new products page must display latest products first.
Override default configuration values: cause the new products page must
display latest products first.
2013-06-10 21:13:23 +02:00
cam.lafit 663ec76bb9 Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE
With HTTP_ACCEPT_LANGUAGE we have two choices :
* Country == language (displayed with two letter as fr,de,en,...)
* Country with multi language (displayes as fr-CH, de-CH, it-CH)

Previous regexp find only first case.
2013-06-10 11:00:49 +02:00
gRoussac 72bf6dc56d // bad commit 2013-05-29 17:25:41 +02:00
gRoussac ea5405a917 [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ec8deb289185daa03cd11d239797bbe5bdbaecd0 2013-05-27 19:06:59 +02:00
gRoussac 5743696596 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-27 18:13:12 +02:00
Vincent Augagneur 444f59c9aa Merge pull request #422 from e-gaulue/AuthController_patch
[*] FO : AuthController can now have its own template
2013-05-23 05:45:05 -07:00
djfm da2db7d799 // parse error 2013-05-22 11:11:37 +02:00
Rémi Gaillard 3d9596aa99 [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
vAugagneur 3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00