Commit Graph

329 Commits

Author SHA1 Message Date
Manuel Raynaud
588be42e0f Merge pull request #473 from roadster31/coupon-end
Major coupon types refactoring.
2014-06-17 21:11:14 +02:00
Guillaume Barral
8196690458 Add link in template-edit to go to Attributes and features edition (this is more intuitive) 2014-06-17 11:48:35 +02:00
Guillaume Barral
816a9b81ca Allow to search a customer in the default template if $search is not null 2014-06-17 11:19:16 +02:00
Franck Allimant
63f00d82b9 Using 0 as default value if some loop parameters are not defined 2014-06-17 00:39:00 +02:00
Franck Allimant
e3dc87dd6a Updated translations after finishing coupons 2014-06-17 00:37:06 +02:00
alexian dugour
7bf2d8ec58 Mise à jours lien fiche produit sur template order-edit dans le back-office 2014-06-13 08:57:28 +02:00
Franck Allimant
e9a0661938 Pushed forward the refactoring, using traits 2014-06-12 17:00:17 +02:00
Franck Allimant
95841809c4 Refactored coupons to reduce code duplication 2014-06-12 13:14:46 +02:00
Franck Allimant
db29505fee Added Attribute value related coupons 2014-06-12 13:14:07 +02:00
Franck Allimant
147d4a70f1 Improved coupon UI 2014-06-12 12:12:31 +02:00
Manuel Raynaud
476bda3d4a implement new breadcrumb on image and document edition in the catalog 2014-06-11 14:50:19 +02:00
Franck Allimant
441764cf94 Added new coupon types 2014-06-11 09:43:26 +02:00
Franck Allimant
89bf71f4b0 Added new coupon type translations 2014-06-11 09:43:25 +02:00
Franck Allimant
8f5369a1b8 Coupon type template framgment may define a couponInputFormSetup JS function 2014-06-11 09:43:24 +02:00
Franck Allimant
71a6497edb Added js=1 parameter toi {intl} calls used in javascript strings 2014-06-11 09:43:18 +02:00
Franck Allimant
0f3e99ac1f Fixed InvalidArgumentException: No module found for code 'default' 2014-06-11 09:43:16 +02:00
Franck Allimant
0683d20d2c Improved and simplified coupon form management 2014-06-11 09:43:09 +02:00
Benjamin Perche
da959c3732 Fix typo order_tab instead of oder_tab smarty variable
modifié:         templates/backOffice/default/order-edit.html
2014-06-06 10:47:22 +02:00
Manuel Raynaud
c552f8485a fiw wrong description in search page 2014-06-06 09:06:42 +02:00
Manuel Raynaud
a4e28e5561 implement search on content loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
57cf2d1a10 implement seach on content loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
ac028a70b5 implement seach on category loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
84c97e80ea write in uppercase the resource value used in admin_position_block function. Fix #444 2014-06-05 17:21:37 +02:00
Guillaume Barral
eb895bc544 Add pagination to the product list (backOffice) 2014-06-03 12:35:52 +02:00
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