Commit Graph

  • 4e1cc9e810 start refacroting install process Manuel Raynaud 2013-09-02 16:54:18 +02:00
  • 71d557020f WIP mespeche 2013-09-02 16:39:57 +02:00
  • 3191a928ab Completed mailing templates management franck 2013-09-02 16:21:49 +02:00
  • 2375648b74 Merge branch 'master' into install Manuel Raynaud 2013-09-02 15:29:58 +02:00
  • fd80139a9c change symfony/icu version for compatibility Manuel Raynaud 2013-09-02 15:25:01 +02:00
  • 7d0d1a90a1 create action install file Manuel Raynaud 2013-09-02 15:10:29 +02:00
  • f48de82e96 WIP mespeche 2013-09-02 15:10:07 +02:00
  • 58484b6c80 add file reset_install.sh Manuel Raynaud 2013-09-02 13:20:26 +02:00
  • 3f078b8c81 add some phpdoc to customer front controller Manuel Raynaud 2013-09-02 13:17:55 +02:00
  • 7f3e90555a Working mespeche 2013-09-02 12:38:52 +02:00
  • 34c201d5d9 Working mespeche 2013-09-02 10:12:17 +02:00
  • 0ae5d00054 change module routing priority to 1 Manuel Raynaud 2013-09-02 10:09:40 +02:00
  • 1a5c667c83 Working mespeche 2013-09-02 09:51:31 +02:00
  • 034c9f6050 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon mespeche 2013-09-02 09:41:30 +02:00
  • fb459eea8f WIP mespeche 2013-09-02 09:35:17 +02:00
  • 5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-02 09:19:24 +02:00
  • eef57ba30a WIP - Coupon controller gmorel 2013-09-02 09:17:47 +02:00
  • e1cc7162ae Added get/setLangId() method in session franck 2013-09-02 02:04:36 +02:00
  • beab17a18d Refactored VariableXxxxx.php as ConfigXxxx.php franck 2013-09-02 01:37:12 +02:00
  • 1558f6af5f Added name duplication check when creating a variable franck 2013-09-02 01:25:11 +02:00
  • 928bf7b638 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-02 00:18:29 +02:00
  • 5670855dd6 Completed the backoffice variable management franck 2013-09-02 00:17:27 +02:00
  • 932bf00532 update propel version and dependencies Manuel Raynaud 2013-09-01 19:26:13 +02:00
  • ef8e98d415 add some phpdoc Manuel Raynaud 2013-09-01 11:32:05 +02:00
  • 6d5d0f6606 Fixed getUrl() franck 2013-08-31 15:52:42 +02:00
  • 533f18bcec Typo :( franck 2013-08-31 11:39:14 +02:00
  • 6aa2f80444 Intriducec BaseI18nLoop, started variable config management franck 2013-08-31 11:38:00 +02:00
  • d9d8190fa6 Fixed URL::absoluteUrl() franck 2013-08-30 19:56:24 +02:00
  • a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-08-30 19:48:26 +02:00
  • 6867eae9b7 Fixed customer front controller, events, addec admion config. franck 2013-08-30 19:46:12 +02:00
  • 6fa4d3a923 rewriting Etienne Roudeix 2013-08-30 16:47:13 +02:00
  • fe859591f4 WIP mespeche 2013-08-30 16:32:01 +02:00
  • d8df46737d specific rewrittend url retrievement Etienne Roudeix 2013-08-30 16:02:37 +02:00
  • 64698b1d3d Working mespeche 2013-08-30 16:01:40 +02:00
  • 031ba3d19c Merge branch 'coupon' of https://github.com/thelia/thelia into coupon mespeche 2013-08-30 15:50:40 +02:00
  • e5f8f65f77 WIP mespeche 2013-08-30 15:47:13 +02:00
  • 180302e7cc Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-08-30 15:43:43 +02:00
  • e63ff065c7 product page Etienne Roudeix 2013-08-30 15:04:08 +02:00
  • c0a4b8b987 Merge branch 'master' into rewrite Etienne Roudeix 2013-08-30 15:02:48 +02:00
  • 3c71aa613f url global substitution Etienne Roudeix 2013-08-30 14:30:33 +02:00
  • fd63115c97 WIP - Update Coupon Controller/Form/Event - create() gmorel 2013-08-30 12:23:49 +02:00
  • df57c8fccd Merge remote-tracking branch 'origin/coupon' into coupon gmorel 2013-08-30 11:06:49 +02:00
  • 71fa04a193 WIP - Update Coupon Controller/Form/Event - create() - Rule serialization/unserialization managed in Model/Coupon now gmorel 2013-08-30 11:06:33 +02:00
  • 4ba16dc290 sid : rewriting Etienne Roudeix 2013-08-30 09:13:54 +02:00
  • 0d4b992bc6 WIP mespeche 2013-08-30 08:54:03 +02:00
  • db102a5329 Working mespeche 2013-08-30 08:52:37 +02:00
  • ed763344ec WIP mespeche 2013-08-29 17:51:50 +02:00
  • 8dd8c733d3 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon gmorel 2013-08-29 16:22:01 +02:00
  • 37659415ad WIP - Add Coupon Event - Customer Parameter gmorel 2013-08-29 16:20:41 +02:00
  • 6a7d5ec98e WIP Michaël ESPECHE 2013-08-29 16:17:49 +02:00
  • 2396b78ce9 Working Michaël ESPECHE 2013-08-29 16:17:28 +02:00
  • 4b9a54fa68 WIP Michaël ESPECHE 2013-08-29 16:16:21 +02:00
  • 75b4564297 rewriting tables Etienne Roudeix 2013-08-29 09:20:58 +02:00
  • 696b871acd start rewriting Etienne Roudeix 2013-08-29 08:49:48 +02:00
  • cce270fdcc Factorized ModelCriterialTools calls in loops franck 2013-08-28 19:47:31 +02:00
  • 6f31460be6 Working - Fix serialization not tested gmorel 2013-08-28 19:45:21 +02:00
  • 1d87708d3b Working - Update Coupon BackOffice routing gmorel 2013-08-28 19:21:48 +02:00
  • 71a91ff60f Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-08-28 18:19:38 +02:00
  • 6c2dbb0152 Working - Add regenerated Model classes gmorel 2013-08-28 18:09:17 +02:00
  • 84a2314108 WIP - Add Coupon BackOffice controller - Add Coupon BackOffice template skeleton - Add Coupon BackOffice routes gmorel 2013-08-28 18:06:22 +02:00
  • 0361cd1ff2 Removed InternalEvent, simplified SecurityContext franck 2013-08-28 17:52:32 +02:00
  • 059317c266 Working - Add reset_instal.sh reseting Model/SQL/DB creation/Insert/Admin creation Usage : chmod +x reset_install.sh ./ reset_install.sh gmorel 2013-08-28 16:35:14 +02:00
  • 253a0b76d8 rewriting tables Etienne Roudeix 2013-08-28 15:55:38 +02:00
  • 844e142abb Working - Add error message when not in trusted IP list gmorel 2013-08-28 15:49:55 +02:00
  • 2d370bf9b8 rewriting tables Etienne Roudeix 2013-08-28 15:48:19 +02:00
  • 1de0e9f8a4 rewriting tables Etienne Roudeix 2013-08-28 15:47:47 +02:00
  • 086f813e15 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-08-28 15:46:56 +02:00
  • 61e13c416c rewriting tables Etienne Roudeix 2013-08-28 15:35:10 +02:00
  • 8b07b96366 Working - Add error message when not in trusted IP list gmorel 2013-08-28 15:31:27 +02:00
  • f54ff0f914 Merge branch 'master' into loops Etienne Roudeix 2013-08-28 15:08:49 +02:00
  • e085b162dd Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-08-28 14:37:47 +02:00
  • 8b6cbb0621 WIP - Beginning BackOffice Coupon implementation gmorel 2013-08-28 14:37:29 +02:00
  • 07849aa614 Added command for creating admin users on console franck 2013-08-28 14:23:50 +02:00
  • 3696ce4a4b WIP All Unit Test are green gmorel 2013-08-28 11:22:49 +02:00
  • 47106f562d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon gmorel 2013-08-28 10:11:57 +02:00
  • 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 gmorel 2013-08-28 09:35:56 +02:00
  • 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 gmorel 2013-08-28 09:33:33 +02:00
  • 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 gmorel 2013-08-27 18:53:18 +02:00
  • e971179a60 WIP Coupon Default Implementation + Unit test in order to validate the chain - effect - application field - condition gmorel 2013-08-27 13:28:57 +02:00
  • f8dfa64059 load test Etienne Roudeix 2013-08-26 16:38:56 +02:00
  • 430baa6cda url output in loops Etienne Roudeix 2013-08-26 14:44:39 +02:00
  • 9174e5154e backend loop translation Etienne Roudeix 2013-08-26 14:05:29 +02:00
  • 96b3de7c84 backend trasnlation in loops Etienne Roudeix 2013-08-26 12:38:23 +02:00
  • 38c2dc319a Merge branch 'master' of https://github.com/thelia/thelia franck 2013-08-26 09:59:26 +02:00
  • 803e93f61c Fixed typo franck 2013-08-26 09:59:01 +02:00
  • eae86cd797 WIP Coupon Refactor gmorel 2013-08-23 20:00:32 +02:00
  • 3005a65463 loop test fix Etienne Roudeix 2013-08-23 12:38:52 +02:00
  • 2d810540ec loop review Etienne Roudeix 2013-08-23 12:37:18 +02:00
  • 27f6612c32 associated content loop test Etienne Roudeix 2013-08-23 10:58:10 +02:00
  • fe4b77f7a8 associated content for categories and product tables + loop Etienne Roudeix 2013-08-23 10:55:59 +02:00
  • 73677b7c1a WIP Coupon Update Coupon Model + SQL Implementattion Fixtures for Coupon and CouponFactory gmorel 2013-08-22 20:02:03 +02:00
  • 7ef0339784 associated content for categories and products tables Etienne Roudeix 2013-08-22 17:54:19 +02:00
  • ec3ab5c3aa currency loop Etienne Roudeix 2013-08-22 17:47:46 +02:00
  • a9944c73f2 WIP Coupon Use of the Serializer Symfony Component gmorel 2013-08-22 15:18:43 +02:00
  • 17cc6faec3 front end translation management in loops apply propel patch 6be7fa1c39 Etienne Roudeix 2013-08-22 15:03:31 +02:00
  • 1734ed1c1f WIP Coupon Update Coupon Model + SQL en_US changed to en_EN ? gmorel 2013-08-22 14:50:38 +02:00
  • fab9d2f39a WIP Coupon Update Propel2 schema.xml gmorel 2013-08-22 14:25:03 +02:00
  • c02e286d09 WIP Coupon Implementation CouponInterface 1st class : RemoveXAmount Implementation CouponRuleInterface 1st class : AvailableForTotalAmount gmorel 2013-08-21 20:03:03 +02:00
  • 2e6cbe637a working on loop translation Etienne Roudeix 2013-08-21 16:32:48 +02:00
  • 9dbd8a283b pse and combi loops Etienne Roudeix 2013-08-21 12:50:49 +02:00