Manuel Raynaud
8f95fe1b8b
remove all tables before inserting tables creation
2013-09-18 08:25:20 +02:00
Manuel Raynaud
826ad83584
Merge branch 'master' of github.com:thelia/thelia
2013-09-18 08:11:08 +02:00
franck
48e2be57c6
Fixed some unit tests
2013-09-18 01:24:37 +02:00
franck
d02f13f021
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Model/Product.php
2013-09-18 00:35:48 +02:00
franck
de4767ef56
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Model/Product.php
2013-09-17 23:51:31 +02:00
gmorel
b545e1c012
Working : Coupon : fix loop, fix read display
2013-09-17 23:29:25 +02:00
gmorel
be665cba56
Working : Coupon : fix loop, fix read display
2013-09-17 23:25:38 +02:00
gmorel
542a142329
Working : Coupon : fix loop, fix read display
2013-09-17 23:19:09 +02:00
gmorel
ce72a20074
Working : Coupon : fix loop
2013-09-17 23:09:55 +02:00
gmorel
3aa9c71e34
Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon
...
* 'coupon' of https://github.com/thelia/thelia:
# By Etienne Roudeix (17) and others
# Via Etienne Roudeix (9) and others
* 'master' of https://github.com/thelia/thelia: (52 commits)
fix content faker
fix typo and remove url generation in postInsert model
add covers annotation in ProductRewriteTest
create test for UrlRewritingTrait
payment loop
fix postage display
postage + invoice step
template is not mandatory in product table.
refactor rewrriten method name
Changed getDefaultCategory in getDefaultCategoryId
remove old model classes:
Working : Content : fix loop giving no elements
Working : Content : fix loop giving no elements
Added missing files...
Started product management
Working : Content : fix loop giving no elements
Working : Product : fix loop giving no elements
cart billing integration
empty cart or delivery exception
remove isntall routing and template
...
2013-09-17 22:55:29 +02:00
gmorel
5326ab1341
Working : Coupon : fixture add old coupon
2013-09-17 22:54:49 +02:00
Manuel Raynaud
5a64654ce5
move url generation to I18n entity
2013-09-17 20:45:29 +02:00
Etienne Roudeix
c659bc0e66
Merge branch 'master' of github.com:thelia/thelia
2013-09-17 20:33:08 +02:00
Etienne Roudeix
294c48f8ab
fix content faker
2013-09-17 20:32:51 +02:00
Manuel Raynaud
7c340303f6
Merge branch 'master' of github.com:thelia/thelia
2013-09-17 20:29:47 +02:00
Manuel Raynaud
e4b36098c7
fix typo and remove url generation in postInsert model
2013-09-17 20:29:09 +02:00
franck
1e15142283
Added product creation
2013-09-17 20:18:53 +02:00
Manuel Raynaud
f068539e79
add covers annotation in ProductRewriteTest
2013-09-17 20:16:51 +02:00
Etienne Roudeix
9bce1cbabb
Merge branch 'master' into template
2013-09-17 20:16:48 +02:00
Manuel Raynaud
da7f9e07c4
create test for UrlRewritingTrait
2013-09-17 20:15:28 +02:00
Etienne Roudeix
5ffb737c50
Merge branch 'master' into template
2013-09-17 20:14:17 +02:00
Etienne Roudeix
03375a65b3
payment loop
2013-09-17 20:07:50 +02:00
Etienne Roudeix
347e5e5089
fix postage display
2013-09-17 19:52:20 +02:00
Etienne Roudeix
0d1c6cf8cb
postage + invoice step
2013-09-17 19:47:10 +02:00
Manuel Raynaud
e1e383707b
template is not mandatory in product table.
2013-09-17 19:19:52 +02:00
Manuel Raynaud
9020de5b9a
Merge branch 'master' of github.com:thelia/thelia
2013-09-17 19:12:14 +02:00
Manuel Raynaud
60d09dc76e
refactor rewrriten method name
2013-09-17 19:11:44 +02:00
franck
9e927c40be
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-17 18:40:06 +02:00
franck
ecf4412fbd
Changed getDefaultCategory in getDefaultCategoryId
2013-09-17 18:38:49 +02:00
Manuel Raynaud
232ad70494
Merge branch 'master' of github.com:thelia/thelia
2013-09-17 17:52:53 +02:00
Manuel Raynaud
50212c55cf
remove old model classes:
2013-09-17 17:50:05 +02:00
gmorel
c99e7a91b9
Working : Content : fix loop giving no elements
2013-09-17 17:43:19 +02:00
gmorel
9c0d310441
Merge remote-tracking branch 'origin/master'
2013-09-17 17:39:22 +02:00
gmorel
82c7cdeb44
Working : Content : fix loop giving no elements
2013-09-17 17:39:12 +02:00
franck
c8baa38fed
Added missing files...
2013-09-17 17:31:22 +02:00
franck
4731929a70
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-17 17:15:39 +02:00
franck
a9009b7e52
Started product management
2013-09-17 17:15:15 +02:00
gmorel
df80d39954
Working : Content : fix loop giving no elements
2013-09-17 17:11:08 +02:00
gmorel
b878bf54ad
Merge remote-tracking branch 'origin/master'
2013-09-17 17:09:14 +02:00
gmorel
f8072a02d2
Working : Product : fix loop giving no elements
2013-09-17 17:09:01 +02:00
Etienne Roudeix
21df630d27
Merge branch 'master' into template
2013-09-17 16:53:57 +02:00
Etienne Roudeix
4a6adf532a
cart billing integration
2013-09-17 16:53:20 +02:00
franck
7ca3429cbb
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-17 16:38:49 +02:00
Etienne Roudeix
acaa4a969e
empty cart or delivery exception
2013-09-17 16:38:16 +02:00
Manuel Raynaud
79e508524d
remove isntall routing and template
2013-09-17 16:30:15 +02:00
franck
34f0b03bdc
Added product management routes
2013-09-17 16:30:14 +02:00
Manuel Raynaud
640c0fbde8
add .htaccess in tracking files
2013-09-17 16:02:44 +02:00
Manuel Raynaud
8122dc3084
Merge branch 'install_wizard'
2013-09-17 16:02:24 +02:00
Manuel Raynaud
072dec5cc9
nstall step Please enter the commit message for your changes. Lines starting
2013-09-17 15:43:15 +02:00
Etienne Roudeix
ddbced036f
Merge branch 'master' of github.com:thelia/thelia
2013-09-17 15:02:38 +02:00
