X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=6804b549b5dab24e0004c553edd11dcf7fe4bcf6;hb=b1c79afd0a78ec37ff813f1305e9e0804be78ef3;hp=d4f3839d94ab0d50fa936c3e2626b1ebfde837c8;hpb=217f175953339fd10cd5aee5942cc263a4092323;p=fa-stable.git

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index d4f3839d..6804b549 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -10,10 +10,9 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 
 include_once($path_to_root . "/admin/db/company_db.inc");
-
 //-------------------------------------------------------------------------------------------------
 
-if (isset($_POST['submit']) && $_POST['submit'] != "")
+if (isset($_POST['update']) && $_POST['update'] != "")
 {
 
 	$input_error = 0;
@@ -22,6 +21,52 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
 	{
 		$input_error = 1;
 		display_error(_("The company name must be entered."));
+		set_focus('coy_name');
+	}
+	if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
+	{
+		$user_comp = user_company();
+		$result = $_FILES['pic']['error'];
+		$filename = $comp_path . "/$user_comp/images";
+		if (!file_exists($filename))
+		{
+			mkdir($filename);
+		}
+		$filename .= "/".$_FILES['pic']['name'];
+
+		 //But check for the worst
+		if (strtoupper(substr(trim($_FILES['pic']['name']), strlen($_FILES['pic']['name']) - 3)) != 'JPG')
+		{
+			display_notification(_('Only jpg files are supported - a file extension of .jpg is expected'));
+			$input_error = 1;
+		}
+		elseif ( $_FILES['pic']['size'] > ($max_image_size * 1024))
+		{ //File Size Check
+			display_notification(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $max_image_size);
+			$input_error = 1;
+		}
+		elseif ( $_FILES['pic']['type'] == "text/plain" )
+		{  //File type Check
+			display_notification( _('Only graphics files can be uploaded'));
+			$input_error = 1;
+		}
+		elseif (file_exists($filename))
+		{
+			$result = unlink($filename);
+			if (!$result)
+			{
+				display_error(_('The existing image could not be removed'));
+				$input_error = 1;
+			}
+		}
+
+		if ($input_error != 1)
+		{
+			$result  =  move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
+			$_POST['coy_logo'] = $_FILES['pic']['name'];
+			if(!$result) 
+				display_error(_('Error uploading logo file'));
+		}
 	}
 	if ($input_error != 1)
 	{
@@ -30,17 +75,18 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
 			$_POST['use_dimension'], $_POST['custom1_name'], $_POST['custom2_name'], $_POST['custom3_name'],
 			$_POST['custom1_value'], $_POST['custom2_value'], $_POST['custom3_value'],
 			$_POST['curr_default'], $_POST['f_year'], check_value('no_item_list'), check_value('no_customer_list'),
-			check_value('no_supplier_list'));
+			check_value('no_supplier_list'), $_POST['base_sales']);
 
 		display_notification_centered(_("Company setup has been updated."));
 	}
-
+	set_focus('coy_name');
+	$Ajax->activate('_page_body');
 } /* end of if submit */
 
 //---------------------------------------------------------------------------------------------
 
 
-start_form();
+start_form(true);
 
 $myrow = get_company_prefs();
 
@@ -56,6 +102,7 @@ $_POST['email']  = $myrow["email"];
 $_POST['coy_logo']  = $myrow["coy_logo"];
 $_POST['domicile']  = $myrow["domicile"];
 $_POST['use_dimension']  = $myrow["use_dimension"];
+$_POST['base_sales']  = $myrow["base_sales"];
 $_POST['no_item_list']  = $myrow["no_item_list"];
 $_POST['no_customer_list']  = $myrow["no_customer_list"];
 $_POST['no_supplier_list']  = $myrow["no_supplier_list"];
@@ -74,8 +121,8 @@ text_row_ex(_("Name (to appear on reports):"), 'coy_name', 42, 50);
 text_row_ex(_("Official Company Number:"), 'coy_no', 25);
 text_row_ex(_("Tax Authority Reference:"), 'gst_no', 25);
 
-text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, null, null, _('Months.'));
-text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, null, null, _('Months back.'));
+text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.'));
+text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.'));
 
 currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']);
 fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']);
@@ -85,14 +132,18 @@ textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5);
 text_row_ex(_("Telephone Number:"), 'phone', 25, 55);
 text_row_ex(_("Facsimile Number:"), 'fax', 25);
 text_row_ex(_("Email Address:"), 'email', 25, 55);
-text_row_ex(_("Company Logo:"), 'coy_logo', 25, 55);
+label_row(_("Company Logo:"), $_POST['coy_logo']);
+label_row(_("New Company Logo (.jpg)") . ":", "<input type='file' id='pic' name='pic'>");
+
 text_row_ex(_("Domicile:"), 'domicile', 25, 55);
 
 number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2);
+sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POST['base_sales'], false,
+    _('No base price list') );
 
-check_row(_("No Item List"), 'no_item_list', $_POST['no_item_list']);
-check_row(_("No Customer List"), 'no_customer_list', $_POST['no_customer_list']);
-check_row(_("No Supplier List"), 'no_supplier_list', $_POST['no_supplier_list']);
+check_row(_("Search Item List"), 'no_item_list', $_POST['no_item_list']);
+check_row(_("Search Customer List"), 'no_customer_list', $_POST['no_customer_list']);
+check_row(_("Search Supplier List"), 'no_supplier_list', $_POST['no_supplier_list']);
 
 start_row();
 end_row();
@@ -114,8 +165,8 @@ text_cells(null, 'custom3_value', $_POST['custom3_value'], 30, 30);
 end_row();
 
 end_table(1);
-
-submit_center('submit', _("Update"));
+hidden('coy_logo', $_POST['coy_logo']);
+submit_center('update', _("Update"), true, '', true);
 
 end_form(2);
 //-------------------------------------------------------------------------------------------------