Commit Graph

150 Commits

Author SHA1 Message Date
gmorel
927b27d04a WIP : Coupon event dispatcher + action 2013-09-12 15:53:16 +02:00
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
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
gmorel
8be785e9b3 WIP
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 20:00:43 +02:00
gmorel
f481da7a2f WIP
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 15:41:23 +02:00
gmorel
c1a79028a1 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# 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
2013-09-08 00:08:02 +02:00
gmorel
86d6a0fa05 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# 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
2013-09-06 19:36:52 +02:00
franck
c68f282fe8 Continuing categories administration... 2013-09-06 17:46:40 +02:00
gmorel
eea29cba06 WIP
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
2013-09-05 20:07:17 +02:00
franck
271e6c64f0 Before merging coupon 2013-09-05 10:00:17 +02:00
gmorel
23a4ff26c8 Working
- Base create/update coupon in backoffice
2013-09-04 19:22:20 +02:00
franck
d3a287333e Fixed TheliaLoop Smarty plugin (lopp imbrication was broken) 2013-09-04 19:02:26 +02:00
franck
6387182026 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
2013-09-04 17:34:23 +02:00
franck
02a1b5c655 Event harmonization with MRA 2013-09-04 15:45:46 +02:00
gmorel
a461420c67 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  fix URL::retrieve
  global outputs in loops
2013-09-04 15:45:19 +02:00
gmorel
6cba95f4ee Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
  refactor name for updating actions
  choose UPDATE word for name actions
  add update address action and create tests
  404 not found management
  Working Fix unset namespace
  modify travis script
  test rewriting exception
  Fixed minor bug in Currencies
  Finished currency edition
  Added route methods
  address action implementation
  hot fix
  rewriting
  add address create controller and event
  Added AdminUtilities Smarty plugin, optimized templates
  update customer model createOrUpdate method
  update address model
  fix redirect process in viewListener
  refactor reset_install script
  refactor install process, database management in dedicated class
  ...

Conflicts:
	local/config/schema.xml
	reset_install.sh
2013-09-04 15:42:38 +02:00
Etienne Roudeix
f10294fee2 Merge branch 'rewrite' 2013-09-04 14:45:57 +02:00
Etienne Roudeix
e1965a5145 global outputs in loops 2013-09-04 14:45:14 +02:00
gmorel
dc271db577 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh
2013-09-04 12:01:12 +02:00
Manuel Raynaud
8b2007f94d Merge branch 'actions'
Conflicts:
	core/lib/Thelia/Action/Currency.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-09-04 10:53:32 +02:00
Manuel Raynaud
0efe393e3c Merge branch 'master' of github.com:thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
2013-09-04 10:50:13 +02:00
Manuel Raynaud
d23190303c refactor name for updating actions 2013-09-04 10:48:59 +02:00
Manuel Raynaud
dad1a1c612 add update address action and create tests 2013-09-04 10:09:51 +02:00
Etienne Roudeix
dffbf76cfd Merge branch 'master' into rewrite
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql
2013-09-04 10:06:22 +02:00
Etienne Roudeix
29bf7d9a92 404 not found management 2013-09-04 10:02:58 +02:00
Manuel Raynaud
0b9e2552ed modify travis script 2013-09-04 08:30:24 +02:00
franck
26da884dae Fixed minor bug in Currencies 2013-09-03 19:32:57 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
2013-09-03 19:03:27 +02:00
Manuel Raynaud
deee59244d address action implementation 2013-09-03 17:11:11 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +02:00
gmorel
33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
2013-09-02 17:25:25 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
2013-09-02 09:19:24 +02:00
franck
1558f6af5f Added name duplication check when creating a variable 2013-09-02 01:25:11 +02:00
franck
928bf7b638 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-02 00:18:29 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
Manuel Raynaud
ef8e98d415 add some phpdoc 2013-09-01 11:32:05 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
gmorel
fd63115c97 WIP
- Update Coupon Controller/Form/Event - create()
2013-08-30 12:23:49 +02:00
gmorel
37659415ad WIP
- Add Coupon Event
- Customer Parameter
2013-08-29 16:20:41 +02:00
gmorel
71a91ff60f Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml
2013-08-28 18:19:38 +02:00
franck
0361cd1ff2 Removed InternalEvent, simplified SecurityContext 2013-08-28 17:52:32 +02:00
gmorel
8b6cbb0621 WIP
- Beginning BackOffice Coupon implementation
2013-08-28 14:37:29 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
2013-08-21 09:19:56 +02:00
Manuel Raynaud
0397f5fdf8 create customer login controller 2013-08-16 14:24:00 +02:00
Manuel Raynaud
4f31627301 refactor action customer 2013-08-16 14:04:44 +02:00
Manuel Raynaud
ab5e845ad3 start refactoring customer update process 2013-08-16 12:09:08 +02:00
Manuel Raynaud
382fbe230e update customer process creation 2013-08-16 11:01:32 +02:00