# 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
# By Etienne Roudeix (7) and Manuel Raynaud (7)
# Via Etienne Roudeix (2) and Manuel Raynaud (1)
* 'master' of https://github.com/thelia/thelia:
tax in loops
remove test
finish simple list customer page in backoffice
debug bar
mock getTotalAmoutn in order class
tax engine
escae output only if it's not an object
tax faker
insert 19.6 tva
create admin customer view and add output info in customer loop
update format smarty plugin
tax engine model
tax engine model
create customer admin controller and index controller
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
add PropelDataCollector to debugbar, still missing some informations
remove unused class
integrate debugbar module
remove htmlpurifier
modify insert.sql including debugBar module
add new event and new tag
Started category modification
Factorized modal dialogs javascript
Factorized creation and confirmation modal dialogs
create controller adding delivery module in session
create Delivery loop
Working :
Continuing categories administration...
Working :
create base loop for delivery and payment entities
remove htmlpurifier dependency
country id can be an argument for calculate method
Working :
Working :
fix typo
...
Conflicts:
composer.lock
core/lib/Thelia/Controller/Admin/CategoryController.php
templates/admin/default/assets/less/thelia/variables.less
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
Working :
Working :
Working :
Working :
Fixed minor visual glitches
Working : Resize countries flag + Add bootstrap-switch
fix test suite
clear asset cache in cache:cler command
Added a 'development mode' to assetic smarty plugin
rewriting router
use good Request object
Added Tools\URL test case, and a test case superclass for initializing Tools\URL
remove unused UrlWritin controller
create router for rewriting matching
customer substitutions
fix typo in front id
Working : For attributes on labels
Working : For attributes on labels
add label_attr attribute to form smarty plugin
start refactorin rewriting routing
...
Conflicts:
core/lib/Thelia/Config/Resources/routing/front.xml
templates/admin/default/assets/less/thelia/bootstrap-editable.less
templates/admin/default/categories.html
