Index: trunk/core/units/visits/visits_config.php =================================================================== diff -u -N -r2417 -r2434 --- trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 2417) +++ trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 2434) @@ -30,6 +30,7 @@ 'AffiliatePortalUserId' => 'af.PortalUserId', 'OrderTotalAmount' => '(ord.SubTotal+ord.ShippingCost+ord.VAT-ord.CouponDiscount)', 'OrderAffiliateCommission' => 'ord.AffiliateCommission', + 'OrderNumber' => 'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )', ), ), @@ -38,8 +39,8 @@ LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId - LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId - '), + LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId' + ), 'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s @@ -70,7 +71,9 @@ 'AffiliateUser' => Array('type'=>'string'), 'AffiliatePortalUserId' => Array('type'=>'int'), 'OrderTotalAmount' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), + 'OrderTotalAmountSum' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), 'OrderAffiliateCommission' => Array('type' => 'numeric', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'), + 'OrderAffiliateCommissionSum' => Array('type' => 'numeric', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'), ), 'Grids' => Array( @@ -82,8 +85,8 @@ 'Referer' => Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ), 'UserName' => Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'), 'AffiliateUser' => Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'), - 'OrderTotalAmount' => Array( 'title' => 'la_col_OrderTotal'), - 'OrderAffiliateCommission' => Array( 'title' => 'la_col_Commission'), + 'OrderTotalAmountSum' => Array( 'title' => 'la_col_OrderTotal'), + 'OrderAffiliateCommissionSum' => Array( 'title' => 'la_col_Commission'), ), ), ),