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

308 Commits

Author SHA1 Message Date
Julien Chanséaume
ac51ab21e4 add estimated shipping functionnality in cart 2014-04-28 12:24:43 +02:00
Franck Allimant
33fe269b25 Fixed module title 2014-04-24 16:28:21 +02:00
Franck Allimant
2f5ea0927a Was missing due to .gitignore misconfiguration 2014-04-24 16:23:59 +02:00
Jérôme Billiras
be923d8f56 Change index from position to activate following issue comment [https://github.com/thelia/thelia/pull/332#issuecomment-41174056] 2014-04-24 10:28:59 +02:00
Jérôme Billiras
5197afb87d Load modules by position 2014-04-23 16:33:01 +02:00
Manuel Raynaud
05bb8ecb80 Merge pull request #327 from roadster31/trad-modules 
Modules translation
 2014-04-22 12:36:30 +02:00
Franck Allimant
9e0dedcb45 Fixed module translations 2014-04-22 12:12:53 +02:00
Franck Allimant
7054b3d316 Fixed module translations 2014-04-22 12:01:59 +02:00
Manuel Raynaud
66c5a3729c refactor customer and order ref 2014-04-22 09:59:23 +02:00
Manuel Raynaud
21136571a3 update klik&pay commit 2014-04-21 14:06:02 +02:00
Manuel Raynaud
681d5503ac check customer order 2014-04-18 12:20:51 +02:00
Manuel Raynaud
dffa1b2ecb update license header 2014-04-18 09:39:04 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Manuel Raynaud
0714546837 change license file from GPL to LGPL 2014-04-18 09:36:41 +02:00
Manuel Raynaud
542d2a6684 Merge pull request #310 from roadster31/modulesfix 
Modulesfix
 2014-04-18 09:19:06 +02:00
Franck Allimant
e02d9c1611 Fix for #308 2014-04-18 00:09:26 +02:00
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
ec318376f5 create a listener for adding the cart cookie in the response object 2014-04-17 16:49:34 +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
cd51895366 update schema including new indexes 2014-03-10 14:35:33 +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
a51c54db26 x default position value 2014-02-09 15:49:19 +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
8970b0614f Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	install/thelia.sql
 2014-01-27 17:13:43 +01:00