// create an array of the taxes and array of rates
$taxes = array();
- $rates = array();
$tax_shippings = array();
while (($id = find_submit('tax_type_id'))!=-1)
{
- $taxes[] = $id;
- $rates[] = get_tax_type_default_rate($id);
- $tax_shippings[] = check_value('tax_shipping'.$id);
+ if (check_value('tax_type_id'.$id) != 0)
+ {
+ $taxes[] = $id;
+ $tax_shippings[] = check_value('tax_shipping'.$id);
+ }
unset($_POST['tax_type_id' . $id]);
unset($_POST['tax_shipping' . $id]);
}
if ($selected_id != -1)
{
- update_tax_group($selected_id, $_POST['name'], $taxes, $rates, $tax_shippings);
+ update_tax_group($selected_id, $_POST['name'], $taxes, $tax_shippings);
display_notification(_('Selected tax group has been updated'));
}
else
{
- add_tax_group($_POST['name'], $taxes, $rates, $tax_shippings);
+ add_tax_group($_POST['name'], $taxes, $tax_shippings);
display_notification(_('New tax group has been added'));
}
inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id');
edit_button_cell("Edit".$myrow["id"], _("Edit"));
delete_button_cell("Delete".$myrow["id"], _("Delete"));
- end_row();;
+ end_row();
}
inactive_control_row($th);
while($item = db_fetch($items))
{
start_row();
- check_cells($item['tax_type_name'], 'tax_type_id' . $item['tax_type_id'],
- $selected_id!=-1 && isset($item['rate']), true, false, "align='center'");
- /*
- $upd = false;
- if (get_post('_tax_type_id' . $item['tax_type_id'].'_update'))
+ if ($selected_id != -1)
{
- $_POST['_tax_type_id' . $item['tax_type_id'].'_update'] = 0;
- $Ajax->activate('_page_body');
- $upd = true;
+ check_cells($item['tax_type_name'], 'tax_type_id' . $item['tax_type_id'],
+ isset($item['rate']), true, false, "align='center'");
+ if (isset($item['rate']))
+ check_cells(null, 'tax_shipping' . $item['tax_type_id'], $item['tax_shipping']);
}
-
- if (($selected_id!=-1 && isset($item['rate']) || $upd))
- */
- if ($selected_id!=-1 && isset($item['rate']))
- check_cells(null, 'tax_shipping' . $item['tax_type_id'], $item['tax_shipping']);
+ else
+ {
+ check_cells($item['tax_type_name'], 'tax_type_id' . $item['tax_type_id'],
+ null, true, false, "align='center'");
+ if (get_post('_tax_type_id' . $item['tax_type_id'].'_update'))
+ {
+ //$_POST['_tax_type_id' . $item['tax_type_id'].'_update'] = 0;
+ $Ajax->activate('_page_body');
+ }
+ if (check_value('tax_type_id' . $item['tax_type_id'])==1)
+ check_cells(null, 'tax_shipping' . $item['tax_type_id'], null);
+ }
end_row();
}
end_page();
-?>