TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,373 Commits 1 Branch 0 Tags
784ab68ca53eb3a76d169e3bccc695d10b743bcd
Commit Graph

119 Commits

Author SHA1 Message Date
Franck Allimant
784ab68ca5 Restored previous version 2014-04-18 00:06:49 +02:00
Franck Allimant
a3883ef1b6 Fix for #308 2014-04-18 00:01:19 +02:00
Franck Allimant
917b05b65e Restored previous version 2014-04-18 00:00:25 +02:00
Franck Allimant
ed91dcaffe Reformated JSON to a human readable form (e.g, with newlines). 2014-04-17 19:57:49 +02:00
Franck Allimant
12c21b1239 Fixes #308 2014-04-17 19:46:21 +02:00
Manuel Raynaud
310a5df50a remove TheliaDebugBarController. Fix #291 2014-04-17 00:02:46 +02:00
Manuel Raynaud
feeff10bd1 create new route for generating invoice pdf 2014-04-16 14:48:15 +02:00
Manuel Raynaud
a24b5c0723 add missing file in colissimo 2014-04-15 17:10:05 +02:00
Manuel Raynaud
7d4b027fcd add missing file 2014-04-15 14:41:27 +02:00
Alban-io
ff8e7326a5 Fix route customer.password.change.view 
Change _controller key
 2014-04-15 11:14:11 +02:00
Manuel Raynaud
8434b14d79 create export for expeditor 2014-04-14 16:32:46 +02:00
Franck Allimant
26d45dd90b Added orderFailed() method 2014-04-11 02:24:33 +02:00
Franck Allimant
112d2525b2 Added the order.failed route 2014-04-11 02:17:46 +02:00
Manuel Raynaud
320565e965 change cart loop in mini cart 2014-04-10 12:02:03 +02:00
Manuel Raynaud
70a05d50cd add Klik&pay payment module 2014-04-04 14:55:58 +02:00
Manuel Raynaud
e11ff8dcec remove debug info 2014-03-19 09:45:54 +01:00
Manuel Raynaud
4391e6334b fix modules cs 2014-03-11 15:43:48 +01:00
Manuel Raynaud
ef5e3f44a7 add some doc in module payment interface 2014-03-06 15:41:41 +01:00
Manuel Raynaud
b833b4a5b6 Merge pull request #236 from mespeche/master 
Add Translator on all controllers & forms text strings
 2014-02-22 17:52:11 +01:00
Michaël Espeche
03a62575ec Add Translator on all controllers & forms text strings 2014-02-21 12:05:27 +01:00
Manuel Raynaud
dafce9e070 Do not allow to cumulate the coupon many times. Fix #217 2014-02-19 16:56:58 +01:00
Benjamin Perche
066e79c83e Fix bug when multiple call of bootstrap-switch.js 
modified:   local/modules/Colissimo/AdminIncludes/module-config-js.html
	modified:   local/modules/Colissimo/AdminIncludes/module_configuration.html
 2014-02-19 15:31:01 +01:00
Benjamin Perche
ce9a1bb519 Colissimo fix routing.xml, thelia.sql and adding "Activate free shipping" option 
new file:   local/modules/Colissimo/AdminIncludes/module-config-js.html
	modified:   local/modules/Colissimo/AdminIncludes/module_configuration.html
	modified:   local/modules/Colissimo/Colissimo.php
	modified:   local/modules/Colissimo/Config/config.xml
	modified:   local/modules/Colissimo/Config/routing.xml
	new file:   local/modules/Colissimo/Config/schema.xml
	modified:   local/modules/Colissimo/Config/thelia.sql
	new file:   local/modules/Colissimo/Controller/FreeShipping.php
	new file:   local/modules/Colissimo/Form/FreeShipping.php
	modified:   local/modules/Colissimo/I18n/en_US.php
	modified:   local/modules/Colissimo/I18n/fr_FR.php
	new file:   local/modules/Colissimo/Model/Base/ColissimoFreeshipping.php
	new file:   local/modules/Colissimo/Model/Base/ColissimoFreeshippingQuery.php
	new file:   local/modules/Colissimo/Model/ColissimoFreeshipping.php
	new file:   local/modules/Colissimo/Model/ColissimoFreeshippingQuery.php
	new file:   local/modules/Colissimo/Model/Map/ColissimoFreeshippingTableMap.php
 2014-02-19 11:49:04 +01:00
