TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
789 Commits 1 Branch 0 Tags
5bd501315d6d3eaa71a2c19f67a38289dd9c0093
Commit Graph

117 Commits

Author SHA1 Message Date
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-02 09:19:24 +02:00
Manuel Raynaud
ef8e98d415 add some phpdoc 2013-09-01 11:32:05 +02:00
Etienne Roudeix
4ba16dc290 sid : rewriting 2013-08-30 09:13:54 +02:00
gmorel
37659415ad WIP 
- Add Coupon Event
- Customer Parameter
 2013-08-29 16:20:41 +02:00
gmorel
6f31460be6 Working 
- Fix serialization not tested
 2013-08-28 19:45:21 +02:00
gmorel
3696ce4a4b WIP 
All Unit Test are green
 2013-08-28 11:22:49 +02:00
gmorel
47106f562d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
Conflicts:
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponI18n.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/ProductAssociatedContent.php
	core/lib/Thelia/Model/Map/CouponTableMap.php
	core/lib/Thelia/Model/Map/CouponVersionTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
 2013-08-28 10:11:57 +02:00
gmorel
50d50d3b91 WIP Coupon 
Refactor : creating dedicated reusable module for Constraints
Adding ConstraintManager
Secured :
- Effects : RemoveXPercent + RemoveXAmount
- Validators : all  except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?)
- Conditions : AvailableForTotalAmount
 2013-08-28 09:33:33 +02:00
gmorel
c24e82758f WIP Coupon 
Refactor : creating dedicated reusable module for Constraints
Adding ConstraintManager
Secured :
- Effects : RemoveXPercent + RemoveXAmount
- Validators : all  except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?)
- Conditions : AvailableForTotalAmount
 2013-08-27 18:53:18 +02:00
gmorel
e971179a60 WIP Coupon 
Default Implementation + Unit test in order to validate the chain
- effect
- application field
- condition
 2013-08-27 13:28:57 +02:00
gmorel
eae86cd797 WIP Coupon 
Refactor
 2013-08-23 20:00:32 +02:00
Etienne Roudeix
3005a65463 loop test fix 2013-08-23 12:38:52 +02:00
Etienne Roudeix
27f6612c32 associated content loop test 2013-08-23 10:58:10 +02:00
gmorel
73677b7c1a WIP Coupon 
Update Coupon Model + SQL
Implementattion Fixtures for Coupon and CouponFactory
 2013-08-22 20:02:03 +02:00
Etienne Roudeix
ec3ab5c3aa currency loop 2013-08-22 17:47:46 +02:00
gmorel
c02e286d09 WIP Coupon 
Implementation CouponInterface 1st class : RemoveXAmount
Implementation CouponRuleInterface 1st class : AvailableForTotalAmount
 2013-08-21 20:03:03 +02:00
Etienne Roudeix
9dbd8a283b pse and combi loops 2013-08-21 12:50:49 +02:00
Etienne Roudeix
3d0c7d6773 loop tests 2013-08-21 09:33:43 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
 2013-08-21 09:19:56 +02:00
gmorel
df08158cff WIP Coupon 
Implementation Comparable Parameters
 2013-08-20 19:05:41 +02:00
gmorel
2113e7a457 WIP Coupon 
RemoveXPercent and RemoveXAmount implementation
 2013-08-19 20:02:53 +02:00
gmorel
4e40555313 Init Coupon module design 2013-08-19 18:50:45 +02:00
Manuel Raynaud
5b23e1ca41 remove use statement before namespace decleration 2013-08-16 13:30:49 +02:00
franck
6abd590fb5 Fixed Image tests 2013-08-16 12:28:26 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
5762711146 Added original file data 2013-08-15 12:27:30 +02:00
franck
56034e1184 Fixed image test 2013-08-15 12:12:54 +02:00
franck
a56e05b36b Added image action and loop 2013-08-15 11:46:46 +02:00
franck
47bc545019 Added image processing actgion and loop 2013-08-15 11:44:46 +02:00
Manuel Raynaud
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +02:00
Manuel Raynaud
d184f2f734 fix test suite 2013-08-13 16:18:15 +02:00
Manuel Raynaud
7f83225645 fix test suite issue 2013-08-13 09:34:08 +02:00
Manuel Raynaud
be5d1e9ddb refactor cart and cartEvent process 2013-08-12 17:48:48 +02:00
franck
d365146231 Beautified cart test 2013-08-09 10:54:28 +02:00
franck
8eaa2de960 Fixed cart tests 2013-08-09 10:53:38 +02:00
Manuel Raynaud
80496641c6 try to test form 2013-08-07 14:55:27 +02:00
Manuel Raynaud
77334ee2ce initialize test on AddARticle action 2013-08-07 11:25:41 +02:00
Manuel Raynaud
3c87fa8bd0 Merge branch 'master' into cart 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	install/faker.php
 2013-08-07 10:23:44 +02:00
Manuel Raynaud
3fbb72b36c complete INTALL-TODO 2013-08-07 10:20:04 +02:00
Manuel Raynaud
14f12437fc fix argument call 2013-08-07 09:57:54 +02:00
Manuel Raynaud
2f2e88b9fc Merge branch 'master' into cart 2013-08-07 09:44:34 +02:00
Manuel Raynaud
75929e1d4f create new method allowing to add paramter to the current query string 2013-08-06 16:13:34 +02:00
Etienne Roudeix
3507cde1f8 content and folder loops tests 2013-08-02 16:20:52 +02:00
Manuel Raynaud
0b2bdd196f fix broken tests 2013-08-02 16:16:04 +02:00
Etienne Roudeix
866c29adb4 Merge branch 'cart' into loops 2013-08-02 11:50:46 +02:00
Etienne Roudeix
96bf685b39 change default product loop order value 
add tests
 2013-08-02 10:11:54 +02:00
Etienne Roudeix
24dfd35182 Merge branch 'master' into loops 2013-07-31 14:03:09 +02:00
Etienne Roudeix
18dd7c1fbf testing loop title 2013-07-31 14:02:59 +02:00
Manuel Raynaud
651f191314 manu le bossu's backup 2013-07-30 09:04:41 +02:00
Manuel Raynaud
8c2eb5987c Merge branch 'cart' 
Conflicts:
	core/lib/Thelia/Core/HttpFoundation/Session/Session.php
 2013-07-26 15:59:32 +02:00