TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
723 Commits 1 Branch 0 Tags
6f31460be6288c5b414964d838fbf91130f3caee
Commit Graph

723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gmorel
6f31460be6 Working 
- Fix serialization not tested
 2013-08-28 19:45:21 +02:00
gmorel
1d87708d3b Working 
- Update Coupon BackOffice routing
 2013-08-28 19:21:48 +02:00
gmorel
71a91ff60f Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml
 2013-08-28 18:19:38 +02:00
gmorel
6c2dbb0152 Working 
- Add regenerated Model classes
 2013-08-28 18:09:17 +02:00
gmorel
84a2314108 WIP 
- Add Coupon BackOffice controller
- Add Coupon BackOffice template skeleton
- Add Coupon BackOffice routes
 2013-08-28 18:06:22 +02:00
franck
0361cd1ff2 Removed InternalEvent, simplified SecurityContext 2013-08-28 17:52:32 +02:00
gmorel
059317c266 Working 
- Add reset_instal.sh reseting Model/SQL/DB creation/Insert/Admin creation
Usage :
chmod +x reset_install.sh
./ reset_install.sh
 2013-08-28 16:35:14 +02:00
Etienne Roudeix
253a0b76d8 rewriting tables 2013-08-28 15:55:38 +02:00
gmorel
844e142abb Working 
- Add error message when not in trusted IP list
 2013-08-28 15:49:55 +02:00
Etienne Roudeix
2d370bf9b8 rewriting tables 2013-08-28 15:48:19 +02:00
Etienne Roudeix
1de0e9f8a4 rewriting tables 2013-08-28 15:47:47 +02:00
gmorel
086f813e15 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  load test
  url output in loops
  backend loop translation
  backend trasnlation in loops
 2013-08-28 15:46:56 +02:00
Etienne Roudeix
61e13c416c rewriting tables 2013-08-28 15:35:10 +02:00
gmorel
8b07b96366 Working 
- Add error message when not in trusted IP list
 2013-08-28 15:31:27 +02:00
Etienne Roudeix
f54ff0f914 Merge branch 'master' into loops 2013-08-28 15:08:49 +02:00
gmorel
e085b162dd Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Added command for creating admin users on console
  Fixed typo
 2013-08-28 14:37:47 +02:00
gmorel
8b6cbb0621 WIP 
- Beginning BackOffice Coupon implementation
 2013-08-28 14:37:29 +02:00
franck
07849aa614 Added command for creating admin users on console 2013-08-28 14:23:50 +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
f1ed03a96a 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:35:56 +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
Etienne Roudeix
f8dfa64059 load test 2013-08-26 16:38:56 +02:00
Etienne Roudeix
430baa6cda url output in loops 2013-08-26 14:44:39 +02:00
Etienne Roudeix
9174e5154e backend loop translation 2013-08-26 14:05:29 +02:00
Etienne Roudeix
96b3de7c84 backend trasnlation in loops 2013-08-26 12:38:23 +02:00
franck
38c2dc319a Merge branch 'master' of https://github.com/thelia/thelia 2013-08-26 09:59:26 +02:00
franck
803e93f61c Fixed typo 2013-08-26 09:59:01 +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
2d810540ec loop review 2013-08-23 12:37:18 +02:00
Etienne Roudeix
27f6612c32 associated content loop test 2013-08-23 10:58:10 +02:00
Etienne Roudeix
fe4b77f7a8 associated content for categories and product tables + loop 2013-08-23 10:55:59 +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
7ef0339784 associated content for categories and products tables 2013-08-22 17:54:19 +02:00
Etienne Roudeix
ec3ab5c3aa currency loop 2013-08-22 17:47:46 +02:00
gmorel
a9944c73f2 WIP Coupon 
Use of the Serializer Symfony Component
 2013-08-22 15:18:43 +02:00
Etienne Roudeix
17cc6faec3 front end translation management in loops 
apply propel patch
6be7fa1c39
 2013-08-22 15:03:31 +02:00
gmorel
1734ed1c1f WIP Coupon 
Update Coupon Model + SQL
en_US changed to en_EN ?
 2013-08-22 14:50:38 +02:00
gmorel
fab9d2f39a WIP Coupon 
Update Propel2 schema.xml
 2013-08-22 14:25:03 +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
2e6cbe637a working on loop translation 2013-08-21 16:32:48 +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
8cc09824a8 feature value loop fix 2013-08-21 09:28:50 +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
Etienne Roudeix
6a14bef3de feature product loop + improve faker 2013-08-20 17:59:22 +02:00