Commit Graph

  • d6e1f99b35 Merge branch 'template' Manuel Raynaud 2013-09-12 15:44:23 +02:00
  • 8ad0dc7b21 AttributesAv management franck 2013-09-12 15:43:37 +02:00
  • 7dbfb052f1 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-12 15:41:04 +02:00
  • c9e455e3ea update cart model Manuel Raynaud 2013-09-12 15:40:49 +02:00
  • 83f4e8b356 Using "update" instead of "change" franck 2013-09-12 14:20:23 +02:00
  • 173d0ad743 Working - Coupon Add/Edit/Delete rule AJAX gmorel 2013-09-12 14:12:43 +02:00
  • 8668bf93bd Working - Coupon Add/Edit/Delete rule AJAX gmorel 2013-09-12 14:10:36 +02:00
  • 3f82421879 Finished admin controllers refactoriing franck 2013-09-12 13:39:47 +02:00
  • 14e0eff0f5 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-12 13:04:12 +02:00
  • c85ec2a9e3 Created AbstractCrudController, and refactored existing controllers franck 2013-09-12 13:02:40 +02:00
  • 0671c2ce7d Continuer attributes management franck 2013-09-12 13:01:04 +02:00
  • eeee25d6f5 Change script file declaration order for bootstrap-editable fix mespeche 2013-09-12 12:52:13 +02:00
  • 024866a445 Delete form on the orders view mespeche 2013-09-12 12:49:11 +02:00
  • 485e6dc29b translate error message Manuel Raynaud 2013-09-12 12:43:44 +02:00
  • 2163121a1a Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-12 12:41:30 +02:00
  • c64b987e9b - Creation of order-edit view mespeche 2013-09-12 12:40:46 +02:00
  • 9856528a94 valid customer removal Manuel Raynaud 2013-09-12 12:40:14 +02:00
  • 3115ee006d pse ref in faker Etienne Roudeix 2013-09-12 11:59:45 +02:00
  • d5004071c9 pse ref Etienne Roudeix 2013-09-12 11:56:00 +02:00
  • b698d1aada loop tests Etienne Roudeix 2013-09-12 11:35:27 +02:00
  • f75b6e876c test product loop limit Etienne Roudeix 2013-09-12 11:28:32 +02:00
  • 5d87e48ba0 update customer general info Manuel Raynaud 2013-09-12 11:24:24 +02:00
  • e81b894816 fix tests Etienne Roudeix 2013-09-12 10:58:12 +02:00
  • d61f3a6a1e product loop test Etienne Roudeix 2013-09-12 10:48:27 +02:00
  • 4b643a7a9e remove not needed flag in customer part Manuel Raynaud 2013-09-12 10:12:22 +02:00
  • 6fea7ef441 change method to retrieve data in customer create process Manuel Raynaud 2013-09-12 09:48:24 +02:00
  • 936d0dbe37 WIP - Coupon Add/Edit/Delete rule AJAX gmorel 2013-09-12 09:32:16 +02:00
  • 6b9db1a162 create test for customer creation Manuel Raynaud 2013-09-12 09:23:50 +02:00
  • 9304624708 fix title name in insert.sql file Manuel Raynaud 2013-09-12 08:12:44 +02:00
  • 10f97a7348 update faker, insert plenty of customers Manuel Raynaud 2013-09-11 20:43:44 +02:00
  • e8ced10dbb fix template Etienne Roudeix 2013-09-11 20:22:29 +02:00
  • ca16aa251e Merge branch 'master' into tax Etienne Roudeix 2013-09-11 20:19:10 +02:00
  • c35de47f10 fix taxengine tests Etienne Roudeix 2013-09-11 20:18:34 +02:00
  • d16f3c28e5 Working - CasperJS : coupon rule gmorel 2013-09-11 19:39:10 +02:00
  • fa5c1aaefc tax engine Etienne Roudeix 2013-09-11 19:01:23 +02:00
  • 3e301a9fc1 creating account page Manuel Raynaud 2013-09-11 18:57:49 +02:00
  • bdbdc6b825 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-11 17:48:55 +02:00
  • 4b8805c29a Merge remote-tracking branch 'origin/master' gmorel 2013-09-11 17:48:06 +02:00
  • d846d10832 Working - CasperJS : coupon rule gmorel 2013-09-11 17:47:52 +02:00
  • 591f952287 Merge branch 'template' Manuel Raynaud 2013-09-11 17:26:34 +02:00
  • 67b5fab53f Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-11 17:24:46 +02:00
  • bb5946457a add missing files Manuel Raynaud 2013-09-11 17:24:26 +02:00
  • 8ec6b2e790 Merge branch 'coupon' of https://github.com/thelia/thelia gmorel 2013-09-11 17:23:12 +02:00
  • 41cf74ccac Working - add ajax loader gmorel 2013-09-11 17:22:31 +02:00
  • 9cc3162696 finishing creating lost password template Manuel Raynaud 2013-09-11 17:22:23 +02:00
  • 90f4db6aa4 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-11 17:12:47 +02:00
  • 33d6c85052 WIP - add tests casper JS on coupon gmorel 2013-09-11 17:10:36 +02:00
  • 8d71bfecc5 WIP - add tests casper JS on coupon gmorel 2013-09-11 17:06:04 +02:00
  • 642376a6b3 Merge branch 'master' into tax Etienne Roudeix 2013-09-11 16:57:45 +02:00
  • 25756ef9dd tax engine Etienne Roudeix 2013-09-11 16:56:16 +02:00
  • ccf35dd37c start creating lost password template Manuel Raynaud 2013-09-11 16:28:26 +02:00
  • e8a4e56324 tax engine Etienne Roudeix 2013-09-11 16:21:51 +02:00
  • b03eb969ca add logo for beta version Manuel Raynaud 2013-09-11 16:18:58 +02:00
  • 755bf40b56 change metadata for product part Manuel Raynaud 2013-09-11 16:05:05 +02:00
  • c1edc0e4ff update phpdebugbar dependency Manuel Raynaud 2013-09-11 15:48:55 +02:00
  • c8b5b9e9fa Working - add tests casper JS gmorel 2013-09-11 15:35:25 +02:00
  • 91f5cb12cd Merge branch 'master' into template Manuel Raynaud 2013-09-11 15:28:38 +02:00
  • 769993cc96 add TimeDataCollector Manuel Raynaud 2013-09-11 15:26:47 +02:00
  • 1f7d8a20b3 Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-11 15:24:01 +02:00
  • 59e1981e9f - Add orders view route - Add view & action for orders index mespeche 2013-09-11 15:23:04 +02:00
  • 1ec9e7486d just add Propel information in phpDebugBar Manuel Raynaud 2013-09-11 15:21:43 +02:00
  • 36d2b873ff Removed a redondant "use" franck 2013-09-11 15:08:56 +02:00
  • 2a93ebb947 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-11 15:06:56 +02:00
  • ec24586232 add some information in propelcollector Manuel Raynaud 2013-09-11 15:04:47 +02:00
  • 870612f51c WIP - Coupon Add/Edit/Delete rule AJAX - add tests casper JS gmorel 2013-09-11 14:43:09 +02:00
  • a9dae509c7 WIP - Coupon Add/Edit/Delete rule AJAX - add tests casper JS gmorel 2013-09-11 14:40:55 +02:00
  • e02ed4d654 Add tooltip mespeche 2013-09-11 14:36:32 +02:00
  • 858cc7f4f2 validate customer creation form Manuel Raynaud 2013-09-11 14:32:57 +02:00
  • d21e4532c9 - Add creation address form - Add addresses list - Add update address form mespeche 2013-09-11 13:32:21 +02:00
  • e1d48d2a28 finish registration form Manuel Raynaud 2013-09-11 12:30:05 +02:00
  • 36f9a5c1c6 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-11 12:15:24 +02:00
  • ae786f2139 Added process_assets config variable franck 2013-09-11 12:14:39 +02:00
  • f50d41b32c Change breadcrumb separator color mespeche 2013-09-11 11:46:50 +02:00
  • abb501af29 Add breadcrumb to customers view mespeche 2013-09-11 11:43:49 +02:00
  • b430dee9ac Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-11 11:41:06 +02:00
  • 953bf005a1 - Change boolean type to integer type for update_logged_in_user field - Create view for customer modification mespeche 2013-09-11 11:39:33 +02:00
  • 551c132b76 syntax Etienne Roudeix 2013-09-11 11:14:54 +02:00
  • 9473f2752f Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-11 11:08:50 +02:00
  • d7f789188c Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-11 11:06:02 +02:00
  • 77d7587fb7 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-11 11:05:52 +02:00
  • e2a5ee90ff use ROUTER::ABSOLUTE_URL by default Manuel Raynaud 2013-09-11 11:03:35 +02:00
  • d24316feeb Merge branch 'master' into tax Etienne Roudeix 2013-09-11 11:01:37 +02:00
  • c11821153c PSE loop todo Etienne Roudeix 2013-09-11 11:00:55 +02:00
  • 3d31090344 currency management in PSE loop Etienne Roudeix 2013-09-11 10:51:44 +02:00
  • 3484d2eb4c Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-11 10:48:35 +02:00
  • e4362ba414 Add customer view finish mespeche 2013-09-11 10:47:31 +02:00
  • 2f351fd4d9 Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-11 10:26:56 +02:00
  • 40a87d50ce Add modal for create/delete customer mespeche 2013-09-11 10:21:07 +02:00
  • a6ada57b34 Update body background mespeche 2013-09-11 10:20:31 +02:00
  • 4b6acacda5 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-11 09:51:02 +02:00
  • f1e2455315 fixed typo franck 2013-09-11 09:50:47 +02:00
  • 557940c5cf searching route return relative path Manuel Raynaud 2013-09-11 09:48:41 +02:00
  • 7e2f57e618 Working - Coupon Add/Edit/Delete rule AJAX gmorel 2013-09-11 09:48:33 +02:00
  • 70f6ee6a52 Merge branch 'master' into tax Etienne Roudeix 2013-09-11 09:21:28 +02:00
  • d6136c56d4 pse loop currency Etienne Roudeix 2013-09-11 09:20:58 +02:00
  • 05470715d6 Merge branch 'master' into template Manuel Raynaud 2013-09-11 09:16:31 +02:00
  • 9002484814 change find method on some request Manuel Raynaud 2013-09-11 09:13:42 +02:00
  • 06bb1d0a39 change some getters Manuel Raynaud 2013-09-11 08:57:59 +02:00
  • 3582ae4cf9 save register template Manuel Raynaud 2013-09-11 08:51:34 +02:00
  • 65a20381d9 Merge branch 'master' into template Manuel Raynaud 2013-09-11 08:47:26 +02:00