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

Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons

Browse Source 
Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	templates/backOffice/default/coupon/form.html
This commit is contained in:
Franck Allimant
2014-05-02 17:16:39 +02:00
parent 9d3dd8687a 7c1c3541b0
commit 7996c866d3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,8 +247,9 @@ class CouponController extends BaseAdminController
*/ */
public function getConditionEmptyInputAjaxAction($conditionId) public function getConditionEmptyInputAjaxAction($conditionId)
{ {
if (null !== $response = $this->checkAuth(AdminResources::COUPON, [], AccessManager::VIEW)) if (null !== $response = $this->checkAuth(AdminResources::COUPON, [], AccessManager::VIEW)) {
return $response; return $response;
}
$this->checkXmlHttpRequest(); $this->checkXmlHttpRequest();
@@ -282,7 +283,7 @@ class CouponController extends BaseAdminController
[ [
'inputsDrawn' => $html, 'inputsDrawn' => $html,
'conditionServiceId' => $serviceId, 'conditionServiceId' => $serviceId,
'conditionIndex' => '', 'conditionIndex' => ''
] ]
); );
} }
@@ -800,7 +801,6 @@ class CouponController extends BaseAdminController
) )
); );
} }
protected function getDefaultDateFormat() protected function getDefaultDateFormat()
{ {
return LangQuery::create()->findOneByByDefault(true)->getDateFormat(); return LangQuery::create()->findOneByByDefault(true)->getDateFormat();