mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-20 07:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve tax category maintenance.

Browse Source
This commit is contained in:
Steve Ireland committed 2017-07-15 16:42:27 -04:00
1 parent 623572b0f5
commit eccf08cf8f
5 files changed
+47 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

application/controllers/Config.php
+23 -2
View File
@@ -637,6 +637,7 @@ class Config extends Secure_Controller
);
$success = $this->Appconfig->batch_save($batch_save_data) ? TRUE : FALSE;
$delete_rejected = FALSE;
if($customer_sales_tax_support)
{
@@ -674,7 +675,16 @@ class Config extends Secure_Controller
{
if(!in_array($category['tax_category_id'], $not_to_delete))
{
$this->Tax->delete_tax_category($category['tax_category_id']);
$usg1 = $this->Tax->get_tax_category_usage($category['tax_category_id']);
$usg2 = $this->Item->get_tax_category_usage($category['tax_category_id']);
if(($usg1 + $usg2) == 0)
{
$this->Tax->delete_tax_category($category['tax_category_id']);
}
else
{
$delete_rejected = TRUE;
}
}
}
}
@@ -683,9 +693,20 @@ class Config extends Secure_Controller
$success &= $this->db->trans_status();
$message = "";
if($success && $delete_rejected)
{
$message = $this->lang->line('config_tax_category_used');
$success = false;
}
else
{
$message = $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully');
}
echo json_encode(array(
'success' => $success,
'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
'message' => $message
));
}