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

690 Commits

Author SHA1 Message Date
Franck Allimant
ab060486d0 Fixed Thelia\Model\Base uses. 2014-05-18 20:19:48 +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
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Manuel Raynaud
85d80d1d77 fix minor bug 2014-05-09 10:55:50 +02:00
Manuel Raynaud
4cd2ea6316 complete lang form including money format 2014-05-06 10:53:16 +02:00
Franck Allimant
621c17c97d Fixed form error management 2014-05-02 20:08:38 +02:00
Franck Allimant
23a74999e8 Fixed date manipulation² 2014-05-02 18:24:15 +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
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
70671c6949 Normalized coupon list appearance, added sorting 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
8496685814 Normalized coupon list appearance, added sorting 2014-05-01 19:20:32 +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
d0edbdfd5b change price if needed when customer log in or log out 2014-04-29 11:35:10 +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
657af6e8f1 Ajout du vidage des caches assets, images et documents 2014-04-26 17:06:10 +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
47002371f1 change license header 2014-04-24 21:59:24 +02:00
Manuel Raynaud
4173178260 end customer newsletter export 2014-04-24 17:55:09 +02:00
Manuel Raynaud
0deadcd247 create resource and page for export 2014-04-24 17:55:09 +02:00
Manuel Raynaud
d38c48995c start creating tools page 2014-04-24 17:55:09 +02:00
Manuel Raynaud
dbe641ad84 create new resources 2014-04-24 17:55:09 +02:00
Franck Allimant
6e5c461c79 Replaces the CacheController 2014-04-24 16:24:20 +02:00
Franck Allimant
013e1a861e Fixed missing constant 2014-04-24 12:31:20 +02:00
Franck Allimant
83ab70082d Changed "Cache" by "Advanced configuration" 2014-04-24 12:29:43 +02:00
Manuel Raynaud
53a94c7312 add route parameters to redirectToRoute method in BaseFrontController 2014-04-23 20:48:17 +02:00
Franck Allimant
112f9b91aa Fixed #326 2014-04-22 16:22:53 +02:00
Franck Allimant
e183c7c8be Check if a module has admin incude files. 2014-04-22 15:53:35 +02:00
Franck Allimant
62218f7637 areai_id -> area_id in removeCountry() 2014-04-22 15:25:37 +02:00
Manuel Raynaud
0435478ae8 fix cs 2014-04-22 12:43:57 +02:00
Franck Allimant
b768d15eac Translation of modules templates files 2014-04-21 00:25:34 +02:00
Franck Allimant
a135a68e6c Implemented domains in translations. Fix #116 and #177 2014-04-20 16:31:06 +02:00
Franck Allimant
dcac104b75 Fixed pagination, and factorized pager 2014-04-18 19:52:45 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Franck Allimant
f6a239b8a0 Fixed typo in getExistingObject(= 2014-04-16 11:53:20 +02:00
Franck Allimant
123280f4d4 Cleaned the mess of Shipping zones, which is Shipping configuration... 2014-04-15 20:11:33 +02:00
Franck Allimant
87ed08dc6f Fixes #293, #294 2014-04-15 17:41:33 +02:00
Manuel Raynaud
7500680a77 Merge pull request #284 from roadster31/basemodulecontroller 
Various improvements, and URL calculation fix
 2014-04-14 16:32:29 +02:00
Franck Allimant
2e9d5b91b5 Fixed comment 2014-04-14 10:50:08 +02:00
Franck Allimant
c134acf896 Fixed comments 2014-04-12 02:15:54 +02:00
Manuel Raynaud
b60abb206b fix cs 2014-04-11 09:36:43 +02:00
Franck Allimant
93d5444b8b Fixed comments 2014-04-11 02:22:18 +02:00