TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,130 Commits 1 Branch 0 Tags
8043b50c756e1b9040dde64ed4857fc9108686c2
Commit Graph

1598 Commits

Author SHA1 Message Date
Etienne Roudeix
8043b50c75 new permission system in controllers 2013-10-25 08:59:09 +02:00
Franck Allimant
d9fc945015 Added TAX_RUl_ID to simple part of product loop 2013-10-25 00:46:25 +02:00
Franck Allimant
0d50557269 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-25 00:33:52 +02:00
Franck Allimant
06cc8ce1ea Finished product combinations edition 2013-10-25 00:32:56 +02:00
Manuel Raynaud
60683b7a32 Merge pull request #56 from thelia/frontend 
Wrong name form used into updateAction (CustomerController)
 2013-10-24 12:56:37 -07:00
touffies
29c2d543fb Wrong name form used into updateAction (CustomerController) 2013-10-24 21:39:50 +02:00
Manuel Raynaud
a85c0a75cf Merge pull request #55 from thelia/frontend 
Frontend
 2013-10-24 12:31:42 -07:00
Manuel Raynaud
b8751b26a5 Merge branch 'master' of github.com:thelia/thelia 2013-10-24 21:25:41 +02:00
Manuel Raynaud
dfbdce3f80 send order confirmation email 2013-10-24 21:24:14 +02:00
Etienne Roudeix
a0b59c8549 Merge branch 'tax' 2013-10-24 20:26:26 +02:00
Etienne Roudeix
d8611c2965 admin search in customer and products 2013-10-24 20:26:00 +02:00
Manuel Raynaud
97d3be6104 fix AdminResources constant in MessageController 2013-10-24 19:52:09 +02:00
Etienne Roudeix
6ea61ff68c searchLoopInterface + use in OrderLoop 2013-10-24 19:50:09 +02:00
touffies
64985faedc small fix 2013-10-24 19:49:52 +02:00
touffies
b0fb0fdd43 I need the route cart.view for the OrderException.php file. 2013-10-24 19:39:54 +02:00
Manuel Raynaud
bba21b2a94 Merge branch 'master' of github.com:thelia/thelia 2013-10-24 19:20:18 +02:00
Manuel Raynaud
1f3315a3ec Merge pull request #54 from thelia/frontend 
Change some route to use the default
 2013-10-24 10:18:03 -07:00
touffies
ca5d7d2a00 Change some route to use the default 
$this->redirectToRoute('default', array('view'=>'cart'));
 2013-10-24 18:51:49 +02:00
Manuel Raynaud
a327c98671 fix admin order pdf routes 2013-10-24 18:28:02 +02:00
Etienne Roudeix
32725832f1 Merge branch 'master' of github.com:thelia/thelia 2013-10-24 17:42:22 +02:00
Etienne Roudeix
2dc4589126 non-complex product loop returns default PSE 2013-10-24 17:41:32 +02:00
Manuel Raynaud
91f2920336 remove http cache 2013-10-24 17:35:17 +02:00
Etienne Roudeix
5b008a8b17 Merge branch 'master' into loops 2013-10-24 17:15:48 +02:00
Etienne Roudeix
c3fe31c0af new product loop 2013-10-24 17:15:16 +02:00
Manuel Raynaud
10f78b90a5 Merge pull request #49 from thelia/frontend 
Frontend
 2013-10-24 08:07:18 -07:00
Franck Allimant
54f2172ca1 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-24 16:56:52 +02:00
Franck Allimant
d0213f36d4 Removed forgotten var_dump(). 2013-10-24 16:56:14 +02:00
Manuel Raynaud
9b5c631fcb Merge branch 'master' of github.com:thelia/thelia 2013-10-24 16:55:09 +02:00
Manuel Raynaud
0be7285863 save discount 2013-10-24 16:54:52 +02:00
touffies
ebec82d1d2 Merge with master 2013-10-24 16:52:03 +02:00
Franck Allimant
db6d5692eb Merge branch 'catalog' 
Conflicts:
	local/config/schema.xml
 2013-10-24 16:47:53 +02:00
Franck Allimant
4f7e7660ca Finished PSE management for products with no combinations 2013-10-24 16:39:22 +02:00
Manuel Raynaud
2f7dcb7f51 remove tooltip from coupon edit controller 2013-10-24 15:55:35 +02:00
Etienne Roudeix
ecaf0ccd07 consider FROM_DEFAULT_CURRENCY in pse loop 2013-10-24 15:23:16 +02:00
Etienne Roudeix
7b9585b11b consider FROM_DEFAULT_CURRENCY field in product loop 2013-10-24 15:15:29 +02:00
Manuel Raynaud
02c2f6560e add todo comment in coupon event 2013-10-24 14:49:15 +02:00
Franck Allimant
b9410bba59 Implemented prices conversion management 2013-10-24 12:34:44 +02:00
Etienne Roudeix
ca03e374f2 newsletter modification from account 
email modification from account
 2013-10-24 12:10:35 +02:00
Etienne Roudeix
4065f338b9 Merge branch 'master' into tax 2013-10-24 10:37:05 +02:00
Etienne Roudeix
fb4e15ae77 fix issue #47 2013-10-24 10:36:06 +02:00
Manuel Raynaud
60be64ef19 update model with good namespace for newsletter entity 2013-10-24 09:53:39 +02:00
Manuel Raynaud
e7270af63b remove wrong files 2013-10-24 09:20:10 +02:00
badsuricate
b9e5b4d9c7 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-24 09:12:52 +02:00
Manuel Raynaud
3f7300bdee add some control for knwoing if user is in install mode 2013-10-24 08:31:49 +02:00
touffies
009e779110 Update profil [It's not working yet] 2013-10-24 00:19:00 +02:00
touffies
3e3695e5d3 Add validation for the current password 2013-10-24 00:17:59 +02:00
Franck Allimant
5bf51dd47e Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml
 2013-10-24 00:16:33 +02:00
touffies
04c43a12da Add new event NEWSLETTER_UNSUBSCRIBE 2013-10-24 00:15:51 +02:00
Franck Allimant
7ca2399573 Worked on catalog 2013-10-23 23:47:44 +02:00
Franck Allimant
0bd57b0a5a Worked on catalog 2013-10-23 23:41:39 +02:00