 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 |
|
|
mDeflotte
|
eab460df2d
|
// BugFix id_carrier in cart not defined + choosing address delivery for multishiping on opc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10389 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 09:28:22 +00:00 |
|
|
bMancone
|
de6d9c7bbe
|
// Supply Orders: the supply order form is now generated (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10374 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 18:31:44 +00:00 |
|
|
rMalie
|
9d10de0848
|
// Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:05:10 +00:00 |
|
|
mDeflotte
|
0ce1e22813
|
// BugFix with opc and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10330 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 10:42:14 +00:00 |
|
|
fBrignoli
|
67f4bf47da
|
// weird characters in delivery slip template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10311 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 08:37:01 +00:00 |
|
|
rGaillard
|
bc160bb762
|
// Fix many smarty notices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10287 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-19 13:48:31 +00:00 |
|
|
mDeflotte
|
5e6ab08a00
|
// Merging multishipping branche on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 11:13:31 +00:00 |
|
|
fBrignoli
|
e5f3c3ca2a
|
[*] PDF : PDF is now rendered by TCPDF throught HTML template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10231 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-17 17:15:23 +00:00 |
|
|
rGaillard
|
a1fb08f026
|
// Improve Specific prices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10118 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-14 17:40:42 +00:00 |
|
|
vChabot
|
ed1a1ab1c6
|
// add back button to the account creation form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10054 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-10 17:11:52 +00:00 |
|
|
vChabot
|
82319ab68d
|
// call to checkUrl() only if the URL has changed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10051 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-10 16:32:17 +00:00 |
|
|
vChabot
|
669aed08c6
|
[*] FO : Register process enhancement
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10029 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-10 10:56:14 +00:00 |
|
|
vChabot
|
568327849c
|
[*] FO : combination link from product page are now the same as the combination link from blocklayered
// Cart is now accepting the combination link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10028 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-10 10:45:19 +00:00 |
|
|
vChabot
|
42bfc372da
|
// adding ajax script
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10002 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-09 15:21:32 +00:00 |
|
|
rGaillard
|
77a66c64fd
|
[*] Core : Specific prices can now be applied to combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9897 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-04 15:53:53 +00:00 |
|
|
dMetzger
|
873b94a743
|
// Temporary fix for free_shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9842 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-03 14:36:45 +00:00 |
|
|
dMetzger
|
486622522c
|
[+] Project : Vouchers are now replaced by cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-01 18:50:42 +00:00 |
|
|
vChabot
|
e856cf4a5d
|
// removing possibility to edit quantity in the command process, step 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9614 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-25 08:15:43 +00:00 |
|
|
aFolletete
|
14632c7fbe
|
// bug fix on new AdminOrders + optimization
[~] FO : usage of $customizedDatas var in order-detail.tpl is now deprecated use $product.customizedDatas
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9589 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-24 13:19:54 +00:00 |
|
|
mDeflotte
|
71dcca6695
|
[-] On the phoduct page , some space are missing: "You must add4as a minimum quantity to buy this product."
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9497 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-20 12:20:55 +00:00 |
|
|
rMalie
|
42564ca3d0
|
// Merge -> revision 9435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-19 08:14:42 +00:00 |
|
|
vChabot
|
6517b06539
|
[+] FO : you can access to a product combination with its own url (e.g: http://www.myshop.com/index.php?controller=product&id_product=1#disk-space=16go&color=yellow)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9425 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-18 14:03:02 +00:00 |
|
|
rMalie
|
336fb68ef4
|
// Merge -> revision 9385
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9386 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-17 09:55:33 +00:00 |
|
|
rMalie
|
45645f1f50
|
// Merge -> revision 9352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-14 08:20:54 +00:00 |
|
|
rMalie
|
798de9aaea
|
// Merge -> revision 9288
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-12 16:04:28 +00:00 |
|
|
rMalie
|
de69396a04
|
// Merge -> revision 9221
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-11 12:45:12 +00:00 |
|
|
rMalie
|
14542fea44
|
// Merge -> revision 9124
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-07 09:54:43 +00:00 |
|
|
vChabot
|
23c5f297ce
|
// little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9072 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-05 15:45:01 +00:00 |
|
|
rMalie
|
b4d436ca21
|
// Merge -> revision 9061
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-05 15:21:55 +00:00 |
|
|
lBrieu
|
fce8c6a4e0
|
[*] FO : Hide the download link if the virtual product do not have files associated with it
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9062 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-05 14:27:30 +00:00 |
|
|
vChabot
|
8fcc94e777
|
[*] Registration type is now in 2 steps or all in one
// refactoring AuthController.php (front)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8941 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-30 15:48:20 +00:00 |
|
|
rMalie
|
227e13680b
|
// Refacto of CategoryController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8898 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 16:31:32 +00:00 |
|
|
mDeflotte
|
093c743141
|
[-] FO : BugFix - Ajax error on editing address durring ordering process
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8896 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 16:19:33 +00:00 |
|
|
rMalie
|
8b59a8dd04
|
// Fix authentification gender
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8895 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 16:13:50 +00:00 |
|
|
rMalie
|
42c5603cc3
|
[+] Classes: Add ObjectModel::hydrateCollection() in order to transform arrays from sql queries return in list of objects
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8877 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 13:23:54 +00:00 |
|
|
mDeflotte
|
a40968d40e
|
// Add error message in order details
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8871 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 12:29:29 +00:00 |
|
|
mDeflotte
|
590fbe0ef0
|
//OrderReturnController : Refacto done
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8868 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 09:05:03 +00:00 |
|
|
rMalie
|
be8d2136be
|
// Merge -> revision 8851
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-28 16:03:30 +00:00 |
|
|
vChabot
|
966250e202
|
// cleaning code (norm / perf)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8837 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-28 09:37:29 +00:00 |
|
|
vChabot
|
2045401f9e
|
// cleaning code (norm / perf)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8810 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-27 15:08:24 +00:00 |
|