Benjamin Perche
d00bc84cd5 Add dynamical prices editing in Colissimo 
modified:   local/modules/Colissimo/AdminIncludes/module_configuration.html
	modified:   local/modules/Colissimo/Colissimo.php
	modified:   local/modules/Colissimo/Config/config.xml
	modified:   local/modules/Colissimo/Config/module.xml
	modified:   local/modules/Colissimo/Config/prices.json
	new file:   local/modules/Colissimo/Config/routing.xml
	modified:   local/modules/Colissimo/Config/thelia.sql
	new file:   local/modules/Colissimo/Controller/EditPrices.php
	new file:   local/modules/Colissimo/I18n/en_US.php
	new file:   local/modules/Colissimo/I18n/fr_FR.php
	modified:   local/modules/Colissimo/Listener/SendMail.php
	new file:   local/modules/Colissimo/Loop/CheckRightsLoop.php
	modified:   local/modules/Colissimo/Loop/Price.php
	modified:   local/modules/Colissimo/documentation/TarifsAvril2013.pdf
	modified:   local/modules/Colissimo/documentation/readme.txt
 2014-02-19 09:51:22 +01:00
Manuel Raynaud
82bcb05611 send mail for colissimo module 2014-02-18 14:50:02 +01:00
Manuel Raynaud
45a50f8035 create listener for colissimo module 2014-02-18 14:50:02 +01:00
Manuel Raynaud
25084219e7 create new method in PaymentModuleInterface for verifying is the module 
is valid
 2014-02-08 11:07:54 +01:00
Manuel Raynaud
1e5926e06c remove harcoded tinymce. Fix #202 2014-02-07 17:38:07 +01:00
Manuel Raynaud
a6f0a38a7b allow possibility for payment module to return a response 2014-02-06 12:24:52 +01:00
Franck Allimant
89653f452b Removes container from all Thelia actions, but Modules (#198) 2014-01-31 20:06:42 +01:00
Franck Allimant
73680d3d01 Fixed TaxEngine usage. 2014-01-23 12:06:14 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Manuel Raynaud
d345069707 fix directory separator in tinymce module. Fix #172 2014-01-17 16:33:26 +01:00
Manuel Raynaud
4e1521775f alloow possibility to specify a ref for a customer 2014-01-17 11:15:55 +01:00
Franck Allimant
842299bee8 Fixed typo 2014-01-16 11:31:18 +01:00
Manuel Raynaud
55d0fd2ae2 configure upload dir for tonymce module 2014-01-14 11:20:12 +01:00
Manuel Raynaud
d73eaad981 move tinymce to resources folder 2014-01-14 10:36:37 +01:00
Manuel Raynaud
79dafd109e create tinymce module 2014-01-13 18:07:23 +01:00
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" 
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
 2014-01-06 11:25:25 +01:00
Etienne Roudeix
22efc21bfe dynamic delivery modules on delivery front template 2013-12-20 12:14:20 +01:00
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules" 
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
 2013-12-20 11:16:42 +01:00
Etienne Roudeix
d0ff5260f7 Merge branch 'cleanmaster' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:16:35 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Etienne Roudeix
65f43b5eff Merge branch 'cleanmaster' into modules 2013-12-16 14:33:15 +01:00
Etienne Roudeix
32d0aa15a6 PaymentModuleInterface::pay method force $order parameter 2013-12-16 12:38:41 +01:00
Franck Allimant
8c864021f5 Added sorting and position ùmanagement to modules. 2013-12-06 18:59:46 +01:00
Franck Allimant
ceb1357dd7 Renamed backoffice to backOffice 2013-12-02 19:05:02 +01:00
Etienne Roudeix
bc9da10d8c change asset origin param name by source 2013-11-28 12:02:53 +01:00
Etienne Roudeix
b0371312e2 assets in modules 2013-11-28 11:47:21 +01:00
Etienne Roudeix
247ed6aa2a Merge branch 'master' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
 2013-11-28 10:34:57 +01:00