TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source
This commit is contained in:
Franck Allimant
2014-01-17 14:43:27 +01:00
parent c60bb02da7 55741ae433
commit a9ed53d6bd
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,5 +1,6 @@
#2.0.0-beta4 #2.0.0-beta4
- Tinymce is now a dedicated module. You need to activate it. - Tinymce is now a dedicated module. You need to activate it.
- Fix PDF creation. Bug #180
#2.0.0-beta3 #2.0.0-beta3
- Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too - Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too

2
core/lib/Thelia/Controller/Admin/CouponController.php
View File

@@ -155,7 +155,7 @@ class CouponController extends BaseAdminController
$args['dateFormat'] = $this->getSession()->getLang()->getDateFormat(); $args['dateFormat'] = $this->getSession()->getLang()->getDateFormat();
$args['availableCoupons'] = $this->getAvailableCoupons(); $args['availableCoupons'] = $this->getAvailableCoupons();
$args['urlAjaxAdminCouponDrawInputs'] = $this->getRoute( $args['urlAjaxAdminCouponDrawInputs'] = $this->getRoute(
'admin.coupon.draw.inputs', 'admin.coupon.draw.inputs.ajax',
array('couponServiceId' => 'couponServiceId'), array('couponServiceId' => 'couponServiceId'),
Router::ABSOLUTE_URL Router::ABSOLUTE_URL
); );

2
core/lib/Thelia/Controller/BaseController.php
View File

@@ -233,7 +233,7 @@ abstract class BaseController extends ContainerAware
array( array(
'order_id' => $order_id 'order_id' => $order_id
), ),
TemplateHelper::getInstance()->getActivePdfTemplate()->getPath() TemplateHelper::getInstance()->getActivePdfTemplate()
); );
$order = OrderQuery::create()->findPk($order_id); $order = OrderQuery::create()->findPk($order_id);