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

255 Commits

Author SHA1 Message Date
Manuel Raynaud
4e6aac8917 Merge branch 'integration' 2013-09-20 14:39:00 +02:00
Etienne Roudeix
17548e3526 order tax tables 2013-09-20 08:23:02 +02:00
Manuel Raynaud
a540626fff fix product import 2013-09-19 18:47:12 +02:00
Etienne Roudeix
1d969e38ec order tables 2013-09-19 18:30:13 +02:00
Etienne Roudeix
4ac9a0afad Merge branch 'master' of github.com:thelia/thelia 2013-09-19 16:24:05 +02:00
Manuel Raynaud
41bd8a7cec icomplete product page 2013-09-19 15:39:36 +02:00
Etienne Roudeix
3c02a9d23c Merge branch 'master' of github.com:thelia/thelia 2013-09-19 15:12:37 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +02:00
Manuel Raynaud
f2acbed9d6 Merge branch 'master' of github.com:thelia/thelia 2013-09-18 21:12:12 +02:00
Manuel Raynaud
0002eff88d remove unused comment code 2013-09-18 20:27:45 +02:00
Manuel Raynaud
4be96d1c60 refactor category position and product_category assignment 2013-09-18 20:26:36 +02:00
Etienne Roudeix
66536d0b31 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php
 2013-09-18 20:03:13 +02:00
Etienne Roudeix
891ebcd491 fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar 2013-09-18 19:51:01 +02:00
Manuel Raynaud
2e32166118 remove some var_dump 2013-09-18 19:47:02 +02:00
Manuel Raynaud
f3367aed45 finish import 2013-09-18 19:33:29 +02:00
Manuel Raynaud
79a20cdec0 import product and images 2013-09-18 18:35:33 +02:00
Manuel Raynaud
3a323e7531 import brand successfully 2013-09-18 17:27:31 +02:00
Manuel Raynaud
a16b90f9ce import colors attributes 2013-09-18 17:18:13 +02:00
Manuel Raynaud
55097ca6f5 import categories done 2013-09-18 17:07:56 +02:00
Etienne Roudeix
16d0985718 payment modules 2013-09-18 17:06:08 +02:00
Manuel Raynaud
71cbe984a2 impmort product's images 2013-09-18 16:54:45 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Manuel Raynaud
e638a927c0 add more test for rewriten url 2013-09-18 12:03:02 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +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
542a142329 Working : Coupon : fix loop, fix read display 2013-09-17 23:19:09 +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
Etienne Roudeix
294c48f8ab fix content faker 2013-09-17 20:32:51 +02:00
Manuel Raynaud
e1e383707b template is not mandatory in product table. 2013-09-17 19:19:52 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
Etienne Roudeix
ddbced036f Merge branch 'master' of github.com:thelia/thelia 2013-09-17 15:02:38 +02:00
gmorel
654caf4c6e Working : Content : add faker default folder 2013-09-17 15:01:58 +02:00
Etienne Roudeix
8d20316217 no-return-functions block 2013-09-17 14:59:40 +02:00
gmorel
63b3e0c3da Working : Product : add faker default category 2013-09-17 14:46:46 +02:00
gmorel
df6b3dbcd5 Merge branch 'master' of https://github.com/thelia/thelia 
# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php
 2013-09-17 14:42:06 +02:00
gmorel
5509f08df8 Merge branch 'master' of https://github.com/thelia/thelia 
# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php
 2013-09-17 14:40:28 +02:00
gmorel
f10842069c Working : Fixture : Product add default category 2013-09-17 14:15:23 +02:00
Etienne Roudeix
233c952b4e Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-17 12:44:34 +02:00
Etienne Roudeix
c4fd65e6ea delivery process 2013-09-17 12:38:23 +02:00
gmorel
2bebb5697a Working : Fixture : fix coupon table not cleaned 2013-09-17 12:24:20 +02:00
gmorel
67060c6367 Working : Updating model schema.xml 2013-09-17 11:56:46 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
franck
d097851522 Added documents action and loop 2013-09-17 01:07:42 +02:00
Etienne Roudeix
bf3bc02f8b fix fixture dependant unit test 2013-09-16 16:46:12 +02:00
Etienne Roudeix
361e9e1126 delivery process 2013-09-16 16:12:04 +02:00
Etienne Roudeix
84204cbf05 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Feed.php
 2013-09-16 15:32:17 +02:00
Etienne Roudeix
5ca7136e6d default country 2013-09-16 15:30:46 +02:00
Etienne Roudeix
d8b5df4162 delivery process 2013-09-16 15:24:08 +02:00