Commit Graph

29 Commits

Author SHA1 Message Date
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
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Franck Allimant
8c864021f5 Added sorting and position ùmanagement to modules. 2013-12-06 18:59:46 +01:00
Etienne Roudeix
a4935a556c fix modules bug 2013-11-15 16:35:29 +01:00
Etienne Roudeix
b2bb8791f9 colissimo 2013-11-14 13:55:44 +01:00
Etienne Roudeix
fa127ed4f0 colissimo module 2013-11-14 11:53:29 +01:00
Etienne Roudeix
48409c29a9 Colissimo in progress 2013-11-14 11:21:34 +01:00
Etienne Roudeix
e8b4a4ac74 Colissimo proces 2013-11-14 09:22:56 +01:00
Etienne Roudeix
299b192018 Colissimo module + countires areas 2013-11-14 09:13:28 +01:00
Etienne Roudeix
77760e7d3f module template inclusion 2013-11-13 14:48:35 +01:00
Etienne Roudeix
2da2a2d6c1 admin for colissimo 2013-11-13 10:08:43 +01:00
Manuel Raynaud
6d791f5bf7 process module toggle activation 2013-10-17 18:50:00 +02:00
Manuel Raynaud
1b0de7144a end updating module list 2013-10-17 17:20:29 +02:00
Manuel Raynaud
c9dbb610c1 start validating module.xml file 2013-10-17 11:32:29 +02:00
Etienne Roudeix
16d0985718 payment modules 2013-09-18 17:06:08 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Etienne Roudeix
4e053d1a57 payment plugins 2013-09-18 09:20:03 +02:00
Etienne Roudeix
bb246b3205 fix test 2013-09-18 08:55:12 +02:00
Etienne Roudeix
0d1c6cf8cb postage + invoice step 2013-09-17 19:47:10 +02:00
Manuel Raynaud
8122dc3084 Merge branch 'install_wizard' 2013-09-17 16:02:24 +02:00
gmorel
bca2b58e41 Merge master 2013-09-16 15:07:58 +02:00
Etienne Roudeix
c7b3aea7f0 cart integration 2013-09-16 14:31:34 +02:00
Manuel Raynaud
b067ef7dcc create Delivery loop 2013-09-06 18:41:44 +02:00
Manuel Raynaud
2dee65727d set good module delivery id in session 2013-09-06 16:12:57 +02:00