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

3386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Boyquotes
36a49f812d Add Deactivate Module Command Line 2014-03-06 00:34:12 +01:00
root
05073d09cb Add Deactivate Module Command Line 2014-03-06 00:31:27 +01:00
Manuel Raynaud
a27e317245 update phpDoc and fix cs 2014-03-05 15:12:11 +01:00
Manuel Raynaud
016290ed64 update changelog 2014-03-05 12:04:00 +01:00
Manuel Raynaud
5b341c3009 allow using compiler in Thelia modules 2014-03-05 11:56:48 +01:00
Manuel Raynaud
8ecebfdca8 Merge pull request #232 from gmorel/master 
Add ability to load assets from another template …
 2014-03-04 14:45:26 +01:00
gmorel
52a2030c91 Remove unused use statement 2014-03-04 13:23:11 +01:00
gmorel
95af305ca9 Merge branch 'master' of https://github.com/gmorel/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
 2014-03-04 13:10:24 +01:00
gmorel
23389a87a3 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
 2014-03-04 12:02:12 +01:00
Manuel Raynaud
d05e28dc43 verify if coupon code is existing 2014-03-04 10:06:47 +01:00
Manuel Raynaud
20943a674c change default success_url for login form in layout file 2014-03-04 09:37:08 +01:00
Manuel Raynaud
da18df7ca0 NotFoundHttpException is thrown if no record is found in 
DataAccessFunction
 2014-03-04 09:27:38 +01:00
Manuel Raynaud
56663c85a1 create changelog and migration script for next version 2014-03-03 17:42:12 +01:00
Manuel Raynaud
06539ad9bf coupons effect are recalculated after each product's cart modification. Fix #237 2014-03-03 17:40:54 +01:00
Manuel Raynaud
c30abacfbc prepare 2.0.0-RC1 version 2014-03-03 15:09:59 +01:00
Manuel Raynaud
c7323d1c5b refactor paginator, introducing new variable $PREV, $NEXT and $END. By 
default, 10 pages are display. you can use numPage for managing how many
page are display
 2014-03-03 11:30:40 +01:00
Manuel Raynaud
19121c607a Merge pull request #241 from roadster31/order-status 
Order status
 2014-03-01 23:58:55 +01:00
Franck Allimant
defd66af27 Added status change helper methods (setPaid / isPaid, etc) 2014-03-01 22:02:56 +01:00
Franck Allimant
73baab5283 Changed CODE_PROCESSED into CODE_PROCESSING (fixes #240) 2014-03-01 22:02:55 +01:00
Manuel Raynaud
2bfcaf0e27 create product test suite 2014-02-26 12:33:39 +01:00
Guillaume MOREL
cc93a17bb3 Fix If statement 2014-02-25 10:42:29 +01:00
Guillaume MOREL
69515fe710 Remove unused use statement 2014-02-25 10:41:18 +01:00
Manuel Raynaud
235487b52b fix typo in method name 2014-02-24 15:27:18 +01:00
Manuel Raynaud
e56ed20dfa create profile test suite 2014-02-24 15:14:48 +01:00
Manuel Raynaud
cd56928e81 create pdf test suite 2014-02-24 14:15:57 +01:00
Manuel Raynaud
43886e6f8c create newsletter test suite 2014-02-24 13:09:50 +01:00
Manuel Raynaud
4f93e4cd0c create message test suite 2014-02-24 12:31:22 +01:00
Manuel Raynaud
a5cfcf91ca update changelog and fix cs 2014-02-22 19:01:37 +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
Manuel Raynaud
12741c7663 refactor validator translation in a listener 2014-02-21 17:53:49 +01:00
Manuel Raynaud
a2b116618c load translations in form validator 2014-02-21 15:32:12 +01:00
Michaël Espeche
03a62575ec Add Translator on all controllers & forms text strings 2014-02-21 12:05:27 +01:00
Michaël Espeche
809693fe5e Add Translator on all form text strings 2014-02-21 11:48:44 +01:00
Manuel Raynaud
64cc6f945c fix loop cache system. type argument is now a default argument. Fix #234 2014-02-21 10:23:42 +01:00
Manuel Raynaud
4c3547e9d1 fix total amount without discount in backoffice. Fix #235 2014-02-21 09:40:42 +01:00
Manuel Raynaud
ab79c4c6c6 description is not required anymore in coupon form. Fix #233 2014-02-20 16:35:29 +01:00
Manuel Raynaud
3ab022e99d fix test suite 2014-02-20 11:44:09 +01:00
gmorel
09728c7daa Add ability to load assets from another template … 
- adding param 'template' to
    {javascripts file='assets/js/libs/jquery.js' template='baseTemplate'}
    {stylesheets file='assets/less/styles.less' filters='less'  template='baseTemplate' }
    {images file=assets/img/picture.png' template='baseTemplate'}
 2014-02-19 17:16:53 +01:00
Manuel Raynaud
dafce9e070 Do not allow to cumulate the coupon many times. Fix #217 2014-02-19 16:56:58 +01:00
Manuel Raynaud
41175e4a94 Merge pull request #231 from lovenunu/master 
Fix bug when multiple call of bootstrap-switch.js
 2014-02-19 16:46:24 +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
Manuel Raynaud
e2187b5bbe revert last asset modification 2014-02-19 14:30:01 +01:00
Manuel Raynaud
9e406b3c57 Merge pull request #230 from gmorel/master 
Add ability to load assets from another template
 2014-02-19 12:23:50 +01:00
Manuel Raynaud
7934b85a31 Merge pull request #229 from lovenunu/master 
Colissimo fix routing.xml, thelia.sql and adding "Activate free shipping...
 2014-02-19 12:21:46 +01:00
gmorel
9dacf110bd Add ability to load assets from another template 
- adding param 'template' to
    {javascripts file='assets/js/libs/jquery.js' template='baseTemplate'}
    {stylesheets file='assets/less/styles.less' filters='less'  template='baseTemplate' }
    {images file=assets/img/picture.png' template='baseTemplate'}
 2014-02-19 11:59:43 +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
Manuel Raynaud
4db3264c4c Merge pull request #228 from lovenunu/master 
Add dynamical prices editing in Colissimo
 2014-02-19 11:14:33 +01:00
Manuel Raynaud
98b283288b remove postage in shipping confioguration 2014-02-19 10:47:28 +01:00
Manuel Raynaud
16275ef51a create error message when a customer is deleted and already have orders. 
Fix #199
 2014-02-19 10:41:26 +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