@@ -69,7 +69,7 @@ |
||
69 | 69 | ? [ |
70 | 70 | 'type' => $coords->getType(), |
71 | 71 | 'coordinates' => $coords->getCoordinates(), |
72 | - ] |
|
72 | + ] |
|
73 | 73 | : null |
74 | 74 | |
75 | 75 | ]; |
@@ -108,8 +108,8 @@ |
||
108 | 108 | $paginator = $paginators->get($paginatorName,$params); |
109 | 109 | } |
110 | 110 | $paginator->setCurrentPageNumber(isset($params['page']) ? $params['page'] : 1) |
111 | - ->setItemCountPerPage(isset($params['count']) ? $params['count'] : 10) |
|
112 | - ->setPageRange(isset($params['range']) ? $params['range'] : 5); |
|
111 | + ->setItemCountPerPage(isset($params['count']) ? $params['count'] : 10) |
|
112 | + ->setPageRange(isset($params['range']) ? $params['range'] : 5); |
|
113 | 113 | |
114 | 114 | return $paginator; |
115 | 115 | } |
@@ -24,8 +24,8 @@ |
||
24 | 24 | * @author Mathias Gelhausen <[email protected]> |
25 | 25 | */ |
26 | 26 | class Form extends ZendForm implements DescriptionAwareFormInterface, |
27 | - DisableElementsCapableInterface, |
|
28 | - FormParentInterface |
|
27 | + DisableElementsCapableInterface, |
|
28 | + FormParentInterface |
|
29 | 29 | { |
30 | 30 | |
31 | 31 | use EventManagerAwareTrait, HydratorStrategyAwareTrait; |
@@ -63,16 +63,16 @@ |
||
63 | 63 | |
64 | 64 | foreach ($result as $key => $val) { |
65 | 65 | $row=[ |
66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | - 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | - 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | - 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | + 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | + 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | + 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
71 | 71 | |
72 | - 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | - 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | - //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | - //'data' => json_encode($val), |
|
72 | + 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | + 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | + //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | + //'data' => json_encode($val), |
|
76 | 76 | ]; |
77 | 77 | if ($val->geometry) { |
78 | 78 | $row['coordinates'] = [ |
@@ -148,12 +148,12 @@ discard block |
||
148 | 148 | $jobEntity = $this->initializeJob()->get($this->params(), true); |
149 | 149 | |
150 | 150 | $model = new ViewModel([ |
151 | - 'portals' => $jobEntity->getPortals(), |
|
152 | - 'channels' => $channels, |
|
153 | - 'defaultCurrencyCode' => $options->defaultCurrencyCode, |
|
154 | - 'defaultTaxRate' => $options->defaultTaxRate, |
|
155 | - 'jobId' => $jobEntity->getId() |
|
156 | - ]); |
|
151 | + 'portals' => $jobEntity->getPortals(), |
|
152 | + 'channels' => $channels, |
|
153 | + 'defaultCurrencyCode' => $options->defaultCurrencyCode, |
|
154 | + 'defaultTaxRate' => $options->defaultTaxRate, |
|
155 | + 'jobId' => $jobEntity->getId() |
|
156 | + ]); |
|
157 | 157 | $model->setTemplate('jobs/partials/channel-list')->setTerminal(true); |
158 | 158 | return $model; |
159 | 159 | } |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | 'lang/jobs/view', |
514 | 514 | array(), |
515 | 515 | array('query' => $query |
516 | - ) |
|
516 | + ) |
|
517 | 517 | ); |
518 | 518 | |
519 | 519 | $approvalLink = $this->url()->fromRoute( |
@@ -529,10 +529,10 @@ discard block |
||
529 | 529 | ); |
530 | 530 | |
531 | 531 | return array('job' => $jobEntity, |
532 | - 'diffSnapshot' => $diff, |
|
533 | - 'viewLink' => $viewLink, |
|
534 | - 'approvalLink' => $approvalLink, |
|
535 | - 'declineLink' => $declineLink); |
|
532 | + 'diffSnapshot' => $diff, |
|
533 | + 'viewLink' => $viewLink, |
|
534 | + 'approvalLink' => $approvalLink, |
|
535 | + 'declineLink' => $declineLink); |
|
536 | 536 | } |
537 | 537 | |
538 | 538 | /** |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - protected $fields=[ |
|
35 | + protected $fields=[ |
|
36 | 36 | self::TITLE => [ |
37 | 37 | 'enabled' => true, |
38 | 38 | 'options' => [ |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | $content = $this->renderElements($form, $colMap, $buttonsSpan); |
67 | 67 | |
68 | 68 | return $this->openTag($form) |
69 | - . '<div class="row" style="padding: 0 15px;">' |
|
70 | - . $content . '</div>' . $this->closeTag(); |
|
69 | + . '<div class="row" style="padding: 0 15px;">' |
|
70 | + . $content . '</div>' . $this->closeTag(); |
|
71 | 71 | |
72 | 72 | } |
73 | 73 | |
@@ -109,15 +109,15 @@ discard block |
||
109 | 109 | |
110 | 110 | if ($element->getName() == $form->getButtonElement()) { |
111 | 111 | $content.='<div class="input-group col-md-' . $cols . '">' |
112 | - . $formElement($element) |
|
113 | - . '<div class="input-group-btn search-form-buttons" style="width: 1px;">' |
|
114 | - . $this->renderButtons($form->getButtons()) . '</div>' |
|
115 | - . '</div>'; |
|
112 | + . $formElement($element) |
|
113 | + . '<div class="input-group-btn search-form-buttons" style="width: 1px;">' |
|
114 | + . $this->renderButtons($form->getButtons()) . '</div>' |
|
115 | + . '</div>'; |
|
116 | 116 | $buttonsRendered = true; |
117 | 117 | } else { |
118 | 118 | $content .= '<div class="input-group col-md-' . $cols . '">' |
119 | - . $formElement($element) |
|
120 | - . '</div>'; |
|
119 | + . $formElement($element) |
|
120 | + . '</div>'; |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | $i += 1; |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $buttonsSpan = $form->getOption('buttons_span') ?: 12; |
129 | 129 | } |
130 | 130 | $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">' |
131 | - . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
131 | + . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | return $content; |
@@ -18,11 +18,11 @@ |
||
18 | 18 | */ |
19 | 19 | class Module |
20 | 20 | { |
21 | - /** |
|
22 | - * Loads module specific configuration. |
|
23 | - * |
|
24 | - * @return array |
|
25 | - */ |
|
21 | + /** |
|
22 | + * Loads module specific configuration. |
|
23 | + * |
|
24 | + * @return array |
|
25 | + */ |
|
26 | 26 | public function getConfig() |
27 | 27 | { |
28 | 28 | return include __DIR__ . '/config/module.config.php'; |
@@ -45,9 +45,9 @@ |
||
45 | 45 | $params = $container->get('params'); |
46 | 46 | $serverUrl = $container->get('serverUrl'); |
47 | 47 | $helper->setUrlHelper($url) |
48 | - ->setTranslateHelper($translate) |
|
49 | - ->setParamsHelper($params) |
|
50 | - ->setServerUrlHelper($serverUrl); |
|
48 | + ->setTranslateHelper($translate) |
|
49 | + ->setParamsHelper($params) |
|
50 | + ->setServerUrlHelper($serverUrl); |
|
51 | 51 | return $helper; |
52 | 52 | } |
53 | 53 |