@@ -8,6 +8,6 @@ |
||
| 8 | 8 | echo '<li' . ($link['selected'] ? ' class="selected"' : '') . '>'; |
| 9 | 9 | echo '<a href="' . $link['url'] . '/">' . $link['label'] . '</a></li>'; |
| 10 | 10 | } |
| 11 | - ?> |
|
| 11 | + ?> |
|
| 12 | 12 | </ul> |
| 13 | 13 | </div> |
| 14 | 14 | \ No newline at end of file |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | if ( !$this->can_do('midgard:update') |
| 219 | 219 | || !$this->can_do('midgard:parameters')) { |
| 220 | 220 | debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.", |
| 221 | - MIDCOM_LOG_ERROR); |
|
| 221 | + MIDCOM_LOG_ERROR); |
|
| 222 | 222 | midcom_connection::set_error(MGD_ERR_ACCESS_DENIED); |
| 223 | 223 | return false; |
| 224 | 224 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | if ( !$this->can_do('midgard:update') |
| 272 | 272 | || !$this->can_do('midgard:parameters')) { |
| 273 | 273 | debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.", |
| 274 | - MIDCOM_LOG_ERROR); |
|
| 274 | + MIDCOM_LOG_ERROR); |
|
| 275 | 275 | midcom_connection::set_error(MGD_ERR_ACCESS_DENIED); |
| 276 | 276 | return false; |
| 277 | 277 | } |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <div class="content-with-sidebar"> |
| 2 | 2 | <div class="main"> |
| 3 | 3 | <?php |
| 4 | - $data['view']->display_view(); |
|
| 4 | + $data['view']->display_view(); |
|
| 5 | 5 | $prefix = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX); |
| 6 | 6 | midcom::get()->dynamic_load($prefix . 'members/' . $data['group']->guid . '/'); |
| 7 | 7 | ?> |
@@ -37,7 +37,6 @@ |
||
| 37 | 37 | - 1: MIDCOM_PRIVILEGE_ALLOW |
| 38 | 38 | - 2: MIDCOM_PRIVILEGE_DENY |
| 39 | 39 | - 3: MIDCOM_PRIVILEGE_INHERIT |
| 40 | - |
|
| 41 | 40 | * @property string $guid |
| 42 | 41 | * @package midcom |
| 43 | 42 | */ |
@@ -103,12 +103,12 @@ |
||
| 103 | 103 | if (!empty($guid)) { |
| 104 | 104 | //pass the urls & titles for the tabs |
| 105 | 105 | $tabdata[] = [ |
| 106 | - 'url' => '__mfa/org.openpsa.relatedto/journalentry/' . $guid . '/', |
|
| 107 | - 'title' => midcom::get()->i18n->get_string('journal entries', 'org.openpsa.relatedto'), |
|
| 106 | + 'url' => '__mfa/org.openpsa.relatedto/journalentry/' . $guid . '/', |
|
| 107 | + 'title' => midcom::get()->i18n->get_string('journal entries', 'org.openpsa.relatedto'), |
|
| 108 | 108 | ]; |
| 109 | 109 | $tabdata[] = [ |
| 110 | - 'url' => '__mfa/org.openpsa.relatedto/render/' . $guid . '/both/', |
|
| 111 | - 'title' => midcom::get()->i18n->get_string('related objects', 'org.openpsa.relatedto'), |
|
| 110 | + 'url' => '__mfa/org.openpsa.relatedto/render/' . $guid . '/both/', |
|
| 111 | + 'title' => midcom::get()->i18n->get_string('related objects', 'org.openpsa.relatedto'), |
|
| 112 | 112 | ]; |
| 113 | 113 | } |
| 114 | 114 | |
@@ -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 |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | public static function get_by_object(org_openpsa_invoices_interfaces_customer $object) : self |
| 62 | 62 | { |
| 63 | 63 | if ( !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer)) |
| 64 | - // check if the customerContact is set and has invoice_data |
|
| 64 | + // check if the customerContact is set and has invoice_data |
|
| 65 | 65 | && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) { |
| 66 | 66 | $bd = new self(); |
| 67 | 67 | $due = midcom_baseclasses_components_configuration::get('org.openpsa.invoices', 'config')->get('default_due_days'); |
@@ -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> |
@@ -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> |