- $display_total = price_format($total);
- label_row(_("Total Excluding Shipping"), $display_total, "colspan=6 align=right",
- "nowrap align=right", 2);
+ $colspan = 6;
+ if ($order->trans_no!=0)
+ ++$colspan;
+ start_row();
+
+ label_cell(_("Shipping method:") . shipping_methods_list('ship_via', null, _("None"), true), "colspan=$colspan align=right");
+
+ if (get_post('ship_via') !== ALL_TEXT)
+ {
+ small_amount_cells(null, 'freight_cost', price_format(get_post('freight_cost',0)));
+ label_cell('', 'colspan=2');
+ } else
+ label_cell('', 'colspan=3');
+ 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", 2);
+ $taxes = $order->get_taxes(input_num('freight_cost'));
+ $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2);
+
+ $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
+
+ start_row();
+ label_cells(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
+ submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true);
+ end_row();