405 Commits

Author SHA1 Message Date
Manuel Raynaud
8370158f9d fix saves & close action on document and images. Fix #402 2014-05-30 11:49:03 +02:00
Manuel Raynaud
08ec1140aa show active menu tab. Fix #262 2014-05-30 11:26:32 +02:00
Manuel Raynaud
ee6bb052ad Merge pull request #439 from roadster31/coupon-types
Coupon types
2014-05-28 15:58:01 +02:00
Franck Allimant
567fee839c Added RemoveAmountOnCategories coupon type 2014-05-28 12:02:56 +02:00
Franck Allimant
23ebb88719 Fix #438 2014-05-28 12:01:46 +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
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
9cdac6d50e Fixes french translation. 2014-05-16 11:12:24 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
zzuutt
ac2e3ed172 Update module-tab-content.html
Suppression des caracteres en trop x=" et "
2014-05-15 09:09:54 +02:00
Franck Allimant
c0456e1c07 Additional fix for issue #408 2014-05-14 15:45:20 +02:00
Manuel Raynaud
ed7e07e740 Merge pull request #400 from roadster31/coupons-return
Coupons return
2014-05-13 08:54:39 +02:00
Franck Allimant
112cb8eeb0 Added ForSomeCustomer condition 2014-05-12 23:37:43 +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
de9547fc8e Updated translations 2014-05-10 02:55:17 +02:00
Franck Allimant
f76e5d7aaa Added start date condition 2014-05-10 02:38:03 +02:00
Franck Allimant
d14321ffd8 Improved error message 2014-05-10 01:31:32 +02:00
Franck Allimant
8054149dbd Added country condition 2014-05-10 01:12:06 +02:00
Franck Allimant
a536eb5de7 Fix: save condition button should be hidden after adding condition 2014-05-10 01:09:43 +02:00
Franck Allimant
073905200e Added delivery country condition 2014-05-10 00:10:32 +02:00
Guillaume Barral
86ab5fa368 reorder the {module_include location='customer_list_header'} in the template customers after firstname and lastname like the body of the table
add {module_include location='customer_list_header'} in the template search.html because there was only the line
{module_include location='customer_list_row'} in the body of the table
2014-05-09 14:40:18 +02:00
Manuel Raynaud
4d724aa8d6 Merge pull request #387 from lunika/2.0.1
increment thelia version
2014-05-06 15:36:27 +02:00
Manuel Raynaud
36e4f25c6d change downlod link on admin homepage 2014-05-06 15:28:53 +02:00
Manuel Raynaud
c2da25d40e Merge pull request #388 from roadster31/coupons
Removed header titles from the pges that have one
2014-05-06 15:24:19 +02:00
Franck Allimant
2ca655dc8b Removed header titles from the pges that have one 2014-05-06 15:21:08 +02:00
Manuel Raynaud
364ff7486d add method post on upload form 2014-05-06 14:06:58 +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
Manuel Raynaud
c39d587c25 change status of the toggle button when module activation fails. Fix #287 2014-05-05 16:05:03 +02:00
Manuel Raynaud
fcceef8ab8 add missing english translations 2014-05-05 12:42:50 +02:00
Franck Allimant
f9e4c33875 No % or money symbol in HTML generated by CouponAbstract 2014-05-05 09:52:27 +02:00
Franck Allimant
457f5dba7c Completed french translation 2014-05-03 12:39:29 +02:00
Franck Allimant
b3a89f35e3 Changed condition section title 2014-05-02 20:55:27 +02:00
Franck Allimant
771f59ee47 Fixed condition category tolltip reset 2014-05-02 20:54:17 +02:00
Franck Allimant
500a945f98 HTML fragments in templates instead of hardcoded 2014-05-02 20:52:59 +02:00
Franck Allimant
621c17c97d Fixed form error management 2014-05-02 20:08:38 +02:00
Franck Allimant
4bab223421 Fixed usage count display 2014-05-02 20:01:18 +02:00
Franck Allimant
207911492e Added flags for i18n fields 2014-05-02 18:25:03 +02:00
Franck Allimant
2647c62838 Added standard toolbar in creation mode 2014-05-02 17:10:26 +02:00
Franck Allimant
c457140dea Added hide_save_buttons and hide_save_and_close_button parameters 2014-05-02 17:10:25 +02:00
Franck Allimant
aa48a73343 Removed the useless coupon read function 2014-05-02 17:10:25 +02:00
Franck Allimant
d24d3c71bd Adding some padding to error texts 2014-05-02 17:10:24 +02:00
Franck Allimant
d0528a91d2 Coupons conditions HTML fragments 2014-05-02 17:10:23 +02:00
Franck Allimant
d8c100373b Using template for coupons HTML fragments 2014-05-02 17:10:21 +02:00
Franck Allimant
aacdde5024 Added close button 2014-05-02 17:10:20 +02:00
Franck Allimant
70671c6949 Normalized coupon list appearance, added sorting 2014-05-02 17:10:19 +02:00
Franck Allimant
794b160cc8 Removed check of admin.image/document, whis is not managed in the
back-office
2014-05-02 17:10:18 +02:00