@@ -136,13 +136,13 @@ |
||
| 136 | 136 | { |
| 137 | 137 | $mail = $this->mailer->get('htmltemplate'); |
| 138 | 138 | $mail->setTemplate($template) |
| 139 | - ->setSubject($subject) |
|
| 140 | - ->setVariables( |
|
| 141 | - array( |
|
| 139 | + ->setSubject($subject) |
|
| 140 | + ->setVariables( |
|
| 141 | + array( |
|
| 142 | 142 | 'job' => $job, |
| 143 | 143 | 'siteName' => $this->options['siteName'], |
| 144 | 144 | ) |
| 145 | - ); |
|
| 145 | + ); |
|
| 146 | 146 | |
| 147 | 147 | if ($adminMail) { |
| 148 | 148 | $mail->setTo($this->options['adminEmail']); |
@@ -35,21 +35,21 @@ |
||
| 35 | 35 | $pending = $this->repository->count(['status.name' => StatusInterface::CREATED]); |
| 36 | 36 | |
| 37 | 37 | $event->addViewVariables('jobs', [ |
| 38 | - 'title' => 'Jobs', |
|
| 39 | - 'data' => [ |
|
| 38 | + 'title' => 'Jobs', |
|
| 39 | + 'data' => [ |
|
| 40 | 40 | /*@translate*/ 'Total jobs' => [ |
| 41 | 41 | 'url' => [ 'lang/admin/jobs', [], true ], |
| 42 | 42 | 'value' => $total, |
| 43 | 43 | ], |
| 44 | 44 | /*@translate*/ 'Active jobs' => [ |
| 45 | - 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'active' ]], true ], |
|
| 46 | - 'value' => $active |
|
| 47 | - ], |
|
| 45 | + 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'active' ]], true ], |
|
| 46 | + 'value' => $active |
|
| 47 | + ], |
|
| 48 | 48 | /*@translate*/ 'Pending jobs' => [ |
| 49 | - 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'created' ]], true ], |
|
| 50 | - 'value' => $pending |
|
| 51 | - ] |
|
| 52 | - ], |
|
| 53 | - ]); |
|
| 49 | + 'url' => [ 'lang/admin/jobs', [], ['query' => [ 'status' => 'created' ]], true ], |
|
| 50 | + 'value' => $pending |
|
| 51 | + ] |
|
| 52 | + ], |
|
| 53 | + ]); |
|
| 54 | 54 | } |
| 55 | 55 | } |
@@ -51,11 +51,11 @@ |
||
| 51 | 51 | $imageUrl = $image ? $image->getUri() : ''; |
| 52 | 52 | |
| 53 | 53 | $options[] = [ 'id' => $org->getId(), |
| 54 | - 'text' => $name . '|' |
|
| 55 | - . $contact->getCity() . '|' |
|
| 56 | - . $contact->getStreet() . '|' |
|
| 57 | - . $contact->getHouseNumber() . '|' |
|
| 58 | - . $imageUrl |
|
| 54 | + 'text' => $name . '|' |
|
| 55 | + . $contact->getCity() . '|' |
|
| 56 | + . $contact->getStreet() . '|' |
|
| 57 | + . $contact->getHouseNumber() . '|' |
|
| 58 | + . $imageUrl |
|
| 59 | 59 | ]; |
| 60 | 60 | } |
| 61 | 61 | |
@@ -49,8 +49,8 @@ |
||
| 49 | 49 | |
| 50 | 50 | $helper = new JobUrl(); |
| 51 | 51 | $helper->setUrlHelper($url) |
| 52 | - ->setParamsHelper($params) |
|
| 53 | - ->setServerUrlHelper($serverUrl); |
|
| 52 | + ->setParamsHelper($params) |
|
| 53 | + ->setServerUrlHelper($serverUrl); |
|
| 54 | 54 | return $helper; |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -44,11 +44,11 @@ |
||
| 44 | 44 | $params = $viewHelper->get('params'); |
| 45 | 45 | $serverUrl = $viewHelper->get('serverUrl'); |
| 46 | 46 | |
| 47 | - $helper = new ApplyUrl(); |
|
| 47 | + $helper = new ApplyUrl(); |
|
| 48 | 48 | $helper->setUrlHelper($url) |
| 49 | - ->setTranslateHelper($translate) |
|
| 50 | - ->setParamsHelper($params) |
|
| 51 | - ->setServerUrlHelper($serverUrl); |
|
| 49 | + ->setTranslateHelper($translate) |
|
| 50 | + ->setParamsHelper($params) |
|
| 51 | + ->setServerUrlHelper($serverUrl); |
|
| 52 | 52 | return $helper; |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -428,9 +428,9 @@ |
||
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | /** |
| 431 | - * (non-PHPdoc) |
|
| 432 | - * @see \Jobs\Entity\JobInterface::getOrganization() |
|
| 433 | - */ |
|
| 431 | + * (non-PHPdoc) |
|
| 432 | + * @see \Jobs\Entity\JobInterface::getOrganization() |
|
| 433 | + */ |
|
| 434 | 434 | public function getOrganization() |
| 435 | 435 | { |
| 436 | 436 | return $this->organization; |
@@ -65,8 +65,8 @@ |
||
| 65 | 65 | 'link' => $this->jobUrl->__invoke( |
| 66 | 66 | $job, |
| 67 | 67 | [ |
| 68 | - 'linkOnly'=> true, |
|
| 69 | - 'absolute' => true, |
|
| 68 | + 'linkOnly'=> true, |
|
| 69 | + 'absolute' => true, |
|
| 70 | 70 | ] |
| 71 | 71 | ), |
| 72 | 72 | 'organization' => array( |
@@ -66,16 +66,16 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | protected $translator; |
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * @var FilterPluginManager |
|
| 71 | - */ |
|
| 69 | + /** |
|
| 70 | + * @var FilterPluginManager |
|
| 71 | + */ |
|
| 72 | 72 | protected $filterManager; |
| 73 | 73 | |
| 74 | 74 | protected $jobFormEvents; |
| 75 | 75 | |
| 76 | - /** |
|
| 77 | - * @var |
|
| 78 | - */ |
|
| 76 | + /** |
|
| 77 | + * @var |
|
| 78 | + */ |
|
| 79 | 79 | protected $formManager; |
| 80 | 80 | |
| 81 | 81 | protected $options; |
@@ -88,35 +88,35 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | protected $jobEvent; |
| 90 | 90 | |
| 91 | - /** |
|
| 92 | - * ManageController constructor. |
|
| 93 | - * |
|
| 94 | - * @TODO: [ZF3] make this controller more thin, looks like so much things to do |
|
| 95 | - * |
|
| 96 | - * @param AuthenticationService $auth |
|
| 97 | - * @param RepositoryService $repositoryService |
|
| 98 | - * @param TranslatorInterface $translator |
|
| 99 | - * @param FilterPluginManager $filterManager |
|
| 100 | - * @param EventManagerInterface $jobFormEvents |
|
| 101 | - * @param $formManager |
|
| 102 | - * @param $options |
|
| 103 | - * @param HelperPluginManager $viewHelper |
|
| 104 | - * @param ValidatorPluginManager $validatorManager |
|
| 105 | - * @param EventManagerInterface $jobEvents |
|
| 106 | - * @param EventInterface $jobEvent |
|
| 107 | - */ |
|
| 91 | + /** |
|
| 92 | + * ManageController constructor. |
|
| 93 | + * |
|
| 94 | + * @TODO: [ZF3] make this controller more thin, looks like so much things to do |
|
| 95 | + * |
|
| 96 | + * @param AuthenticationService $auth |
|
| 97 | + * @param RepositoryService $repositoryService |
|
| 98 | + * @param TranslatorInterface $translator |
|
| 99 | + * @param FilterPluginManager $filterManager |
|
| 100 | + * @param EventManagerInterface $jobFormEvents |
|
| 101 | + * @param $formManager |
|
| 102 | + * @param $options |
|
| 103 | + * @param HelperPluginManager $viewHelper |
|
| 104 | + * @param ValidatorPluginManager $validatorManager |
|
| 105 | + * @param EventManagerInterface $jobEvents |
|
| 106 | + * @param EventInterface $jobEvent |
|
| 107 | + */ |
|
| 108 | 108 | public function __construct( |
| 109 | - AuthenticationService $auth, |
|
| 110 | - RepositoryService $repositoryService, |
|
| 111 | - TranslatorInterface $translator, |
|
| 112 | - FilterPluginManager $filterManager, |
|
| 113 | - EventManagerInterface $jobFormEvents, |
|
| 114 | - $formManager, |
|
| 115 | - $options, |
|
| 116 | - HelperPluginManager $viewHelper, |
|
| 117 | - ValidatorPluginManager $validatorManager, |
|
| 118 | - EventManagerInterface $jobEvents, |
|
| 119 | - EventInterface $jobEvent |
|
| 109 | + AuthenticationService $auth, |
|
| 110 | + RepositoryService $repositoryService, |
|
| 111 | + TranslatorInterface $translator, |
|
| 112 | + FilterPluginManager $filterManager, |
|
| 113 | + EventManagerInterface $jobFormEvents, |
|
| 114 | + $formManager, |
|
| 115 | + $options, |
|
| 116 | + HelperPluginManager $viewHelper, |
|
| 117 | + ValidatorPluginManager $validatorManager, |
|
| 118 | + EventManagerInterface $jobEvents, |
|
| 119 | + EventInterface $jobEvent |
|
| 120 | 120 | ) |
| 121 | 121 | { |
| 122 | 122 | $this->auth = $auth; |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | $routeMatch = $e->getRouteMatch(); |
| 159 | 159 | $action = $routeMatch->getParam('action'); |
| 160 | - $services = $e->getApplication()->getServiceManager(); |
|
| 160 | + $services = $e->getApplication()->getServiceManager(); |
|
| 161 | 161 | if (in_array($action, array('edit', 'approval', 'completion'))) { |
| 162 | 162 | $jobEvents = $services->get('Jobs/Events'); |
| 163 | 163 | $mailSender = $services->get('Jobs/Listener/MailSender'); |
@@ -202,12 +202,12 @@ discard block |
||
| 202 | 202 | $jobEntity = $this->initializeJob()->get($this->params(), true); |
| 203 | 203 | |
| 204 | 204 | $model = new ViewModel([ |
| 205 | - 'portals' => $jobEntity->getPortals(), |
|
| 206 | - 'channels' => $channels, |
|
| 207 | - 'defaultCurrencyCode' => $options->defaultCurrencyCode, |
|
| 208 | - 'defaultTaxRate' => $options->defaultTaxRate, |
|
| 209 | - 'jobId' => $jobEntity->getId() |
|
| 210 | - ]); |
|
| 205 | + 'portals' => $jobEntity->getPortals(), |
|
| 206 | + 'channels' => $channels, |
|
| 207 | + 'defaultCurrencyCode' => $options->defaultCurrencyCode, |
|
| 208 | + 'defaultTaxRate' => $options->defaultTaxRate, |
|
| 209 | + 'jobId' => $jobEntity->getId() |
|
| 210 | + ]); |
|
| 211 | 211 | $model->setTemplate('jobs/partials/channel-list')->setTerminal(true); |
| 212 | 212 | return $model; |
| 213 | 213 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | */ |
| 226 | 226 | protected function save() |
| 227 | 227 | { |
| 228 | - $formEvents = $this->jobFormEvents; |
|
| 228 | + $formEvents = $this->jobFormEvents; |
|
| 229 | 229 | $user = $this->auth->getUser(); |
| 230 | 230 | if (empty($user->getInfo()->getEmail())) { |
| 231 | 231 | return $this->getErrorViewModel('no-parent', array('cause' => 'noEmail')); |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | 'lang/jobs/view', |
| 585 | 585 | array(), |
| 586 | 586 | array('query' => $query |
| 587 | - ) |
|
| 587 | + ) |
|
| 588 | 588 | ); |
| 589 | 589 | |
| 590 | 590 | $approvalLink = $this->url()->fromRoute( |
@@ -600,10 +600,10 @@ discard block |
||
| 600 | 600 | ); |
| 601 | 601 | |
| 602 | 602 | return array('job' => $jobEntity, |
| 603 | - 'diffSnapshot' => $diff, |
|
| 604 | - 'viewLink' => $viewLink, |
|
| 605 | - 'approvalLink' => $approvalLink, |
|
| 606 | - 'declineLink' => $declineLink); |
|
| 603 | + 'diffSnapshot' => $diff, |
|
| 604 | + 'viewLink' => $viewLink, |
|
| 605 | + 'approvalLink' => $approvalLink, |
|
| 606 | + 'declineLink' => $declineLink); |
|
| 607 | 607 | } |
| 608 | 608 | |
| 609 | 609 | /** |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | return new JsonModel([ |
| 72 | 72 | 'valid' => $valid, |
| 73 | 73 | 'errors' => $errors |
| 74 | - ]); |
|
| 74 | + ]); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | $form->bind($job); |