Index: branches/5.2.x/units/orders/orders_config.php =================================================================== diff -u -N -r14815 -r14821 --- branches/5.2.x/units/orders/orders_config.php (.../orders_config.php) (revision 14815) +++ branches/5.2.x/units/orders/orders_config.php (.../orders_config.php) (revision 14821) @@ -1,6 +1,6 @@ 'af.PortalUserId', 'GiftCertificateCode' => 'gc.Code', 'GiftCertificateRecipient' => 'gc.Recipient', + 'ShippingSubTotal' => '%1$s.ShippingCost + %1$s.InsuranceFee', ), 'myorders' => Array ( @@ -262,6 +263,7 @@ 'AmountWithoutVAT' => '(SubTotal+IF(ShippingTaxable=1, ShippingCost, 0)+IF(ProcessingTaxable=1, ProcessingFee, 0))', 'TotalAmount' => 'SubTotal+ShippingCost+VAT+ProcessingFee+InsuranceFee-GiftCertificateDiscount', /*'ItemsCount' => 'COUNT(%1$s.OrderId)',*/ + 'ShippingSubTotal' => '%1$s.ShippingCost + %1$s.InsuranceFee', ), ), // %1$s - table name of object @@ -466,6 +468,7 @@ 'AmountWithoutVAT' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'), 'SubtotalWithDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'), 'SubtotalWithoutDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'), + 'ShippingSubTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'), 'OrderNumber' => Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'), 'CouponCode' => Array ('type' => 'string', 'default' => ''), 'CouponName' => Array ('type' => 'string', 'default' => ''),