From 9b81e889462d400d839423a2ed0d3543bc7d21bc Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 17 Jan 2014 12:23:08 +0100 Subject: [PATCH 1/3] fix pdf generation. Fix #170 --- core/lib/Thelia/Controller/BaseController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From a7c90877214584becc0da54d0a6701384b40e320 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 17 Jan 2014 14:21:24 +0100 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) 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 From 992b5be95cdb70100a6d7c77c687a30a22888bd1 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 17 Jan 2014 14:33:09 +0100 Subject: [PATCH 3/3] fix routing name in Coupon module. Fix #171 --- core/lib/Thelia/Controller/Admin/CouponController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 );