TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,128 Commits 1 Branch 0 Tags
67b5fab53f68dd0dc98ecc2d9a3eb473733a7bda
Commit Graph

902 Commits

Author SHA1 Message Date
gmorel
90f4db6aa4 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (8) and others
* 'master' of https://github.com/thelia/thelia: (47 commits)
  tax engine
  tax engine
  - Add orders view route - Add view & action for orders index
  Removed a redondant "use"
  Add tooltip
  - Add creation address form - Add addresses list - Add update address form
  Added process_assets config variable
  Change breadcrumb separator color
  Add breadcrumb to customers view
  - Change boolean type to integer type for update_logged_in_user field - Create view for customer modification
  syntax
  use ROUTER::ABSOLUTE_URL by default
  PSE loop todo
  currency management in PSE loop
  Add customer view finish
  Add modal for create/delete customer
  Update body background
  fixed typo
  searching route return relative path
  pse loop currency
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
	web/index_dev.php
 2013-09-11 17:12:47 +02:00
Etienne Roudeix
642376a6b3 Merge branch 'master' into tax 
Conflicts:
	install/insert.sql
 2013-09-11 16:57:45 +02:00
Etienne Roudeix
25756ef9dd tax engine 2013-09-11 16:56:16 +02:00
Etienne Roudeix
e8a4e56324 tax engine 2013-09-11 16:21:51 +02:00
gmorel
c8b5b9e9fa Working 
- add tests casper JS
 2013-09-11 15:35:25 +02:00
mespeche
1f7d8a20b3 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 15:24:01 +02:00
mespeche
59e1981e9f - Add orders view route 
- Add view & action for orders index
 2013-09-11 15:23:04 +02:00
franck
36d2b873ff Removed a redondant "use" 2013-09-11 15:08:56 +02:00
franck
2a93ebb947 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 15:06:56 +02:00
gmorel
870612f51c WIP 
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
 2013-09-11 14:43:09 +02:00
gmorel
a9dae509c7 WIP 
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
 2013-09-11 14:40:55 +02:00
mespeche
d21e4532c9 - Add creation address form 
- Add addresses list
- Add update address form
 2013-09-11 13:32:21 +02:00
franck
36f9a5c1c6 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 12:15:24 +02:00
franck
ae786f2139 Added process_assets config variable 2013-09-11 12:14:39 +02:00
mespeche
b430dee9ac Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:41:06 +02:00
mespeche
953bf005a1 - Change boolean type to integer type for update_logged_in_user field 
- Create view for customer modification
 2013-09-11 11:39:33 +02:00
Etienne Roudeix
551c132b76 syntax 2013-09-11 11:14:54 +02:00
franck
9473f2752f Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:08:50 +02:00
Manuel Raynaud
d7f789188c Merge branch 'master' of github.com:thelia/thelia 2013-09-11 11:06:02 +02:00
franck
77d7587fb7 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:05:52 +02:00
Manuel Raynaud
e2a5ee90ff use ROUTER::ABSOLUTE_URL by default 2013-09-11 11:03:35 +02:00
Etienne Roudeix
d24316feeb Merge branch 'master' into tax 2013-09-11 11:01:37 +02:00
Etienne Roudeix
c11821153c PSE loop todo 2013-09-11 11:00:55 +02:00
Etienne Roudeix
3d31090344 currency management in PSE loop 2013-09-11 10:51:44 +02:00
franck
3484d2eb4c Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 10:48:35 +02:00
mespeche
2f351fd4d9 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
	templates/admin/default/customers.html
 2013-09-11 10:26:56 +02:00
franck
4b6acacda5 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 09:51:02 +02:00
franck
f1e2455315 fixed typo 2013-09-11 09:50:47 +02:00
Manuel Raynaud
557940c5cf searching route return relative path 2013-09-11 09:48:41 +02:00
Etienne Roudeix
70f6ee6a52 Merge branch 'master' into tax 2013-09-11 09:21:28 +02:00
Etienne Roudeix
d6136c56d4 pse loop currency 2013-09-11 09:20:58 +02:00
Manuel Raynaud
9002484814 change find method on some request 2013-09-11 09:13:42 +02:00
Manuel Raynaud
06bb1d0a39 change some getters 2013-09-11 08:57:59 +02:00
Etienne Roudeix
2f07e01b06 fix test 2013-09-11 08:37:18 +02:00
Etienne Roudeix
0050d01278 Merge branch 'tax' 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
 2013-09-11 08:35:23 +02:00
Etienne Roudeix
a3bb124424 fix tests 2013-09-11 08:33:25 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
Manuel Raynaud
8fa3ed287b Merge branch 'master' of github.com:thelia/thelia 2013-09-11 08:16:39 +02:00
Manuel Raynaud
08a6b0d195 activate propel prepare caching 2013-09-10 22:37:29 +02:00
Manuel Raynaud
c4bc273ad5 save duration and memory in debugBar 2013-09-10 21:03:48 +02:00
gmorel
8be785e9b3 WIP 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-10 20:00:43 +02:00
Etienne Roudeix
3b433a0c8d Merge branch 'master' into tax 
Conflicts:
	templates/default_save/product.html
 2013-09-10 19:15:15 +02:00
Etienne Roudeix
f70cecbbe9 bug fix 2013-09-10 19:13:28 +02:00
Etienne Roudeix
8b209291d3 use_tax_free_amounts binary config variable + ConfigQuery::useTaxFreeAmounts() helper method 2013-09-10 19:03:46 +02:00
Etienne Roudeix
6187dbae22 thelia loop with currency - TODO : best price whin in AND max args 2013-09-10 18:58:21 +02:00
Manuel Raynaud
66d6f86b9a replace <i> tag by <span> for displaying icons 2013-09-10 17:07:20 +02:00
Manuel Raynaud
04d517208f remove preThelia smarty filter 2013-09-10 16:57:12 +02:00
mespeche
7952e69eb4 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Form/CustomerCreation.php
	templates/admin/default/customers.html
 2013-09-10 16:44:24 +02:00
mespeche
a485456431 Add route and view for customer creation 2013-09-10 16:35:34 +02:00
Manuel Raynaud
0f46e9d23a Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	templates/admin/default/coupon-read.html
 2013-09-10 16:18:15 +02:00