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

69 Commits

Author SHA1 Message Date
Manuel Raynaud
5b341c3009 allow using compiler in Thelia modules 2014-03-05 11:56:48 +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
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
dafce9e070 Do not allow to cumulate the coupon many times. Fix #217 2014-02-19 16:56:58 +01:00
Manuel Raynaud
8a12463b85 load child count and product count on category loop id needed 2014-02-16 16:30:14 +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
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
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
740042ee63 coupon code input is now required 2014-02-11 17:15:04 +01:00
stephaniepinet
b028d24fea Update order-invoice.html 
There was an "s" after the string {intl l="Billing address"} line 207
 2014-02-11 16:20:11 +01:00
Manuel Raynaud
3244e88585 create lost password email 2014-02-11 16:13:30 +01:00
Manuel Raynaud
c7e035429a fix customercreation form 2014-02-08 10:19:13 +01:00
Franck Allimant
ec4a9a2ab7 Fixed "View All" on pagination: 9999999999 is greater than PHP_INT_MAX ! 2014-02-04 13:04:36 +01:00
Manuel Raynaud
db7ffb33b7 remove less usage usage, only use as source now 2014-02-04 11:52:49 +01:00
Manuel Raynaud
6e33670e04 update translations 2014-01-29 14:42:06 +01:00
Manuel Raynaud
014b1670be fix smarty code style 2014-01-24 11:06:14 +01:00
Manuel Raynaud
aad23ab85e apply nofilter modifier on capture.additional in product page 2014-01-24 10:32:18 +01:00
Manuel Raynaud
13f59cda0a remove unused include 2014-01-24 09:34:04 +01:00
Manuel Raynaud
e7ac9adba4 [Front]remove toolbar inclusion in category page 2014-01-24 09:34:04 +01:00
Manuel Raynaud
b5bd437d91 use count smarty function instead of loop for retrieving number of 
results
 2014-01-24 09:34:04 +01:00
Emmanuel Nurit
da905bcbb1 [front office] modification template default 
Displaying fields with nofilter.
Adding some missing translation strings
 2014-01-23 09:10:27 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Manuel Raynaud
3b3e993514 unescape variable in form 2014-01-21 14:56:51 +01:00
Manuel Raynaud
180068d252 Merge pull request #187 from enurit/master 
[front office] default template unescape title
 2014-01-20 05:01:37 -08:00
Emmanuel Nurit
83dd514114 [front office] default template unescape tile 2014-01-20 12:07:58 +01:00
Michaël Espeche
6401266226 Filter management optimization for ajax use 2014-01-16 11:13:52 +01:00
Manuel Raynaud
0c564be4c5 Merge branch 'master' of https://github.com/enurit/thelia into enurit-master 
Conflicts:
	templates/frontOffice/default/I18n/fr_FR.php
 2014-01-14 19:21:01 +01:00
Emmanuel Nurit
1f1fd3e90f [front office] translation fixes 2014-01-14 15:52:12 +01:00
Emmanuel Nurit
b6a4ae7749 [Back-office] Add core translation 2014-01-14 15:18:03 +01:00
enurit
d4f47333f2 Front Translation 
Adding translation for front default template
 2014-01-10 15:33:59 +01:00
enurit
08edf1a4c0 French translation default template 
Adding some missing translations
 2014-01-10 15:23:53 +01:00
enurit
535f3dd850 update breadcrumb.tpl unescape the last item 
The last item need to be unescape too
 2014-01-07 11:02:08 +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
Etienne Roudeix
39c1b43249 need to unescape breadcrumb strings after been in array 2013-12-23 12:25:15 +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
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Manuel Raynaud
d6ba2b3d65 Merge branch 'master' into frontend 2013-12-16 15:45:04 +01:00
Manuel Raynaud
aa66067f0e fix bad product assignation in feature_value loop 2013-12-14 13:50:55 +01:00
Nicolas Villa
2d781931aa Traduction front 2013-12-10 10:17:54 +01:00