@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $this->add_breadcrumb('', $person->get_label()); |
| 26 | 26 | |
| 27 | 27 | $auth = midcom::get()->auth; |
| 28 | - if ( $person->guid == midcom::get()->auth->user->guid |
|
| 28 | + if ($person->guid == midcom::get()->auth->user->guid |
|
| 29 | 29 | || $auth->can_user_do('org.openpsa.user:manage', null, org_openpsa_user_interface::class)) { |
| 30 | 30 | $buttons = []; |
| 31 | 31 | $workflow = $this->get_workflow('datamanager'); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $delete_workflow = $this->get_workflow('delete', ['object' => $person]); |
| 39 | 39 | $buttons[] = $delete_workflow->get_button($this->router->generate('user_delete', ['guid' => $person->guid])); |
| 40 | 40 | } |
| 41 | - if ( $data['account']->get_username() |
|
| 41 | + if ($data['account']->get_username() |
|
| 42 | 42 | && $person->can_do('midgard:privileges')) { |
| 43 | 43 | $buttons[] = $workflow->get_button($this->router->generate('user_privileges', ['guid' => $person->guid]), [ |
| 44 | 44 | MIDCOM_TOOLBAR_LABEL => $this->_l10n->get("permissions"), |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if ( empty($link->toComponent) |
|
| 55 | + if (empty($link->toComponent) |
|
| 56 | 56 | && !empty($link->fromComponent)) { |
| 57 | 57 | debug_add("Setting property 'toComponent' to '{$component}'"); |
| 58 | 58 | $link->toComponent = $component; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | $link->fromComponent = $component; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if ( empty($link->toGuid) |
|
| 64 | + if (empty($link->toGuid) |
|
| 65 | 65 | && !empty($link->fromGuid)) { |
| 66 | 66 | $link->toClass = get_class($obj); |
| 67 | 67 | $link->toGuid = $obj->guid; |
@@ -48,7 +48,8 @@ |
||
| 48 | 48 | foreach (array_unique($tasks_to_update) as $id) { |
| 49 | 49 | try { |
| 50 | 50 | org_openpsa_expenses_hour_report_dba::update_cache(new org_openpsa_projects_task_dba($id)); |
| 51 | - } catch (midcom_error $e) { |
|
| 51 | + } |
|
| 52 | + catch (midcom_error $e) { |
|
| 52 | 53 | $e->log(); |
| 53 | 54 | } |
| 54 | 55 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | private function get_units($units = false) : float |
| 51 | 51 | { |
| 52 | - if ( $this->deliverable->invoiceByActualUnits |
|
| 52 | + if ($this->deliverable->invoiceByActualUnits |
|
| 53 | 53 | || $this->deliverable->plannedUnits == 0) { |
| 54 | 54 | // In most cases we calculate the price based on the actual units entered |
| 55 | 55 | return $units ?: $this->deliverable->units; |
@@ -31,7 +31,8 @@ discard block |
||
| 31 | 31 | try { |
| 32 | 32 | $agreement = new org_openpsa_sales_salesproject_deliverable_dba($agreement); |
| 33 | 33 | $agreement->update_units(); |
| 34 | - } catch (midcom_error $e) { |
|
| 34 | + } |
|
| 35 | + catch (midcom_error $e) { |
|
| 35 | 36 | $e->log(); |
| 36 | 37 | } |
| 37 | 38 | } |
@@ -49,7 +50,8 @@ discard block |
||
| 49 | 50 | |
| 50 | 51 | try { |
| 51 | 52 | $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']); |
| 52 | - } catch (midcom_error $e) { |
|
| 53 | + } |
|
| 54 | + catch (midcom_error $e) { |
|
| 53 | 55 | $handler->print_error("Deliverable {$args['deliverable']} not found: " . midcom_connection::get_error_string()); |
| 54 | 56 | return false; |
| 55 | 57 | } |
@@ -69,7 +71,8 @@ discard block |
||
| 69 | 71 | } |
| 70 | 72 | try { |
| 71 | 73 | $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']); |
| 72 | - } catch (midcom_error $e) { |
|
| 74 | + } |
|
| 75 | + catch (midcom_error $e) { |
|
| 73 | 76 | $handler->print_error('no deliverable with passed GUID: ' . $args['deliverable'] . ', aborting'); |
| 74 | 77 | return false; |
| 75 | 78 | } |
@@ -77,7 +80,8 @@ discard block |
||
| 77 | 80 | //get the owner of the salesproject the deliverable belongs to |
| 78 | 81 | try { |
| 79 | 82 | $project = new org_openpsa_sales_salesproject_dba($deliverable->salesproject); |
| 80 | - } catch (midcom_error $e) { |
|
| 83 | + } |
|
| 84 | + catch (midcom_error $e) { |
|
| 81 | 85 | $handler->print_error('Failed to load salesproject: ' . $e->getMessage()); |
| 82 | 86 | return false; |
| 83 | 87 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | $prefix = $nap->get_node($this->_topic->id)[MIDCOM_NAV_ABSOLUTEURL]; |
| 28 | 28 | |
| 29 | 29 | $tree = new org_openpsa_widgets_tree(org_openpsa_contacts_group_dba::class, 'owner'); |
| 30 | - $tree->link_callback = function ($guid) use ($prefix) { |
|
| 30 | + $tree->link_callback = function($guid) use ($prefix) { |
|
| 31 | 31 | return $prefix . 'group/' . $guid . '/'; |
| 32 | 32 | }; |
| 33 | 33 | $tree->constraints[] = ['orgOpenpsaObtype', '<', org_openpsa_contacts_group_dba::ORGANIZATION]; |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | { |
| 44 | 44 | $my_company_guid = $this->_config->get('owner_organization'); |
| 45 | 45 | |
| 46 | - if ( empty($my_company_guid) |
|
| 46 | + if (empty($my_company_guid) |
|
| 47 | 47 | || !mgd_is_guid($my_company_guid)) { |
| 48 | 48 | if (midcom::get()->auth->admin) { |
| 49 | 49 | midcom::get()->uimessages->add( |
@@ -31,7 +31,8 @@ discard block |
||
| 31 | 31 | if ($data['contacts_url']) { |
| 32 | 32 | $row['customer'] = "<a href=\"{$data['contacts_url']}group/{$customer->guid}/\">{$label}</a>"; |
| 33 | 33 | } |
| 34 | - } catch (midcom_error $e) { |
|
| 34 | + } |
|
| 35 | + catch (midcom_error $e) { |
|
| 35 | 36 | $e->log(); |
| 36 | 37 | } |
| 37 | 38 | } |
@@ -44,7 +45,8 @@ discard block |
||
| 44 | 45 | $contact_widget = org_openpsa_widgets_contact::get($salesproject->customerContact); |
| 45 | 46 | $row['index_customerContact'] = $customer->get_label(); |
| 46 | 47 | $row['customerContact'] = $contact_widget->show_inline(); |
| 47 | - } catch (midcom_error $e) { |
|
| 48 | + } |
|
| 49 | + catch (midcom_error $e) { |
|
| 48 | 50 | $e->log(); |
| 49 | 51 | } |
| 50 | 52 | } |
@@ -56,7 +58,8 @@ discard block |
||
| 56 | 58 | $owner_widget = org_openpsa_widgets_contact::get($salesproject->owner); |
| 57 | 59 | $row['index_owner'] = $owner->rname; |
| 58 | 60 | $row['owner'] = $owner_widget->show_inline(); |
| 59 | - } catch (midcom_error $e) { |
|
| 61 | + } |
|
| 62 | + catch (midcom_error $e) { |
|
| 60 | 63 | $row['index_owner'] = ''; |
| 61 | 64 | $row['owner'] = ''; |
| 62 | 65 | } |
@@ -102,7 +102,8 @@ discard block |
||
| 102 | 102 | foreach ($hours as $guid => $row) { |
| 103 | 103 | try { |
| 104 | 104 | $task = org_openpsa_projects_task_dba::get_cached($row['task']); |
| 105 | - } catch (midcom_error $e) { |
|
| 105 | + } |
|
| 106 | + catch (midcom_error $e) { |
|
| 106 | 107 | // Task couldn't be loaded, probably because of ACL |
| 107 | 108 | continue; |
| 108 | 109 | } |
@@ -115,7 +116,8 @@ discard block |
||
| 115 | 116 | $person_object = midcom_db_person::get_cached($row['person']); |
| 116 | 117 | $person_label = $this->_get_list_link($person_object->name, null, null, $row['person']); |
| 117 | 118 | $person_name = $person_object->name; |
| 118 | - } catch (midcom_error $e) { |
|
| 119 | + } |
|
| 120 | + catch (midcom_error $e) { |
|
| 119 | 121 | $person_label = $this->_l10n->get('no person'); |
| 120 | 122 | $person_name = ''; |
| 121 | 123 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | { |
| 72 | 72 | $this->calculate_price(false); |
| 73 | 73 | |
| 74 | - if ( $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
| 74 | + if ($this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
| 75 | 75 | && $this->continuous) { |
| 76 | 76 | $this->end = 0; |
| 77 | 77 | } elseif ($this->end < $this->start) { |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $calculator->run($this); |
| 139 | 139 | $cost = $calculator->get_cost(); |
| 140 | 140 | $price = $calculator->get_price(); |
| 141 | - if ( $price != $this->price |
|
| 141 | + if ($price != $this->price |
|
| 142 | 142 | || $cost != $this->cost) { |
| 143 | 143 | $this->price = $price; |
| 144 | 144 | $this->cost = $cost; |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $units = $hours['invoiceable']; |
| 179 | 179 | $uninvoiceableUnits = $hours['reported'] - ($hours['invoiceable'] + $hours['invoiced']); |
| 180 | 180 | |
| 181 | - if ( $units != $this->units |
|
| 181 | + if ($units != $this->units |
|
| 182 | 182 | || $uninvoiceableUnits != $this->uninvoiceableUnits) { |
| 183 | 183 | debug_add("agreement values have changed, setting units to " . $units . ", uninvoiceable: " . $uninvoiceableUnits); |
| 184 | 184 | $this->units = $units; |
@@ -229,11 +229,11 @@ discard block |
||
| 229 | 229 | break; |
| 230 | 230 | case 'q': |
| 231 | 231 | // Quarterly recurring subscription |
| 232 | - $identifier = ceil(((int)$date->format('n')) / 4) . 'Q' . $date->format('y'); |
|
| 232 | + $identifier = ceil(((int) $date->format('n')) / 4) . 'Q' . $date->format('y'); |
|
| 233 | 233 | break; |
| 234 | 234 | case 'hy': |
| 235 | 235 | // Half-yearly recurring subscription |
| 236 | - $identifier = ceil(((int)$date->format('n')) / 6) . '/' . $date->format('Y'); |
|
| 236 | + $identifier = ceil(((int) $date->format('n')) / 6) . '/' . $date->format('Y'); |
|
| 237 | 237 | break; |
| 238 | 238 | case 'y': |
| 239 | 239 | // Yearly recurring subscription |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | |
| 262 | 262 | public function invoice() : bool |
| 263 | 263 | { |
| 264 | - if ( $this->state >= self::STATE_INVOICED |
|
| 264 | + if ($this->state >= self::STATE_INVOICED |
|
| 265 | 265 | || $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) { |
| 266 | 266 | return false; |
| 267 | 267 | } |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | midcom::get()->uimessages->add(midcom::get()->i18n->get_string('org.openpsa.sales', 'org.openpsa.sales'), sprintf(midcom::get()->i18n->get_string('marked deliverable "%s" delivered', 'org.openpsa.sales'), $this->title)); |
| 365 | 365 | |
| 366 | 366 | // Check if we need to create task or ship goods |
| 367 | - if ( $update_deliveries |
|
| 367 | + if ($update_deliveries |
|
| 368 | 368 | && $product->orgOpenpsaObtype === org_openpsa_products_product_dba::TYPE_SERVICE) { |
| 369 | 369 | // Change status of tasks connected to the deliverable |
| 370 | 370 | $qb = org_openpsa_projects_task_dba::new_query_builder(); |