X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=4f1f548c3df2935a6fcd7797af3188c35ffa3382;hb=634019327c53a3e1082c90f4fcece9a97429a039;hp=ba02c6adbb9ccb1588b2b2d666ffd4c1f62e6a8b;hpb=431e69ba0fb3c1812e56df8cfa4a02e6d767ee93;p=fa-stable.git
diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index ba02c6ad..4f1f548c 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security =10;
$path_to_root="..";
include($path_to_root . "/includes/session.inc");
@@ -10,10 +19,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;
@@ -36,24 +44,24 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
$filename .= "/".$_FILES['pic']['name'];
//But check for the worst
- if (strtoupper(substr(trim($_FILES['pic']['name']), strlen($_FILES['pic']['name']) - 3)) != 'JPG')
+ if (!in_array((substr(trim($_FILES['pic']['name']),-3)),
+ array('jpg','JPG','png','PNG')))
{
- display_notification(_('Only jpg files are supported - a file extension of .jpg is expected'));
+ display_error(_('Only jpg and png files are supported - a file extension of .jpg or .png 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);
+ display_error(_('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'));
+ display_error( _('Only graphics files can be uploaded'));
$input_error = 1;
}
elseif (file_exists($filename))
{
- display_notification(_('Attempting to overwrite an existing item image'));
$result = unlink($filename);
if (!$result)
{
@@ -66,11 +74,26 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
{
$result = move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
$_POST['coy_logo'] = $_FILES['pic']['name'];
- $message = ($result)?_('File url') ."$filename" : "Somthing is wrong with uploading a file.";
+ if(!$result)
+ display_error(_('Error uploading logo file'));
+ }
+ }
+ if (check_value('del_coy_logo'))
+ {
+ $user_comp = user_company();
+ $filename = $comp_path . "/$user_comp/images/".$_POST['coy_logo'];
+ if (file_exists($filename))
+ {
+ $result = unlink($filename);
+ if (!$result)
+ {
+ display_error(_('The existing image could not be removed'));
+ $input_error = 1;
+ }
+ else
+ $_POST['coy_logo'] = "";
}
- /* EOF Add Image upload for New Item - by Ori */
}
-
if ($input_error != 1)
{
update_company_setup($_POST['coy_name'], $_POST['coy_no'], $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'],
@@ -90,54 +113,61 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
start_form(true);
-
-$myrow = get_company_prefs();
-
-$_POST['coy_name'] = $myrow["coy_name"];
-$_POST['gst_no'] = $myrow["gst_no"];
-$_POST['tax_prd'] = $myrow["tax_prd"];
-$_POST['tax_last'] = $myrow["tax_last"];
-$_POST['coy_no'] = $myrow["coy_no"];
-$_POST['postal_address'] = $myrow["postal_address"];
-$_POST['phone'] = $myrow["phone"];
-$_POST['fax'] = $myrow["fax"];
-$_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"];
-$_POST['custom1_name'] = $myrow["custom1_name"];
-$_POST['custom2_name'] = $myrow["custom2_name"];
-$_POST['custom3_name'] = $myrow["custom3_name"];
-$_POST['custom1_value'] = $myrow["custom1_value"];
-$_POST['custom2_value'] = $myrow["custom2_value"];
-$_POST['custom3_value'] = $myrow["custom3_value"];
-$_POST['curr_default'] = $myrow["curr_default"];
-$_POST['f_year'] = $myrow["f_year"];
-
-start_table($table_style2);
+if (!isset($_POST['coy_name'])) {
+ $myrow = get_company_prefs();
+
+ $_POST['coy_name'] = $myrow["coy_name"];
+ $_POST['gst_no'] = $myrow["gst_no"];
+ $_POST['tax_prd'] = $myrow["tax_prd"];
+ $_POST['tax_last'] = $myrow["tax_last"];
+ $_POST['coy_no'] = $myrow["coy_no"];
+ $_POST['postal_address'] = $myrow["postal_address"];
+ $_POST['phone'] = $myrow["phone"];
+ $_POST['fax'] = $myrow["fax"];
+ $_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"];
+ $_POST['custom1_name'] = $myrow["custom1_name"];
+ $_POST['custom2_name'] = $myrow["custom2_name"];
+ $_POST['custom3_name'] = $myrow["custom3_name"];
+ $_POST['custom1_value'] = $myrow["custom1_value"];
+ $_POST['custom2_value'] = $myrow["custom2_value"];
+ $_POST['custom3_value'] = $myrow["custom3_value"];
+ $_POST['curr_default'] = $myrow["curr_default"];
+ $_POST['f_year'] = $myrow["f_year"];
+}
+$_POST['del_coy_logo'] = 0;
+
+start_outer_table($table_style2);
+
+table_section(1);
text_row_ex(_("Name (to appear on reports):"), 'coy_name', 42, 50);
+textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5);
+
+text_row_ex(_("Phone Number:"), 'phone', 25, 55);
+text_row_ex(_("Fax Number:"), 'fax', 25);
+email_row_ex(_("Email Address:"), 'email', 25, 55);
+
text_row_ex(_("Official Company Number:"), 'coy_no', 25);
-text_row_ex(_("Tax Authority Reference:"), 'gst_no', 25);
+text_row_ex(_("GSTNo:"), '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.'));
currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']);
-fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']);
-textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5);
+table_section(2);
-text_row_ex(_("Telephone Number:"), 'phone', 25, 55);
-text_row_ex(_("Facsimile Number:"), 'fax', 25);
-text_row_ex(_("Email Address:"), 'email', 25, 55);
+fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']);
label_row(_("Company Logo:"), $_POST['coy_logo']);
label_row(_("New Company Logo (.jpg)") . ":", "");
-
+check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']);
text_row_ex(_("Domicile:"), 'domicile', 25, 55);
number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2);
@@ -167,9 +197,10 @@ text_cells(null, 'custom3_name', $_POST['custom3_name'], 25, 25);
text_cells(null, 'custom3_value', $_POST['custom3_value'], 30, 30);
end_row();
-end_table(1);
+end_outer_table(1);
+
hidden('coy_logo', $_POST['coy_logo']);
-submit_center('submit', _("Update"), true, '', false);
+submit_center('update', _("Update"), true, '', true);
end_form(2);
//-------------------------------------------------------------------------------------------------