Index: branches/5.2.x/units/products/products_event_handler.php =================================================================== diff -u -N -r16197 -r16516 --- branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 16197) +++ branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $product_approve_events = Array ( 2 => 'p:OnSubscriptionApprove', @@ -107,8 +107,8 @@ */ function InventoryAction($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); $object->SetFieldsFromHash($field_values); @@ -327,8 +327,8 @@ { parent::OnBeforeDeleteFromLive($event); + /** @var kCatDBItem $product */ $product = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true)); - /* @var $product kCatDBItem */ $product->SwitchToLive(); $id = $event->getEventParam('id'); @@ -338,8 +338,8 @@ return ; } + /** @var kCatDBItem $temp */ $temp = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true)); - /* @var $temp kCatDBItem */ $temp->SwitchToTemp(); $temp->Load($id); @@ -394,8 +394,8 @@ { parent::onPreCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $object->SetDBField('Type', $this->Application->GetVar($event->getPrefixSpecial(true) . '_new_type')); } @@ -414,8 +414,8 @@ $event->CallSubEvent('OnPreSave'); $this->LoadItem($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $from_type = $object->GetDBField('Type'); if ( $event->status == kEvent::erSUCCESS ) { @@ -510,8 +510,8 @@ $except_types = $event->getEventParam('except'); $except_types = $except_types ? explode(',', $except_types) : Array (); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $type_clauses = parent::getTypeClauses($event); @@ -647,8 +647,8 @@ $object->removeFilter('category_filter'); $object->AddGroupByField('%1$s.ProductId'); + /** @var ProductsItem $object_product */ $object_product = $this->Application->recallObject($event->Prefix); - /* @var $object_product ProductsItem */ $content_ids_array = $object_product->GetPackageContentIds(); @@ -691,8 +691,8 @@ $event->SetRedirectParam('pass', 'all,p'); $event->redirect = $this->Application->GetVar('success_template'); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $user_id = $this->Application->RecallVar('user_id'); @@ -762,7 +762,7 @@ { // used for error reporting only -> rewrite code + theme (by Alex) $object = $this->Application->recallObject('u', null, Array('skip_autoload' => true)); // TODO: change theme too - /* @var $object kDBItem */ + /** @var kDBItem $object */ $friend_email = $this->Application->GetVar('friend_email'); $friend_name = $this->Application->GetVar('friend_name'); @@ -871,8 +871,8 @@ */ function OnDeleteListingType($event) { + /** @var kDBItem $listing_type */ $listing_type = $event->MasterEvent->getObject(); - /* @var $listing_type kDBItem */ $product_id = $listing_type->GetDBField('VirtualProductId'); @@ -957,8 +957,8 @@ $item_data = unserialize($field_values['ItemData']); $package_content_ids = $item_data['PackageContent']; + /** @var ProductsItem $object_item */ $object_item = $this->Application->recallObject('p.packageitem', null, array ('skip_autoload' => true)); - /* @var $object_item ProductsItem */ foreach ($package_content_ids as $package_item_id) { $object_field_values = array (); @@ -1037,8 +1037,8 @@ */ function _updateProductPrice($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $price = $object->GetDBField('Price'); @@ -1074,8 +1074,8 @@ */ function setPrimaryPrice($product_id, $price, $additional_fields = Array()) { + /** @var kDBItem $pr_object */ $pr_object = $this->Application->recallObject('pr.-item', null, Array('skip_autoload' => true) ); - /* @var $pr_object kDBItem */ $pr_object->Load( Array('ProductId' => $product_id, 'IsPrimary' => 1) ); @@ -1143,8 +1143,8 @@ { parent::OnAfterItemLoad($event); + /** @var ProductsItem $object */ $object = $event->getObject(); - /* @var $object ProductsItem */ $a_pricing = $object->getPrimaryPricing(); if ( !$a_pricing ) { @@ -1200,8 +1200,8 @@ // update current package content with selected products + /** @var ProductsItem $object */ $object = $event->getObject(); - /* @var $object ProductsItem */ $product_ids = $selected_ids['p'] ? explode(',', $selected_ids['p']) : Array(); @@ -1230,8 +1230,8 @@ { //$this->Application->SetVar('p_mode', 't'); + /** @var ProductsItem $object */ $object = $event->getObject(); - /* @var $object ProductsItem */ $content_ids = $object->GetPackageContentIds(); @@ -1331,8 +1331,8 @@ { parent::OnBeforeItemDelete($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $sql = 'SELECT COUNT(*) FROM ' . TABLE_PREFIX . 'Products @@ -1372,16 +1372,16 @@ { parent::setCustomExportColumns($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->setPrimaryPrice($object->GetID(), (double)$object->GetDBField('Price'), Array ('Cost' => (double)$object->GetDBField('Cost'))); } function OnPreSaveAndOpenPopup($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->RemoveRequiredFields($object); $event->CallSubEvent('OnPreSave'); @@ -1418,8 +1418,8 @@ if ( $this->Application->isAdminUser ) { // we may get product id out of OrderItem, if it exists + /** @var OrdersItem $ord_item */ $ord_item = $this->Application->recallObject('orditems', null, Array ('raise_warnings' => 0)); - /* @var $ord_item OrdersItem */ if ( $ord_item->GetDBField('ProductId') ) { $passed = $ord_item->GetDBField('ProductId');