TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 2f07e01b06 fix test Etienne Roudeix 2013-09-11 08:37:18 +02:00
  • 0050d01278 Merge branch 'tax' Etienne Roudeix 2013-09-11 08:35:23 +02:00
  • a3bb124424 fix tests Etienne Roudeix 2013-09-11 08:33:25 +02:00
  • 70d93d1daa fix cs Manuel Raynaud 2013-09-11 08:27:40 +02:00
  • 990ab0e094 change debugbar render tag in templates Manuel Raynaud 2013-09-11 08:19:37 +02:00
  • 8fa3ed287b Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-11 08:16:39 +02:00
  • 08a6b0d195 activate propel prepare caching Manuel Raynaud 2013-09-10 22:37:29 +02:00
  • fe8680ed76 refactor debugBar plugin Manuel Raynaud 2013-09-10 22:15:55 +02:00
  • c4bc273ad5 save duration and memory in debugBar Manuel Raynaud 2013-09-10 21:03:48 +02:00
  • 8be785e9b3 WIP - Coupon Add/Edit/Delete rule AJAX gmorel 2013-09-10 20:00:43 +02:00
  • f7666c1edf Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-10 19:22:23 +02:00
  • a050b0c362 remove # for smarty variable delimiter Manuel Raynaud 2013-09-10 19:21:56 +02:00
  • 3b433a0c8d Merge branch 'master' into tax Etienne Roudeix 2013-09-10 19:15:15 +02:00
  • f70cecbbe9 bug fix Etienne Roudeix 2013-09-10 19:13:28 +02:00
  • 8b209291d3 use_tax_free_amounts binary config variable + ConfigQuery::useTaxFreeAmounts() helper method Etienne Roudeix 2013-09-10 19:03:46 +02:00
  • 6187dbae22 thelia loop with currency - TODO : best price whin in AND max args Etienne Roudeix 2013-09-10 18:58:21 +02:00
  • 672b489418 Merge branch 'master' into template Manuel Raynaud 2013-09-10 17:09:22 +02:00
  • 66d6f86b9a replace <i> tag by <span> for displaying icons Manuel Raynaud 2013-09-10 17:07:20 +02:00
  • 04d517208f remove preThelia smarty filter Manuel Raynaud 2013-09-10 16:57:12 +02:00
  • 5ab3d4fb88 replace smarty variable identifier by $ Manuel Raynaud 2013-09-10 16:54:13 +02:00
  • 7952e69eb4 Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-10 16:44:24 +02:00
  • a485456431 Add route and view for customer creation mespeche 2013-09-10 16:35:34 +02:00
  • 0f46e9d23a Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-10 16:18:15 +02:00
  • 5aa49d62fe replace smarty variable identifier by $ Manuel Raynaud 2013-09-10 16:14:49 +02:00
  • eb7bc62964 integrate new customer creation form Manuel Raynaud 2013-09-10 16:13:53 +02:00
  • a51ffb7a67 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-10 15:46:51 +02:00
  • 3c67903bd7 add part of customer form in customer admin template Manuel Raynaud 2013-09-10 15:46:19 +02:00
  • 281ec337aa Started product attributes management franck 2013-09-10 15:45:29 +02:00
  • 883cc68d14 Merge branch 'coupon' of https://github.com/thelia/thelia gmorel 2013-09-10 15:43:18 +02:00
  • 66c7c32325 Merge branch 'master' of https://github.com/thelia/thelia gmorel 2013-09-10 15:42:58 +02:00
  • 3ffc948d4b Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-10 15:41:59 +02:00
  • f481da7a2f WIP - Coupon Add/Edit/Delete rule AJAX gmorel 2013-09-10 15:41:23 +02:00
  • c7544faf65 change variable identifier in customer template Manuel Raynaud 2013-09-10 15:17:55 +02:00
  • 88bb6001ac Merge branch 'master' into template Manuel Raynaud 2013-09-10 15:07:42 +02:00
  • 615f61bdc4 Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-10 14:58:36 +02:00
  • f8c907d79e update customer loop in template customer Manuel Raynaud 2013-09-10 14:57:56 +02:00
  • 79e40013e2 updating customer form Manuel Raynaud 2013-09-10 14:50:51 +02:00
  • 7350acc437 Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-10 14:38:26 +02:00
  • 6353b8670c Saving current status mespeche 2013-09-10 14:36:06 +02:00
  • affc6805c5 Merge branch 'master' into tax Etienne Roudeix 2013-09-10 12:29:08 +02:00
  • 1971240fca currency in product loop Etienne Roudeix 2013-09-10 12:22:58 +02:00
  • 9ef1b17ea5 strat regiter page Manuel Raynaud 2013-09-10 12:22:35 +02:00
  • 7eb3ec41fe complete login form Manuel Raynaud 2013-09-10 12:16:19 +02:00
  • 8570251b88 product price Etienne Roudeix 2013-09-10 12:04:33 +02:00
  • 71928ec879 change link for homepage Manuel Raynaud 2013-09-10 08:14:07 +02:00
  • 0fe443f53d WIP - Coupon Add/Edit/Delete rule AJAX gmorel 2013-09-09 21:43:58 +02:00
  • f5e7467c86 start creating register and login pages Manuel Raynaud 2013-09-09 21:40:58 +02:00
  • 1bf2d02477 display good currency in template Manuel Raynaud 2013-09-09 21:17:01 +02:00
  • bf46a937c0 defin currency at runtime Manuel Raynaud 2013-09-09 21:00:28 +02:00
  • f7abcf8756 Merge branch 'master' into template Manuel Raynaud 2013-09-09 19:24:01 +02:00
  • 82602622e3 creating index page Manuel Raynaud 2013-09-09 19:23:35 +02:00
  • 6b6dc1c800 Working - Allow to parse array and objects in Smarty Template gmorel 2013-09-09 19:22:07 +02:00
  • b365443c22 fix tests Etienne Roudeix 2013-09-09 18:49:21 +02:00
  • ffe6280213 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-09 18:19:46 +02:00
  • 7fd6ea6943 Merge branch 'tax' Etienne Roudeix 2013-09-09 18:16:28 +02:00
  • c5f30baba5 pass container to thelialoop smarty plugin then to baseloop Etienne Roudeix 2013-09-09 18:15:49 +02:00
  • c0b7e41e91 Merge branch 'coupon' of https://github.com/thelia/thelia gmorel 2013-09-09 17:48:15 +02:00
  • 1be89c9985 Merge branch 'master' of https://github.com/thelia/thelia gmorel 2013-09-09 17:47:32 +02:00
  • 2d7380e068 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-09 17:46:14 +02:00
  • 413e77fa97 WIP - Coupon : ajax add gmorel 2013-09-09 17:46:01 +02:00
  • 2f4442bdb9 Merge branch 'tax' Etienne Roudeix 2013-09-09 17:44:26 +02:00
  • 04d8990990 unit testing for tax engine calculator Etienne Roudeix 2013-09-09 17:43:58 +02:00
  • 02d758ae9a start integration default template Manuel Raynaud 2013-09-09 17:30:18 +02:00
  • 0fb331a5cb WIP - Coupon - unit test : no more fatal but some skipped/incomplete gmorel 2013-09-09 16:59:53 +02:00
  • e839c92549 WIP - Coupon - unit test : no more fatal but some fails gmorel 2013-09-09 16:46:22 +02:00
  • 6443c32dc5 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-09 16:41:11 +02:00
  • b778898d92 WIP - Coupon - add rule AJAX gmorel 2013-09-09 16:40:53 +02:00
  • 519678a543 Merge branch 'tax' Etienne Roudeix 2013-09-09 16:28:32 +02:00
  • ca4df15910 tax in loops Etienne Roudeix 2013-09-09 16:27:46 +02:00
  • 8cc4afdb68 Merge branch 'customers' Manuel Raynaud 2013-09-09 16:09:18 +02:00
  • 3618199c05 remove test Manuel Raynaud 2013-09-09 16:08:42 +02:00
  • 849520eff9 Working - Add Symfony2 routing ability to Thelia router gmorel 2013-09-09 16:08:12 +02:00
  • 66454ef3f0 finish simple list customer page in backoffice Manuel Raynaud 2013-09-09 16:03:38 +02:00
  • 7d4003741c Working - Fix #category-rule replaced by parser when writing jawascript gmorel 2013-09-09 15:35:21 +02:00
  • fa36b64f51 debug bar Etienne Roudeix 2013-09-09 14:44:39 +02:00
  • d4ec36e920 mock getTotalAmoutn in order class Manuel Raynaud 2013-09-09 14:29:11 +02:00
  • 0ddf88e46e tax engine Etienne Roudeix 2013-09-09 14:24:50 +02:00
  • 77fc36fc91 escae output only if it's not an object Manuel Raynaud 2013-09-09 12:46:27 +02:00
  • a178835f6b tax faker Etienne Roudeix 2013-09-09 11:31:41 +02:00
  • 2548fb9e3c insert 19.6 tva Etienne Roudeix 2013-09-09 11:28:02 +02:00
  • 8e77e4b530 create admin customer view and add output info in customer loop Manuel Raynaud 2013-09-09 11:07:51 +02:00
  • 54dd496f52 update format smarty plugin Manuel Raynaud 2013-09-09 11:07:14 +02:00
  • ca9ec3b089 tax engine model Etienne Roudeix 2013-09-09 11:01:31 +02:00
  • 0a5281c1e6 tax engine model Etienne Roudeix 2013-09-09 10:48:41 +02:00
  • c1875564cd Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-09 10:04:57 +02:00
  • 2d6787e588 WIP - Coupon : add rule input ajax controller gmorel 2013-09-09 10:03:00 +02:00
  • 51731017bd create customer admin controller and index controller Manuel Raynaud 2013-09-09 09:10:56 +02:00
  • 99f40cbc80 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-09 09:03:02 +02:00
  • f2a80e4b6a clean some code Manuel Raynaud 2013-09-09 09:02:50 +02:00
  • 928cc3ee4f Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-09 08:06:08 +02:00
  • 1ec386ff79 Merge branch 'rewrite' Etienne Roudeix 2013-09-09 08:05:57 +02:00
  • b637ad79f4 fix phpdoc Etienne Roudeix 2013-09-09 08:05:43 +02:00
  • 447488f063 WIP - Refactor Coupon : is Customer matching Coupon rules (increase code coverage) gmorel 2013-09-08 18:00:31 +02:00
  • 91cf4ec752 Merge remote-tracking branch 'origin/coupon' into coupon gmorel 2013-09-08 17:37:24 +02:00
  • e78ba1f670 WIP - Refactor Coupon : is Customer matching Coupon rules gmorel 2013-09-08 17:36:21 +02:00
  • ff4f3be64d Added windows version of reset_install script franck 2013-09-08 12:29:20 +02:00
  • c1a79028a1 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-08 00:08:02 +02:00
  • 04ec683021 add PropelDataCollector to debugbar, still missing some informations Manuel Raynaud 2013-09-07 17:37:24 +02:00
  • 9bb48a2ef1 remove unused class Manuel Raynaud 2013-09-07 16:54:18 +02:00
  • 525e449fb2 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-07 16:40:14 +02:00