@@ -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; |
@@ -83,7 +83,8 @@ |
||
83 | 83 | $productgroup = new org_openpsa_products_product_group_dba($this->_product->productGroup); |
84 | 84 | $replacements['<PRODUCTGROUP_TITLE>'] = $productgroup->title; |
85 | 85 | $replacements['<PRODUCTGROUP_CODE>'] = $productgroup->code; |
86 | - } catch (midcom_error $e) { |
|
86 | + } |
|
87 | + catch (midcom_error $e) { |
|
87 | 88 | $replacements['<PRODUCTGROUP_TITLE>'] = ''; |
88 | 89 | $replacements['<PRODUCTGROUP_CODE>'] = ''; |
89 | 90 | } |
@@ -261,7 +261,7 @@ |
||
261 | 261 | if ($part === '') { |
262 | 262 | continue; |
263 | 263 | } |
264 | - if ( midcom::get()->config->get('theme') |
|
264 | + if (midcom::get()->config->get('theme') |
|
265 | 265 | && !$args_started |
266 | 266 | && self::check_page_exists($part)) { |
267 | 267 | $page_style .= '/' . $part; |
@@ -93,7 +93,8 @@ |
||
93 | 93 | |
94 | 94 | try { |
95 | 95 | $user = new midgard_user($login_tokens); |
96 | - } catch (mgd_exception $e) { |
|
96 | + } |
|
97 | + catch (mgd_exception $e) { |
|
97 | 98 | return null; |
98 | 99 | } |
99 | 100 | if (!$trusted && !self::verify_password($password, $user->password)) { |
@@ -15,7 +15,7 @@ |
||
15 | 15 | |
16 | 16 | foreach ($properties as $propname => $val) { |
17 | 17 | $description = preg_replace('/ *\n */', "\n", $val['value']); |
18 | - if ( $val['link'] |
|
18 | + if ($val['link'] |
|
19 | 19 | && $linked_component = midcom::get()->dbclassloader->get_component_for_class($val['link_name'])) { |
20 | 20 | $proplink = $data['router']->generate('help', ['component' => $linked_component, 'help_id' => 'mgdschemas']); |
21 | 21 | $proplink = "<a href='{$proplink}#{$val['link_name']}' title='{$linked_component}/{$val['link_name']}::{$val['link_target']}'>{$val['link_name']}:{$val['link_target']}</a>"; |
@@ -110,7 +110,7 @@ |
||
110 | 110 | public function _on_updated() |
111 | 111 | { |
112 | 112 | // Sync the object's ACL properties into MidCOM ACL system |
113 | - if ( !$this->_skip_acl_refresh) { |
|
113 | + if (!$this->_skip_acl_refresh) { |
|
114 | 114 | if ($this->orgOpenpsaAccesstype && $this->orgOpenpsaOwnerWg) { |
115 | 115 | debug_add("Synchronizing task ACLs to MidCOM"); |
116 | 116 | $sync = new org_openpsa_core_acl_synchronizer(); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | if ($this->_config->get('sales_pdfbuilder_class')) { |
94 | - if ( $this->_salesproject->can_do('midgard:update') |
|
94 | + if ($this->_salesproject->can_do('midgard:update') |
|
95 | 95 | && $this->is_pdf_creatable()) { |
96 | 96 | $workflow = $this->get_workflow('datamanager'); |
97 | 97 | $buttons[] = $workflow->get_button($this->router->generate('create_offer', ['guid' => $this->_salesproject->guid]), [ |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | case 'ordered': |
219 | 219 | if ($deliverable->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) { |
220 | 220 | $entries = $deliverable->get_at_entries(); |
221 | - if ( $entries |
|
221 | + if ($entries |
|
222 | 222 | && $entries[0]->status == midcom_services_at_entry_dba::SCHEDULED |
223 | 223 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)) { |
224 | 224 | return '<button class="run_cycle"><i class="fa fa-refresh"></i>' . $this->_l10n->get('generate now') . '</button>'; |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | } |
229 | 229 | break; |
230 | 230 | case 'delivered': |
231 | - if ( $deliverable->orgOpenpsaObtype != org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
231 | + if ($deliverable->orgOpenpsaObtype != org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
232 | 232 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)) { |
233 | 233 | $client_class = $this->_config->get('calculator'); |
234 | 234 | $client = new $client_class(); |
@@ -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 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | </div> |
125 | 125 | <?php |
126 | 126 | $tabs = []; |
127 | - if ( $data['invoices_url'] |
|
127 | + if ($data['invoices_url'] |
|
128 | 128 | && $data['deliverable']->invoiced > 0) { |
129 | 129 | $tabs[] = [ |
130 | 130 | 'url' => $data['invoices_url'] . "list/deliverable/{$data['deliverable']->guid}/", |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | ]; |
133 | 133 | } |
134 | 134 | |
135 | - if ( $data['projects_url'] |
|
135 | + if ($data['projects_url'] |
|
136 | 136 | && $data['deliverable']->state >= org_openpsa_sales_salesproject_deliverable_dba::STATE_ORDERED |
137 | 137 | && $data['product'] |
138 | 138 | && $data['product']->orgOpenpsaObtype == org_openpsa_products_product_dba::TYPE_SERVICE) { |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | } |
192 | 192 | echo " </tbody>\n"; |
193 | 193 | echo "</table>\n"; |
194 | - if ( $at_entries[0]->status == midcom_services_at_entry_dba::SCHEDULED |
|
194 | + if ($at_entries[0]->status == midcom_services_at_entry_dba::SCHEDULED |
|
195 | 195 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)) { |
196 | 196 | $label = $data['l10n']->get('generate now'); |
197 | 197 | $process_link = $data['router']->generate('deliverable_run_cycle', ['guid' => $data['deliverable']->guid]); |
@@ -74,12 +74,12 @@ |
||
74 | 74 | <tr> |
75 | 75 | <td class="title"><?php echo $data['l10n']->get('cost'); ?></td> |
76 | 76 | <?php |
77 | - if ($data['deliverable']->costType == '%') { ?> |
|
77 | + if ($data['deliverable']->costType == '%') { ?> |
|
78 | 78 | <td class="numeric"><?php echo $view['costPerUnit']; ?> %</td> |
79 | 79 | <td class="numeric"> </td> |
80 | 80 | <td class="numeric"> </td> |
81 | 81 | <?php |
82 | - } else { ?> |
|
82 | + } else { ?> |
|
83 | 83 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->costPerUnit); ?></td> |
84 | 84 | <td class="numeric"><?php echo $view['plannedUnits']; ?></td> |
85 | 85 | <td class="numeric"><?php echo $view['units']; ?></td> |