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

3158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Manuel Raynaud
5caa55c345 add hhvm to travis config file 2014-02-19 09:03:17 +01:00
Manuel Raynaud
0af9f7d6fb add missing phone number on customer page. Fix #218 2014-02-18 17:06:50 +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
c64a9591e0 Merge pull request #227 from enurit/patch-9 
[Back Office] fixing bad link
 2014-02-18 14:15:46 +01:00
Emmanuel Nurit
badb45ce18 [Back Office] fixing bad link 
incorrect link
 2014-02-18 12:58:30 +01:00
Manuel Raynaud
8a12463b85 load child count and product count on category loop id needed 2014-02-16 16:30:14 +01:00
Manuel Raynaud
27cd9086b2 next/prev info must be called if needed. 2014-02-16 15:56:37 +01:00
Manuel Raynaud
e9a6d1f548 Merge pull request #226 from enurit/patch-8 
[front office] adding promotion price on select
 2014-02-14 16:03:29 +01:00
Emmanuel Nurit
8aeed14f8c [front office] adding promotion price on select 
missing select
 2014-02-14 15:47:24 +01:00
Manuel Raynaud
230e3564e4 fix updating product quantity in cart 2014-02-14 15:31:27 +01:00
Manuel Raynaud
a3ef9ee8a0 Merge pull request #223 from enurit/patch-6 
[Front office] Fixing list product
 2014-02-14 11:29:28 +01:00
Emmanuel Nurit
d46189ac25 [Front office] Fixing list product 
Last commit was a mistake, this is the correct file
 2014-02-14 11:22:08 +01:00
Manuel Raynaud
55a760e6dc fix missing use statement in module class generated. Close #222 2014-02-14 10:39:21 +01:00
Manuel Raynaud
bdde643a56 remove repeated order by on lang loop 2014-02-14 10:39:21 +01:00
Manuel Raynaud
12124aa640 Merge pull request #221 from enurit/patch-5 
[front office] Modifying upsell products popup
 2014-02-13 19:28:12 +01:00
Emmanuel Nurit
b03c071892 modify the smarty syntax 2014-02-13 18:21:23 +01:00
Emmanuel Nurit
5a9dcb3e44 [Front office] Modifying upsell products 
Fixing $ID in some loops
 2014-02-13 16:40:03 +01:00
Emmanuel Nurit
bc7cfe7f79 [Front office] Modifying upsell products 
Adding limit 3 + random order on loop accessory
 2014-02-13 16:39:29 +01:00
Emmanuel Nurit
ec0dddd62d [Front office] Modifying upsell products 
Display off upsell products is now based on accessory loop but not promo products
 2014-02-13 16:07:42 +01:00
Emmanuel Nurit
814dfedaf3 [Front office] Modifying upsell products 
Display of upsell products is now based on accessory loop but not promo products
 2014-02-13 16:06:43 +01:00
Emmanuel Nurit
6e5feaf8e9 [Front office] Modifying upsell products 
Display off upsell products is now based on accessory loop but not promo products
 2014-02-13 15:48:28 +01:00
Manuel Raynaud
de3232b23e fix "informations" typo. Fix #100 2014-02-12 20:34:29 +01:00
Manuel Raynaud
292320fe30 Merge pull request #216 from lovenunu/master 
Fix Coupon RemoveXPercent missing round
 2014-02-12 09:20:02 +01:00
Benjamin Perche
32b59f8189 Fix Coupon RemoveXPercent missing round 
modified:   core/lib/Thelia/Coupon/Type/RemoveXPercent.php
 2014-02-12 09:11:28 +01:00
Manuel Raynaud
8fc7e4269c Merge pull request #215 from enurit/patch-4 
Fix french translation
 2014-02-12 09:10:07 +01:00
Manuel Raynaud
04b5cb158a Merge pull request #214 from apachot/master 
Update contributors list
 2014-02-12 09:09:54 +01:00
Manuel Raynaud
af90ac19ce add php 5.6 to travis 2014-02-11 18:34:43 +01:00