Index: trunk/kernel/units/visits/visits_event_handler.php =================================================================== diff -u -N -r2437 -r2438 --- trunk/kernel/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 2437) +++ trunk/kernel/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 2438) @@ -78,15 +78,16 @@ function prepareObject(&$object, &$event) { $types = $event->getEventParam('types'); - if ($types=='myvisitors' || !$types){ - $object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)'); - $object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM(ord.AffiliateCommission)'); - $object->addCalculatedField('OrderCountByVisit', 'COUNT(OrderId)'); - } - if (method_exists($object, 'AddGroupByField') && !$types){ - $object->AddGroupByField('%1$s.VisitId'); - } - + if(method_exists($object, 'AddGroupByField')){ + if ($types=='myvisitors' || !$types){ + $object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)'); + $object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM(ord.AffiliateCommission)'); + $object->addCalculatedField('OrderCountByVisit', 'COUNT(OrderId)'); + } + if (!$types){ + $object->AddGroupByField('%1$s.VisitId'); + } + } } } Index: trunk/core/units/visits/visits_event_handler.php =================================================================== diff -u -N -r2437 -r2438 --- trunk/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 2437) +++ trunk/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 2438) @@ -78,15 +78,16 @@ function prepareObject(&$object, &$event) { $types = $event->getEventParam('types'); - if ($types=='myvisitors' || !$types){ - $object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)'); - $object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM(ord.AffiliateCommission)'); - $object->addCalculatedField('OrderCountByVisit', 'COUNT(OrderId)'); - } - if (method_exists($object, 'AddGroupByField') && !$types){ - $object->AddGroupByField('%1$s.VisitId'); - } - + if(method_exists($object, 'AddGroupByField')){ + if ($types=='myvisitors' || !$types){ + $object->addCalculatedField('OrderTotalAmountSum', 'SUM(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)'); + $object->addCalculatedField('OrderAffiliateCommissionSum', 'SUM(ord.AffiliateCommission)'); + $object->addCalculatedField('OrderCountByVisit', 'COUNT(OrderId)'); + } + if (!$types){ + $object->AddGroupByField('%1$s.VisitId'); + } + } } } Index: trunk/core/units/visits/visits_config.php =================================================================== diff -u -N -r2434 -r2438 --- trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 2434) +++ trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 2438) @@ -31,6 +31,8 @@ 'OrderTotalAmount' => '(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)', 'OrderAffiliateCommission' => 'ord.AffiliateCommission', 'OrderNumber' => 'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )', + 'OrderId' => 'ord.OrderId', + ), ), Index: trunk/kernel/units/visits/visits_config.php =================================================================== diff -u -N -r2434 -r2438 --- trunk/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 2434) +++ trunk/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 2438) @@ -31,6 +31,8 @@ 'OrderTotalAmount' => '(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)', 'OrderAffiliateCommission' => 'ord.AffiliateCommission', 'OrderNumber' => 'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )', + 'OrderId' => 'ord.OrderId', + ), ), Index: trunk/kernel/units/visits/visits_tag_processor.php =================================================================== diff -u -N -r2434 -r2438 --- trunk/kernel/units/visits/visits_tag_processor.php (.../visits_tag_processor.php) (revision 2434) +++ trunk/kernel/units/visits/visits_tag_processor.php (.../visits_tag_processor.php) (revision 2438) @@ -106,7 +106,14 @@ return $o; } - + /* + function OrderLink($params){ + $object = &$this->Application->recallObject($this->getPrefixSpecial()); + $params['ord_id'] = $object->GetDBField('OrderId'); + $main_processor =& $this->Application->recallObject('m_TagProcessor'); + return $main_processor->T($params); + } + */ } ?> \ No newline at end of file Index: trunk/core/units/visits/visits_tag_processor.php =================================================================== diff -u -N -r2434 -r2438 --- trunk/core/units/visits/visits_tag_processor.php (.../visits_tag_processor.php) (revision 2434) +++ trunk/core/units/visits/visits_tag_processor.php (.../visits_tag_processor.php) (revision 2438) @@ -106,7 +106,14 @@ return $o; } - + /* + function OrderLink($params){ + $object = &$this->Application->recallObject($this->getPrefixSpecial()); + $params['ord_id'] = $object->GetDBField('OrderId'); + $main_processor =& $this->Application->recallObject('m_TagProcessor'); + return $main_processor->T($params); + } + */ } ?> \ No newline at end of file