TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,632 Commits 1 Branch 0 Tags
d5c5e167a66f59b087bd77a5a57d1d98bfec8d07
Commit Graph

2381 Commits

Author SHA1 Message Date
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
Franck Allimant
617f2900e0 Fixed test 2014-05-02 20:21:33 +02:00
Franck Allimant
621c17c97d Fixed form error management 2014-05-02 20:08:38 +02:00
Franck Allimant
7781fe5f59 Minor syntax change. 2014-05-02 20:00:19 +02:00
Franck Allimant
98f4395a07 Removed unused parser reference in contructor 2014-05-02 19:59:33 +02:00
Franck Allimant
8bf94517f2 No longer used 2014-05-02 18:25:31 +02:00
Franck Allimant
23a74999e8 Fixed date manipulation² 2014-05-02 18:24:15 +02:00
Franck Allimant
5e3585766d Added a localized check to the expiration date 2014-05-02 18:23:36 +02:00
Franck Allimant
3b7589ec84 Removed useless transactions 2014-05-02 18:23:04 +02:00
Franck Allimant
7996c866d3 Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons 
Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	templates/backOffice/default/coupon/form.html
 2014-05-02 17:16:39 +02:00
Franck Allimant
9d3dd8687a Added the transformer 2014-05-02 17:10:28 +02:00
Franck Allimant
989a44591f Added date translator 2014-05-02 17:10:27 +02:00
Franck Allimant
8ce6cdbae0 Fixed date input format and conversion 2014-05-02 17:10:27 +02:00
Franck Allimant
aa48a73343 Removed the useless coupon read function 2014-05-02 17:10:25 +02:00
Franck Allimant
6b020fda13 Fixed labels, using templates for HTML fragments 2014-05-02 17:10:22 +02:00
Franck Allimant
bbe7634ad4 Using templates for conditions HTML fragments 2014-05-02 17:10:22 +02:00
Franck Allimant
70671c6949 Normalized coupon list appearance, added sorting 2014-05-02 17:10:19 +02:00
Franck Allimant
d54dd4d054 Added order parameter, improved request 2014-05-02 17:10:19 +02:00
Franck Allimant
7c1c3541b0 Removed the useless coupon read function 2014-05-02 12:24:11 +02:00
Franck Allimant
b776a36bbd Fixed labels, using templates for HTML fragments 2014-05-02 12:07:17 +02:00
Franck Allimant
5518c6f0bd Using templates for conditions HTML fragments 2014-05-02 12:06:21 +02:00
Franck Allimant
8496685814 Normalized coupon list appearance, added sorting 2014-05-01 19:20:32 +02:00
Franck Allimant
4bcc2f7fa8 Added order parameter, improved request 2014-05-01 19:20:00 +02:00
Manuel Raynaud
2ce1c79653 change image translation domain 2014-04-30 14:25:17 +02:00
Manuel Raynaud
171d388c41 change error message on image upload 2014-04-30 14:14:26 +02:00
Manuel Raynaud
a30181d09d seo title field is not mandatory anymore 2014-04-30 11:15:01 +02:00
Manuel Raynaud
67293555ba refactor content loop splitting parseResults method 2014-04-30 10:57:04 +02:00
Manuel Raynaud
0b36b2222d implement addCriteriaToPositionQuery method in content model. #360 2014-04-30 10:44:34 +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
158ebc7ead complete changelog and add missing translations 2014-04-29 11:42:10 +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
c4320f0ada add discount input on customer form 2014-04-29 10:56:07 +02:00
Manuel Raynaud
312b27a113 AuthenticationException must be catch in renderRaw and not in render method 2014-04-29 10:44:48 +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
Franck Allimant
37f43a0f51 Changed isSubclassOf by implementsInterface 2014-04-28 20:18:08 +02:00