Commit Graph

2418 Commits

Author SHA1 Message Date
Guillaume Barral
bcd817f9d9 initialize the order in the $event object in the createManual function.
We need to initialize it because we have to  use the placedOrder instead
2014-05-19 11:06:19 +02:00
Guillaume Barral
c4be881ab8 add the test of a non null order in the $event object in createManual function 2014-05-19 11:01:19 +02:00
Guillaume Barral
db94749dc0 set the placedOrder in the createManual function 2014-05-19 09:43:42 +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
Franck Allimant
112cb8eeb0 Added ForSomeCustomer condition 2014-05-12 23:37:43 +02:00
Franck Allimant
eb0054d21e Typo 2014-05-10 22:52:19 +02:00
Franck Allimant
ad0aafeb31 Fixex #399 2014-05-10 22:51:20 +02:00
Franck Allimant
07411b95a1 Added more conditions 2014-05-10 12:13:02 +02:00
Franck Allimant
0a4003ae1c Fixed condition names 2014-05-10 12:12:48 +02:00
Franck Allimant
59ca9760a3 Added cart contains products condition 2014-05-10 12:12:19 +02:00
Franck Allimant
c4af0a9aef Added cart contains categories condition 2014-05-10 12:11:48 +02:00
Franck Allimant
862d8ec913 Prevent Fatal error if current order coupon is deleted 2014-05-10 12:10:45 +02:00
Franck Allimant
df9b19cb91 Typo 2014-05-10 02:57:02 +02:00
Franck Allimant
de9547fc8e Updated translations 2014-05-10 02:55:17 +02:00
Franck Allimant
a581a6ca0f Fixed criteria lablels 2014-05-10 02:47:23 +02:00
Franck Allimant
6632eba9f4 Added countries and start date conditions 2014-05-10 02:39:24 +02:00
Franck Allimant
f76e5d7aaa Added start date condition 2014-05-10 02:38:03 +02:00
Franck Allimant
c39de8bf87 Improved condition code structure (still backward compatible) 2014-05-10 01:37:09 +02:00
Franck Allimant
38e16f0502 Changed name 2014-05-10 01:36:49 +02:00
Franck Allimant
2aa8d804b0 Changed condition parameter name 2014-05-10 01:36:11 +02:00
Franck Allimant
861e6b0513 Changed condition parameter name 2014-05-10 01:35:28 +02:00
Franck Allimant
5bcb08846f Changed condition parameter name 2014-05-10 01:32:46 +02:00
Franck Allimant
612613fd71 Changed condition parameter names 2014-05-10 01:32:14 +02:00
Franck Allimant
06d7eb4fc1 Implemented getDeliveryAddress() 2014-05-10 01:29:54 +02:00
Franck Allimant
f83c9f05fd Fixed Equals and No Equals labels 2014-05-10 01:29:12 +02:00
Franck Allimant
45c32271b7 Removed duplicate condition 2014-05-10 01:28:42 +02:00
Franck Allimant
7bb0368d7f Very minor improvement on conditions evaluation 2014-05-10 01:28:03 +02:00
Franck Allimant
8054149dbd Added country condition 2014-05-10 01:12:06 +02:00
Franck Allimant
073905200e Added delivery country condition 2014-05-10 00:10:32 +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
d4ade9afc0 integration of Czech translation 2014-05-06 11:07:09 +02:00
Manuel Raynaud
fa71c8c4d5 integration of russian translation 2014-05-06 11:01:32 +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
fcceef8ab8 add missing english translations 2014-05-05 12:42:50 +02:00
Manuel Raynaud
793e66af74 Merge pull request #371 from roadster31/coupons
Coupons
2014-05-05 10:58:59 +02:00
Franck Allimant
4673a14b76 Typo 2014-05-05 10:04:38 +02:00
Manuel Raynaud
ca9d9c89c5 fix wrong smtp config 2014-05-05 09:56:40 +02:00
Franck Allimant
f9e4c33875 No % or money symbol in HTML generated by CouponAbstract 2014-05-05 09:52:27 +02:00
Franck Allimant
091e7f9f64 Re-added the html generatrion code in drawBackOfficeInputs() 2014-05-04 19:31:41 +02:00
Franck Allimant
457f5dba7c Completed french translation 2014-05-03 12:39:29 +02:00
Franck Allimant
d42e5cd557 drawBackOfficeInputs is no longer abstract 2014-05-03 12:23:48 +02:00
Julien Chanseaume
751fcdeb59 php cs fixer 2014-05-03 11:39:12 +02:00
Franck Allimant
8c044303f2 drawBackOfficeInputs() is now abstract 2014-05-02 20:54:53 +02:00
Franck Allimant
500a945f98 HTML fragments in templates instead of hardcoded 2014-05-02 20:52:59 +02:00
Franck Allimant
fe93bfacec Typo 2014-05-02 20:22:10 +02:00