@@ -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(); |
@@ -35,11 +35,11 @@ discard block |
||
| 35 | 35 | $resolver |
| 36 | 36 | ->setRequired('schema') |
| 37 | 37 | ->setAllowedTypes('schema', [schema::class, 'string']) |
| 38 | - ->setDefault('action', function (Options $options, $value) { |
|
| 38 | + ->setDefault('action', function(Options $options, $value) { |
|
| 39 | 39 | return $options['schema']->get('action'); |
| 40 | 40 | }); |
| 41 | 41 | |
| 42 | - $resolver->setNormalizer('csrf_protection', function (Options $options, $value) { |
|
| 42 | + $resolver->setNormalizer('csrf_protection', function(Options $options, $value) { |
|
| 43 | 43 | foreach ($options['schema']->get('fields') as $config) { |
| 44 | 44 | if ($config['widget'] === 'csrf') { |
| 45 | 45 | return true; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | return false; |
| 49 | 49 | }); |
| 50 | - $resolver->setNormalizer('constraints', function (Options $options, $value) { |
|
| 50 | + $resolver->setNormalizer('constraints', function(Options $options, $value) { |
|
| 51 | 51 | $validation = $options['schema']->get('validation'); |
| 52 | 52 | if (!empty($validation)) { |
| 53 | 53 | $cb_wrapper = new cb_wrapper($validation); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | } |
| 56 | 56 | return $value; |
| 57 | 57 | }); |
| 58 | - $resolver->setNormalizer('schema', function (Options $options, $value) { |
|
| 58 | + $resolver->setNormalizer('schema', function(Options $options, $value) { |
|
| 59 | 59 | if (is_string($value)) { |
| 60 | 60 | $schemadb = schemadb::from_path($value); |
| 61 | 61 | return $schemadb->get_first(); |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | // this is mainly there to skip validation in case the user pressed cancel |
| 81 | 81 | $builder->addEventListener(FormEvents::POST_SUBMIT, function(PostSubmitEvent $event) { |
| 82 | 82 | $form = $event->getForm(); |
| 83 | - if ( $form instanceof Form |
|
| 83 | + if ($form instanceof Form |
|
| 84 | 84 | && $form->getClickedButton() |
| 85 | 85 | && $form->getClickedButton()->getConfig()->getOption('operation') == controller::CANCEL) { |
| 86 | 86 | $event->stopPropagation(); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | 'max_count' => 0 |
| 39 | 39 | ] |
| 40 | 40 | ]); |
| 41 | - $resolver->setNormalizer('constraints', function (Options $options, $value) { |
|
| 41 | + $resolver->setNormalizer('constraints', function(Options $options, $value) { |
|
| 42 | 42 | $validation = []; |
| 43 | 43 | if ($options['type_config']['max_count'] > 0) { |
| 44 | 44 | $validation['max'] = $options['type_config']['max_count']; |
@@ -51,12 +51,12 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | return $validation; |
| 53 | 53 | }); |
| 54 | - $resolver->setNormalizer('entry_options', function (Options $options, $value) { |
|
| 54 | + $resolver->setNormalizer('entry_options', function(Options $options, $value) { |
|
| 55 | 55 | return array_replace([ |
| 56 | 56 | 'widget_config' => $options['widget_config'] |
| 57 | 57 | ], (array) $value); |
| 58 | 58 | }); |
| 59 | - $resolver->setNormalizer('widget_config', function (Options $options, $value) { |
|
| 59 | + $resolver->setNormalizer('widget_config', function(Options $options, $value) { |
|
| 60 | 60 | if (!array_key_exists('sortable', $value)) { |
| 61 | 61 | $value['sortable'] = false; |
| 62 | 62 | } |
@@ -23,9 +23,9 @@ |
||
| 23 | 23 | $schemadb = schemadb::from_path($this->_config->get('schemadb_acl')); |
| 24 | 24 | |
| 25 | 25 | // Get the calendar root event |
| 26 | - if ( class_exists('org_openpsa_calendar_interface') |
|
| 26 | + if (class_exists('org_openpsa_calendar_interface') |
|
| 27 | 27 | && $root_event = org_openpsa_calendar_interface::find_root_event()) { |
| 28 | - $field =& $schemadb->get('default')->get_field('calendar'); |
|
| 28 | + $field = & $schemadb->get('default')->get_field('calendar'); |
|
| 29 | 29 | $field['type_config']['privilege_object'] = $root_event; |
| 30 | 30 | $field['type_config']['assignee'] = 'user:' . $person->guid; |
| 31 | 31 | } |