@@ -89,7 +89,8 @@ |
||
89 | 89 | } elseif ((int) $group > 0) { |
90 | 90 | try { |
91 | 91 | $this->parent = new org_openpsa_products_product_group_dba((int) $group); |
92 | - } catch (midcom_error $e) { |
|
92 | + } |
|
93 | + catch (midcom_error $e) { |
|
93 | 94 | $e->log(); |
94 | 95 | } |
95 | 96 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | midcom::get()->auth->require_valid_user(); |
34 | 34 | midcom::get()->skip_page_style = true; |
35 | 35 | |
36 | - $this->add_stylesheet(MIDCOM_STATIC_URL ."/midcom.helper.imagepopup/styling.css", 'screen'); |
|
36 | + $this->add_stylesheet(MIDCOM_STATIC_URL . "/midcom.helper.imagepopup/styling.css", 'screen'); |
|
37 | 37 | |
38 | 38 | $data['filetype'] = $filetype; |
39 | 39 | $data['object'] = null; |
@@ -100,7 +100,8 @@ |
||
100 | 100 | try { |
101 | 101 | $task = org_openpsa_projects_task_dba::get_cached($hour_report->task); |
102 | 102 | $options['success_url'] = $this->router->generate('list_hours_task', ['guid' => $task->guid]); |
103 | - } catch (midcom_error $e) { |
|
103 | + } |
|
104 | + catch (midcom_error $e) { |
|
104 | 105 | $e->log(); |
105 | 106 | } |
106 | 107 | return $this->get_workflow('delete', $options)->run($request); |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | } |
71 | 71 | } elseif (!$this->form->isSubmitted()) { |
72 | 72 | $this->form->handleRequest($request); |
73 | - if ( $this->form->isSubmitted() |
|
73 | + if ($this->form->isSubmitted() |
|
74 | 74 | && $button = $this->form->getClickedButton()) { |
75 | 75 | $operation = $button->getConfig()->getOption('operation'); |
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | - if ( in_array($operation, [self::SAVE, self::NEXT]) |
|
79 | + if (in_array($operation, [self::SAVE, self::NEXT]) |
|
80 | 80 | && !$this->form->isValid()) { |
81 | 81 | $operation = self::EDIT; |
82 | 82 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | if ($storage->get_last_operation() === self::SAVE) { |
160 | 160 | // Get GUIDs and such for new-created dependent objects |
161 | 161 | $this->dm->set_storage($storage->get_value(), $this->dm->get_schema()->get_name()); |
162 | - } elseif ( !$this->form->isValid() |
|
162 | + } elseif (!$this->form->isValid() |
|
163 | 163 | && $storage->move_uploaded_files() > 0) { |
164 | 164 | $form = $this->dm->get_form($this->form->getName(), true); |
165 | 165 | $this->copy_errors($this->form, $form); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | $item->title = $data['article']->title; |
19 | 19 | $arg = $data['article']->name ?: $data['article']->guid; |
20 | 20 | |
21 | -if ( $data['config']->get('link_to_external_url') |
|
21 | +if ($data['config']->get('link_to_external_url') |
|
22 | 22 | && !empty($data['article']->url)) { |
23 | 23 | $item->link = $data['article']->url; |
24 | 24 | } else { |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $item->description .= '<div class="abstract">' . $view['abstract'] . '</div>'; |
38 | 38 | } |
39 | 39 | |
40 | -if ( array_key_exists('image', $view) |
|
40 | +if (array_key_exists('image', $view) |
|
41 | 41 | && $data['config']->get('rss_use_image')) { |
42 | 42 | $item->description .= "\n<div class=\"image\">" . $view['image'] . '</div>'; |
43 | 43 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | // Skip components beginning with midcom or midgard |
53 | - if ( preg_match('/^(midcom|midgard)\./', $manifest->name) |
|
53 | + if (preg_match('/^(midcom|midgard)\./', $manifest->name) |
|
54 | 54 | && $manifest->name != 'midcom.helper.search') { |
55 | 55 | continue; |
56 | 56 | } |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | $state = $data['deliverable']->get_state(); |
4 | 4 | $formatter = $data['l10n']->get_formatter(); |
5 | 5 | $per_unit = $data['l10n']->get('per unit'); |
6 | -if ( $data['product'] |
|
6 | +if ($data['product'] |
|
7 | 7 | && $unit_option = org_openpsa_sales_viewer::get_unit_option($data['product']->unit)) { |
8 | 8 | $per_unit = sprintf($data['l10n']->get('per %s'), $unit_option); |
9 | 9 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | </div> |
116 | 116 | <?php |
117 | 117 | $tabs = []; |
118 | - if ( $data['invoices_url'] |
|
118 | + if ($data['invoices_url'] |
|
119 | 119 | && $data['deliverable']->invoiced > 0) { |
120 | 120 | $tabs[] = [ |
121 | 121 | 'url' => $data['invoices_url'] . "list/deliverable/{$data['deliverable']->guid}/", |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | ]; |
124 | 124 | } |
125 | 125 | |
126 | - if ( $data['projects_url'] |
|
126 | + if ($data['projects_url'] |
|
127 | 127 | && $data['deliverable']->state >= org_openpsa_sales_salesproject_deliverable_dba::STATE_ORDERED |
128 | 128 | && $data['product'] |
129 | 129 | && $data['product']->orgOpenpsaObtype == org_openpsa_products_product_dba::TYPE_SERVICE) { |
@@ -65,17 +65,17 @@ |
||
65 | 65 | <tr> |
66 | 66 | <td class="title"><?php echo $data['l10n']->get('cost'); ?></td> |
67 | 67 | <?php |
68 | - if ($data['deliverable']->costType == '%') { ?> |
|
68 | + if ($data['deliverable']->costType == '%') { ?> |
|
69 | 69 | <td class="numeric"><?php echo $view['costPerUnit']; ?> %</td> |
70 | 70 | <td class="numeric"> </td> |
71 | 71 | <td class="numeric"> </td> |
72 | 72 | <?php |
73 | - } else { ?> |
|
73 | + } else { ?> |
|
74 | 74 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->costPerUnit); ?></td> |
75 | 75 | <td class="numeric"><?php echo $view['plannedUnits']; ?></td> |
76 | 76 | <td class="numeric"><?php echo $view['units']; ?></td> |
77 | 77 | <?php |
78 | - } ?> |
|
78 | + } ?> |
|
79 | 79 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->cost); ?></td> |
80 | 80 | </tr> |
81 | 81 | </tbody> |
@@ -5,29 +5,29 @@ |
||
5 | 5 | ?> |
6 | 6 | <div class="area org_openpsa_helper_box"><h3><?php echo $data['l10n']->get('offers'); ?></h3> |
7 | 7 | <ul><?php |
8 | - foreach ($data['offers'] as $offer) { |
|
9 | - echo '<li><span class="org_openpsa_helpers_fileinfo">'; |
|
10 | - $attachment = $offer->get_file(); |
|
11 | - $delete_link = $data['router']->generate('delete_offer', ['guid' => $offer->guid]); |
|
12 | - $edit_link = $data['router']->generate('edit_offer', ['guid' => $offer->guid]); |
|
8 | + foreach ($data['offers'] as $offer) { |
|
9 | + echo '<li><span class="org_openpsa_helpers_fileinfo">'; |
|
10 | + $attachment = $offer->get_file(); |
|
11 | + $delete_link = $data['router']->generate('delete_offer', ['guid' => $offer->guid]); |
|
12 | + $edit_link = $data['router']->generate('edit_offer', ['guid' => $offer->guid]); |
|
13 | 13 | |
14 | - if (!empty($attachment)) { |
|
15 | - $url = midcom_db_attachment::get_url($attachment); |
|
16 | - echo '<a href="' . $url . '" class="icon"><i class="fa fa-file-text-o"></i></a>'; |
|
17 | - } |
|
18 | - echo '<span class="info">'; |
|
19 | - echo '<span class="filename">' . $offer->get_label(); |
|
20 | - echo ' <a class="actions" href="' . $delete_link . '"><i class="fa fa-trash" title="' . $data['l10n_midcom']->get('delete') . '"></i></a>'; |
|
21 | - echo ' <a class="actions" ' . $wf->render_attributes() . ' href="' . $edit_link . '"><i class="fa fa-pencil" title="' . $data['l10n_midcom']->get('edit') . '"></i></a>'; |
|
22 | - echo "</span>\n"; |
|
23 | - if (!empty($attachment)) { |
|
24 | - echo ' <span class="date">' . $formatter->datetime($attachment->metadata->revised) . '</span> '; |
|
25 | - $person_card = org_openpsa_widgets_contact::get($attachment->metadata->revisor); |
|
26 | - echo $person_card->show_inline(); |
|
27 | - } |
|
28 | - echo "</span></span></li>\n"; |
|
29 | - } |
|
30 | - ?> |
|
14 | + if (!empty($attachment)) { |
|
15 | + $url = midcom_db_attachment::get_url($attachment); |
|
16 | + echo '<a href="' . $url . '" class="icon"><i class="fa fa-file-text-o"></i></a>'; |
|
17 | + } |
|
18 | + echo '<span class="info">'; |
|
19 | + echo '<span class="filename">' . $offer->get_label(); |
|
20 | + echo ' <a class="actions" href="' . $delete_link . '"><i class="fa fa-trash" title="' . $data['l10n_midcom']->get('delete') . '"></i></a>'; |
|
21 | + echo ' <a class="actions" ' . $wf->render_attributes() . ' href="' . $edit_link . '"><i class="fa fa-pencil" title="' . $data['l10n_midcom']->get('edit') . '"></i></a>'; |
|
22 | + echo "</span>\n"; |
|
23 | + if (!empty($attachment)) { |
|
24 | + echo ' <span class="date">' . $formatter->datetime($attachment->metadata->revised) . '</span> '; |
|
25 | + $person_card = org_openpsa_widgets_contact::get($attachment->metadata->revisor); |
|
26 | + echo $person_card->show_inline(); |
|
27 | + } |
|
28 | + echo "</span></span></li>\n"; |
|
29 | + } |
|
30 | + ?> |
|
31 | 31 | </ul> |
32 | 32 | </div> |
33 | 33 | <?php } ?> |
34 | 34 | \ No newline at end of file |
@@ -249,7 +249,7 @@ |
||
249 | 249 | $new_status = $this->_find_status($this->_status_map[$this->status_type], $status_types); |
250 | 250 | } |
251 | 251 | |
252 | - if ( $new_status !== null |
|
252 | + if ($new_status !== null |
|
253 | 253 | && $this->status != $new_status) { |
254 | 254 | $this->status = $new_status; |
255 | 255 | $update_required = true; |