- 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');
+
+ 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');