22 Commits

Author SHA1 Message Date
66ce4ee218 Inital commit 2020-11-19 15:36:28 +01:00
Julien Chanséaume
a72b6e5ca7 Added direct link to the customer page on order detail. 2014-07-16 18:39:09 +02:00
Julien Chanséaume
43517c629a Fixed order edit. When a product was deleted, the title was blank. Now we use the order_product title. 2014-07-16 18:39:09 +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
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
08ec1140aa show active menu tab. Fix #262 2014-05-30 11:26:32 +02:00
Manuel Raynaud
29c2901e5d change how to use smarty variables 2014-04-18 14:14:57 +02:00
Franck Allimant
274304e998 Improved the dismmay on modules tab 2014-04-16 23:05:26 +02:00
Manuel Raynaud
886320789a add cart item id on order product save event 2014-03-28 09:18:03 +01:00
Manuel Raynaud
775160235c fix module_include countvar assignation 2014-03-11 17:39:56 +01:00
Manuel Raynaud
4c3547e9d1 fix total amount without discount in backoffice. Fix #235 2014-02-21 09:40:42 +01:00
Manuel Raynaud
c8c1e6ca0c create module tab on order-edit tempalte 2014-02-05 10:57:27 +01:00
Franck Allimant
6b78a33f97 Improved order management in back-office 2014-01-25 19:14:57 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules""
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
2014-01-06 11:25:25 +01:00
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules"
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
2013-12-20 11:16:42 +01:00
Etienne Roudeix
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
c981102d3a Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-18 17:47:23 +01:00
Etienne Roudeix
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Manuel Raynaud
d6b524e39a add a new entry point in each pages in bo for js include 2013-12-17 10:21:18 +01:00
gmorel
dc648fef62 Merge master 2013-11-27 20:24:38 +01:00
Etienne Roudeix
25192cf366 change template subdirs 2013-11-13 10:24:14 +01:00