TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,478 Commits 1 Branch 0 Tags
main
Commit Graph

382 Commits

Author SHA1 Message Date
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
Franck Allimant
1f379f60ab Added indexes to category table 2014-01-27 17:11:23 +01:00
Manuel Raynaud
c90c8ff9db force charset in sql file 2014-01-27 16:56:05 +01:00
Franck Allimant
a27c913f70 Fixed LONG VARCHAR problem in coupon table 2014-01-27 14:29:06 +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
Manuel Raynaud
3c19388078 fix propel type in schema file 2014-01-07 11:17:26 +01:00
Etienne Roudeix
26aae5adfc remove cache behavior from product table 2014-01-06 14:20:12 +01:00
Etienne Roudeix
4e847bf5ae fix model 2014-01-06 12:23:01 +01:00
Etienne Roudeix
6a64f827ce fix conflicts 2014-01-06 12:14:56 +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
gmorel
67b89dbecd Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 
Remove submodule
 2013-12-30 01:13:36 +01:00
gmorel
8574e1b36e Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:58:43 +01:00
gmorel
3e12ace045 Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:50:04 +01:00
gmorel
ae1a05eb85 Merge 2013-12-29 04:28:11 +01:00
gmorel
f8ac32a4a0 Refactor : Coupon effect inputs are now more customisable 
Adding effect to be stored as serialised in JSON
 2013-12-29 01:23:50 +01:00
gmorel
8f9b86ff6a Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (121 commits)
  set cartItem in cart add and update events
  need to unescape breadcrumb strings after been in array
  update readme file
  update insert.sql with new release version
  change changelog file format
  Prevent product and content création at catalog root
  dynamic delivery modules on delivery front template
  complete changelog
  Finished merging modules with master
  Revert "Merge branch 'cleanmaster' into modules"
  use TaxEngine::getDeliveryCountry in delivery loop
  refacto getTaxCountry which is actually getDeliveryCountry
  make it magic last stand
  change loop in shipping zone template using module insteadof delivery
  Fixed template loop
  Refactored templates processing
  complete readme file
  change email address of core contributors
  fix getPosition folder test
  add coupon tests
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
 2013-12-25 14:14:20 +01:00
gmorel
69d255f782 new branch coupon 2013-12-25 14:12:54 +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