diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b8c1ac62..cf3a4d8ba 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ #2.0.0-beta4 - Tinymce is now a dedicated module. You need to activate it. +- Fix PDF creation. Bug #180 #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 diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 68508903e..442081527 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -155,7 +155,7 @@ class CouponController extends BaseAdminController $args['dateFormat'] = $this->getSession()->getLang()->getDateFormat(); $args['availableCoupons'] = $this->getAvailableCoupons(); $args['urlAjaxAdminCouponDrawInputs'] = $this->getRoute( - 'admin.coupon.draw.inputs', + 'admin.coupon.draw.inputs.ajax', array('couponServiceId' => 'couponServiceId'), Router::ABSOLUTE_URL ); diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index b90d98462..848d5514e 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -233,7 +233,7 @@ abstract class BaseController extends ContainerAware array( 'order_id' => $order_id ), - TemplateHelper::getInstance()->getActivePdfTemplate()->getPath() + TemplateHelper::getInstance()->getActivePdfTemplate() ); $order = OrderQuery::create()->findPk($order_id);