Improved layout in the new tax info display. Also old ones.

[fa-stable.git] / sales / includes / ui / sales_order_ui.inc

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index acf06310dcf5edb66db962180aa5b69f6b4556bf..028ca8b76c4cfcbbe0b08d9c0628c59cca6a7da8 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -220,13 +220,17 @@ function display_order_summary($title, &$order, $editable_items=false)
        $colspan = 6;
        if ($order->trans_no!=0)
                ++$colspan;
-       small_amount_row(_("Shipping Charge"), 'freight_cost', price_format(get_post('freight_cost',0)), "colspan=$colspan align=right");
+       start_row();
+       label_cell(_("Shipping Charge"), "colspan=$colspan align=right");
+       small_amount_cells(null, 'freight_cost', price_format(get_post('freight_cost',0)));
+       label_cell('', 'colspan=2');
+       end_row();
        $display_sub_total = price_format($total + input_num('freight_cost'));
 
-       label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
+       label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2);
 
        $taxes = $order->get_taxes(input_num('freight_cost'));
-       $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included);
+       $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2);
 
        $display_total = price_format(($total + input_num('freight_cost') + $tax_total));