Commit Graph

144 Commits

Author SHA1 Message Date
sThiebaut 7b10cf02a2 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:15:30 +00:00
sThiebaut f5496845b6 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11121 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:07:07 +00:00
sThiebaut 9fef2d5713 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11120 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:06:54 +00:00
sThiebaut 1120a5e2f3 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11113 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:28:47 +00:00
mDeflotte d843b14ac6 // BugFix : Display errors when no carriers available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11112 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:21:56 +00:00
sThiebaut 53246d0fcc // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11067 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 17:08:13 +00:00
rGaillard 86b65ef6df [+] BO: Add Specific prices bulk generator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11056 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:01:10 +00:00
sThiebaut f2fbf0687b // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11010 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:39:36 +00:00
sThiebaut d53a71636d // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11009 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:39:17 +00:00
mDeflotte 85b186a956 // BugFix : Problem with delivery_option calculation
// @TODO : All the undefined index are now fixed but there is not all the available delivery option

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11007 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:35:38 +00:00
mDeflotte c843e9bd84 // BugFix in checkout with multishipping on step address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11003 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 16:03:00 +00:00
bMancone bda11e1541 // Supply Orders : added supplier address in the order form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10998 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:27:38 +00:00
mDeflotte 943741871e // Multishipping button is replaced by a checkbox
// BugFix with back params in the checkout process

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10994 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:56:29 +00:00
mDeflotte 476923cf36 // BugFix : Prevent undefined index multi_shipping in template orders-step.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10989 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:37:00 +00:00
fBrignoli 187aafaf51 [*] PDF : Licenses + Hook in templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10974 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 10:58:20 +00:00
sThiebaut 6bea0782e9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10953 b9a71923-0436-4b27-9f14-aed3839534dd 2011-12-05 17:22:27 +00:00
mDeflotte 31e90d9031 // Retrocompatibility : Now old 1.4 template works with new chechout process. Multishipping cannot be enabled.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10948 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:11:26 +00:00
mDeflotte db38a475f1 // BugFix in Product compare
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10927 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:30:01 +00:00
mMarinetti 9ba2f9b023 // theme norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10910 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:45:24 +00:00
sThiebaut 7d91e29519 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10908 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:41:40 +00:00
mDeflotte 6f1ecda602 // Fixing some problem with new theme and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10902 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:57:44 +00:00
vChabot 43648c6ca2 // little fix authentication in multiple steps
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10871 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:17:14 +00:00
vChabot ed98703212 [*] BO : you can now affect a zone to multiple countries and to multiple states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10865 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:41:05 +00:00
mMarinetti 9cc30dc3fe [+] Project : default theme added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:24:40 +00:00
mDeflotte 9e72ba7740 // Allow / Disallow multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10837 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 16:34:20 +00:00
mDeflotte 8ae27b7a8a // Removing a console.log
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10832 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:34:53 +00:00
mDeflotte 394206e9ef // id_warehouse is now on the order details and not on orders table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10831 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:31:26 +00:00
mDeflotte e111883814 // Adding reference of the order on the history
// Improving render of the button multi-shipping

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10825 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 12:58:21 +00:00
mDeflotte 7577e5ff0f // Change sentence "Allow seperated package"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10718 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 16:47:50 +00:00
mDeflotte bd9bcc6729 // Add "Allow seperated package" checkbox on the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10698 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 10:50:54 +00:00
vAugagneur 47b2176b4d //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10637 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:07:30 +00:00
fSerny 3c7d9ba53b [*] BO : Partial refund - part 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10611 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:42:27 +00:00
tDidierjean 42134be069 // Fix incorrect translation strings in tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10609 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:33:13 +00:00
mDeflotte f21b8defa1 // BugFix with id_address_delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10595 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 19:27:57 +00:00
vSchoener e66762fc85 // Update bad javascript var for opc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10581 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:09:50 +00:00
dMetzger f670f7573f [+] BO : add new feature, Order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:45:52 +00:00
mDeflotte 3989b708c8 // Delivery option are now auto-selected in the checkout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10572 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:21:30 +00:00
rGaillard 1207b5bf40 // Small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10558 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:31:53 +00:00
mDeflotte 73e4b5fe56 // BugFix : With Guest Checkout, an alert is displaying each time we increase/decrease the quantity of a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10530 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:59:14 +00:00
vChabot 109c38c5e0 // adding combination URL to the cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10528 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:50:50 +00:00
bMancone 2dbeb55bf1 // AdminProductsController: added new array to translate tabs name. Added translations of fr/admin & SupplyOrderForm(PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10516 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:41:25 +00:00
mDeflotte 6f6f13a4e0 // BugFix : "Please accept Terms of Service" always displayed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10508 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:32:29 +00:00
mDeflotte 4261dbc0df // Multishipping : Refresh carrier list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10502 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:57:21 +00:00
mDeflotte 5532f12d80 // Multishipping : on opc, on putting multi-shipping to off, the cart is set to one address delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10458 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:18:30 +00:00
mDeflotte 49922799e1 // BugFix : Problem with token
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10446 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:09:49 +00:00
mDeflotte 1962458d39 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10442 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 15:36:01 +00:00
mDeflotte 3fbdda4b45 // BugFix with a css rule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10432 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:46:00 +00:00
bMancone bbdf6513a8 // Update Supply Order Form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10428 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:37:36 +00:00
mDeflotte 8c0e148b75 // Re-put Cart->id_carrier + BugFix with shipping cost calculation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10417 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:50:53 +00:00
rMalie abead31e0f // Apply fix on reduction price from 1.4 to new system on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10412 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:24:19 +00:00