Commit Graph

1204 Commits

Author SHA1 Message Date
Guillaume Barral
2587f208c6 add argument id to the order_product loop 2014-05-27 08:44:49 +02:00
Manuel Raynaud
6eaea72043 don't catch exception when javscript assets are processed 2014-05-26 11:07:02 +02:00
Manuel Raynaud
2ace0796e8 session is now initialize using dispatcher 2014-05-20 09:44:04 +02:00
Manuel Raynaud
1a08cabd6e Merge pull request #413 from roadster31/coupon-types
Coupon types
2014-05-19 10:50:53 +02:00
Manuel Raynaud
d153ca04c3 Merge pull request #415 from zzuutt/master
Ajout d'une d'une variable en sortie dans la boucle cart
2014-05-19 09:37:40 +02:00
Franck Allimant
12fb52dc88 Optimisation : 60*60*24 -> 86400 2014-05-18 20:21:23 +02:00
Franck Allimant
ab060486d0 Fixed Thelia\Model\Base uses. 2014-05-18 20:19:48 +02:00
Nicolas Léon
957140a5b7 Allow sorting by creation date for Content Loop 2014-05-18 13:43:56 +02:00
Nicolas Léon
811186f4aa Allow sorting by creation date for Content Loop 2014-05-18 13:34:41 +02:00
zzuutt
482302e2b2 Ajout d'une variable de sortie a la boucle cart
n'ayant pas trouve le moyen dans le cart de faire afficher la reference de la combinaison au lieu de la reference du produit, je demande si cela est possible de rajouter celle-ci.

La variable '$PRODUCT_SALE_ELEMENTS_REF'

Merci
2014-05-17 23:23:57 +02:00
Franck Allimant
ef142ca077 Applied php-cs-fixer 2014-05-17 10:56:28 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
90947bcda9 Free shipping restricitions based on Countries and Shipping module 2014-05-16 10:30:15 +02:00
Franck Allimant
ffd842cbf6 Added FREE_SHIPPING_FOR_COUNTRIES_LIST and FREE_SHIPPING_FOR_MODULES_LIST 2014-05-16 10:07:25 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Franck Allimant
683664cb07 Added Model\Module::getModuleInstance() method 2014-05-15 16:50:34 +02:00
Franck Allimant
ad0aafeb31 Fixex #399 2014-05-10 22:51:20 +02:00
Manuel Raynaud
85d80d1d77 fix minor bug 2014-05-09 10:55:50 +02:00
Manuel Raynaud
772aba093b increment thelia version 2014-05-06 15:04:05 +02:00
Guillaume Barral
e568ed67ce Allow to use configDir in module 2014-05-06 11:50:05 +02:00
Manuel Raynaud
4cd2ea6316 complete lang form including money format 2014-05-06 10:53:16 +02:00
Julien Chanséaume
bb43a12fba Some tweaks added. We can now override module assets by redefining them in the template.
if they are not in the template, it takes them from the module.

if an asset does not exist, exception is catched and it no longer breaks the response.
2014-05-06 09:23:38 +02:00
Manuel Raynaud
d5c5e167a6 check shipping configuration in delivery loop. Fix #311 2014-05-05 14:37:44 +02:00
Manuel Raynaud
793e66af74 Merge pull request #371 from roadster31/coupons
Coupons
2014-05-05 10:58:59 +02:00
Julien Chanseaume
751fcdeb59 php cs fixer 2014-05-03 11:39:12 +02:00
Franck Allimant
d54dd4d054 Added order parameter, improved request 2014-05-02 17:10:19 +02:00
Manuel Raynaud
67293555ba refactor content loop splitting parseResults method 2014-04-30 10:57:04 +02:00
Manuel Raynaud
270b5f6499 filter with contentFolder table for finding next/prev content 2014-04-30 10:32:17 +02:00
Manuel Raynaud
b15d52e6d3 create prev next arg for content loop. Fix #361 2014-04-30 10:22:12 +02:00
Manuel Raynaud
d0edbdfd5b change price if needed when customer log in or log out 2014-04-29 11:35:10 +02:00
Manuel Raynaud
406b06e09d use customer permanent discount 2014-04-29 10:56:07 +02:00
Manuel Raynaud
8aa5912a7a return redirectReponse insteadof sending it 2014-04-28 22:21:06 +02:00
Manuel Raynaud
c4b2898830 Merge pull request #345 from roadster31/various-fixes
Various fixes
2014-04-28 21:56:01 +02:00
Julien Chanséaume
0b3ad194e0 unnecessary code removed, adding new configuration values in update sql 2014-04-28 15:28:25 +02:00
Julien Chanséaume
88a5acd047 unnecessary code removed 2014-04-28 14:41:36 +02:00
Julien Chanséaume
5856b0849b unnecessary code removed 2014-04-28 14:39:32 +02:00
Julien Chanséaume
7c4ebe6bf7 php cs fixer 2014-04-28 12:30:31 +02:00
Julien Chanséaume
ac51ab21e4 add estimated shipping functionnality in cart 2014-04-28 12:24:43 +02:00
Franck Allimant
addbd9a84c Check if modules could be instantiated 2014-04-26 16:01:22 +02:00
Julien Chanséaume
b86ac88ce4 fix cart item prices when not on default currency 2014-04-25 16:55:20 +02:00
Manuel Raynaud
b2654b0ca8 add force_return argument to Document loop 2014-04-25 10:13:53 +02:00
Manuel Raynaud
4dbd3c2bbe Merge pull request #342 from roadster31/various-fixes
Various fixes
2014-04-25 09:12:10 +02:00
Franck Allimant
74dabb348a Fixed a minor template processing problem with \" 2014-04-24 23:47:22 +02:00
Manuel Raynaud
0deadcd247 create resource and page for export 2014-04-24 17:55:09 +02:00
Manuel Raynaud
dbe641ad84 create new resources 2014-04-24 17:55:09 +02:00
Franck Allimant
83ab70082d Changed "Cache" by "Advanced configuration" 2014-04-24 12:29:43 +02:00
Franck Allimant
112f9b91aa Fixed #326 2014-04-22 16:22:53 +02:00
Manuel Raynaud
7593717736 remove RC1 references 2014-04-22 14:30:44 +02:00
Manuel Raynaud
0435478ae8 fix cs 2014-04-22 12:43:57 +02:00
Manuel Raynaud
7b497fdcc2 apply good order status label on customer account. Fix #319 2014-04-21 22:17:20 +02:00