TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,033 Commits 1 Branch 0 Tags
79e40013e2bb4ecdf8b3974c190618bc77bbec7a
Commit Graph

137 Commits

Author SHA1 Message Date
gmorel
413e77fa97 WIP 
- Coupon : ajax add
 2013-09-09 17:46:01 +02:00
gmorel
6443c32dc5 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# 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
 2013-09-09 16:41:11 +02:00
gmorel
b778898d92 WIP 
- Coupon - add rule AJAX
 2013-09-09 16:40:53 +02:00
Manuel Raynaud
8cc4afdb68 Merge branch 'customers' 2013-09-09 16:09:18 +02:00
Manuel Raynaud
3618199c05 remove test 2013-09-09 16:08:42 +02:00
Manuel Raynaud
66454ef3f0 finish simple list customer page in backoffice 2013-09-09 16:03:38 +02:00
Manuel Raynaud
d4ec36e920 mock getTotalAmoutn in order class 2013-09-09 14:29:11 +02:00
Manuel Raynaud
8e77e4b530 create admin customer view and add output info in customer loop 2013-09-09 11:07:51 +02:00
gmorel
2d6787e588 WIP 
- Coupon : add rule input ajax controller
 2013-09-09 10:03:00 +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
Manuel Raynaud
525e449fb2 Merge branch 'master' of github.com:thelia/thelia 2013-09-07 16:40:14 +02:00
Manuel Raynaud
ed468ccb67 Merge branch 'master' into debugbar 2013-09-07 16:31:29 +02:00
Manuel Raynaud
5315e13ce9 add new event and new tag 2013-09-07 16:31:15 +02:00
franck
3bd3a4d943 Started category modification 2013-09-07 10:59:43 +02:00
franck
f304caa88f Factorized modal dialogs javascript 2013-09-06 20:26:29 +02:00
franck
e8d96937e7 Factorized creation and confirmation modal dialogs 2013-09-06 20:00: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
c6612a0246 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 17:51:10 +02:00
mespeche
ae667d33ee Working : 
- Nice construct of search form
 2013-09-06 17:50:19 +02:00
franck
d11906eca5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
 2013-09-06 17:48:12 +02:00
franck
c68f282fe8 Continuing categories administration... 2013-09-06 17:46:40 +02:00
mespeche
0adbb9a997 Working : 
- Replacing the search form who had disappeared
 2013-09-06 17:45:22 +02:00
franck
8b82f58a5b Merge branch 'master' of https://github.com/thelia/thelia 2013-09-06 17:24:05 +02:00
mespeche
771d9e6322 Working : 
- Add product attributes edit routing
- Add product attributes edit action
 2013-09-06 17:23:06 +02:00
mespeche
eebe1d4f58 Working : 
- Rename file for best practices regard
 2013-09-06 16:47:21 +02:00
mespeche
c5f1e5288c Working : 
- Create product_attributes view for loop intergration
 2013-09-06 16:32:27 +02:00
franck
8bd7a6413d Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html
 2013-09-06 16:18:54 +02:00
franck
6fdf60b960 Categories refactoring 2013-09-06 15:56:06 +02:00
mespeche
ebb350111a Working : 
- Add attribute and feature routes  management
- Add product attributes view
 2013-09-06 15:00:52 +02:00
mespeche
56de467362 Working : 
- Add label information in Form file
- Refactor to bootstrap3
 2013-09-06 12:55:53 +02:00
mespeche
fed1795e93 Working : 
- Change alert class
 2013-09-06 12:30:40 +02:00
mespeche
c015bbe8b5 Working : 
- Refactor to bootstrap3
- Label information in Form files
 2013-09-06 12:12:27 +02:00
mespeche
7e28c92b0b Working : 
- Refactor to bootstrap3
 2013-09-06 11:48:24 +02:00
mespeche
a82251b4b6 Working : 
- Refactor modal
 2013-09-06 11:15:39 +02:00
mespeche
86569b01a5 Working : 
- Add switch to second table
 2013-09-06 11:13:47 +02:00
mespeche
7f10926b03 Working : 
- Add bootstrap switch
- Add css class to img
- Refactor modal add
- Label information in CategoryCreationForm file
 2013-09-06 11:07:44 +02:00
mespeche
7b3cd46261 Working : 
- Add "Action" label to table head
- Group buttons on "Action" col
- Add bootstrap-switch
 2013-09-06 10:44:50 +02:00
franck
bbce082df3 Fixed minor visual glitches 2013-09-06 10:41:19 +02:00
mespeche
617b762d8a Working : Resize countries flag + Add bootstrap-switch 2013-09-06 10:16:08 +02:00
franck
9655ce3c72 Added a 'development mode' to assetic smarty plugin 2013-09-06 09:56:39 +02:00
franck
318fb3bf2d Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/currencies.html
 2013-09-05 23:30:50 +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
c276ab236e Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/currencies.html
 2013-09-05 16:53:07 +02:00
mespeche
e289c8026f Working : For attributes on labels 2013-09-05 16:51:45 +02:00
mespeche
f4c2f865e4 Working : clean of currency-edit page 2013-09-05 11:29:07 +02:00
mespeche
91670d8347 Working : Add of bootstrap-editable in good directories 2013-09-05 11:14:31 +02:00
mespeche
5d6f01d338 Working : Clean of currencies list and storage bootstrap-editable 2013-09-05 11:12:18 +02:00
franck
3b27a71967 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-05 10:00:39 +02:00
franck
271e6c64f0 Before merging coupon 2013-09-05 10:00:17 +02:00
mespeche
75513c778a Working : New version of bootstrap-editable + Update of currency pages to bootstrap3 2013-09-05 09:56:06 +02:00