X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomers.php;h=ffdfb6da464b6de911eb2f92a27027e52e6fc33d;hb=7284bb420bdad4306e195fa06ca971bd66333d20;hp=133505304e1b962ae7ee23b283e6044d020e5d98;hpb=7b295ebee702b5b957362997d26106e482253da5;p=fa-stable.git
diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 13350530..ffdfb6da 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,8 +12,15 @@
$page_security = 'SA_CUSTOMER';
$path_to_root = "../..";
+include_once($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
-page(_($help_context = "Customers"), @$_REQUEST['popup']);
+$js = "";
+if ($SysPrefs->use_popup_windows)
+ $js .= get_js_open_window(900, 500);
+if (user_use_date_picker())
+ $js .= get_js_date_picker();
+
+page(_($help_context = "Customers"), false, false, "", $js);
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/banking.inc");
@@ -51,13 +58,6 @@ function can_process()
return false;
}
- if (!check_num('pymt_discount', 0, 100))
- {
- display_error(_("The payment discount must be numeric and is expected to be less than 100% and greater than or equal to 0."));
- set_focus('pymt_discount');
- return false;
- }
-
if (!check_num('discount', 0, 100))
{
display_error(_("The discount percentage must be numeric and is expected to be less than 100% and greater than or equal to 0."));
@@ -72,37 +72,34 @@ function can_process()
function handle_submit(&$selected_id)
{
- global $path_to_root, $Ajax;
+ global $path_to_root, $Ajax, $SysPrefs;
if (!can_process())
return;
- if ($selected_id)
- {
- update_customer($_POST['customer_id'], $_POST['CustName'], $_POST['cust_ref'], $_POST['address'],
- $_POST['tax_id'], $_POST['curr_code'], $_POST['dimension_id'], $_POST['dimension2_id'],
- $_POST['credit_status'], $_POST['payment_terms'], input_num('discount') / 100, input_num('pymt_discount') / 100,
- input_num('credit_limit'), $_POST['sales_type'], $_POST['notes']);
- update_record_status($_POST['customer_id'], $_POST['inactive'],
- 'debtors_master', 'debtor_no');
+ $_POST['customer_id'] = write_customer(get_post('customer_id'), get_post('CustName'), get_post('cust_ref'), get_post('address'),
+ get_post('tax_id'), get_post('curr_code'), get_post('dimension_id'), get_post('dimension2_id'),
+ get_post('credit_status'), get_post('payment_terms'), input_num('discount'),
+ input_num('credit_limit'), get_post('sales_type'), get_post('notes'), @$_POST['inactive'], get_post('salesman'),
+ get_post('area'), get_post('tax_group_id'), get_post('location'), get_post('ship_via'),
+ get_post('bank_account'), get_post('phone'), get_post('phone2'), get_post('fax'), get_post('email'));
+ if ($selected_id)
+ {
$Ajax->activate('customer_id'); // in case of status change
display_notification(_("Customer has been updated."));
}
else
{ //it is a new customer
- begin_transaction();
- add_customer($_POST['CustName'], $_POST['cust_ref'], $_POST['address'],
- $_POST['tax_id'], $_POST['curr_code'], $_POST['dimension_id'], $_POST['dimension2_id'],
- $_POST['credit_status'], $_POST['payment_terms'], input_num('discount') / 100, input_num('pymt_discount') / 100,
- input_num('credit_limit'), $_POST['sales_type'], $_POST['notes']);
-
- $selected_id = $_POST['customer_id'] = db_insert_id();
- commit_transaction();
+ $selected_id = get_post('customer_id');
display_notification(_("A new customer has been added."));
+
+ if (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
+ display_notification(_("A default Branch has been automatically created, please check default Branch values by using link below."));
+
$Ajax->activate('_page_body');
}
}
@@ -121,21 +118,21 @@ if (isset($_POST['delete']))
// PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans'
- if (key_in_foreign_table($selected_id, 'debtor_trans', 'debtor_no', true))
+ if (key_in_foreign_table($selected_id, 'debtor_trans', 'debtor_no'))
{
$cancel_delete = 1;
display_error(_("This customer cannot be deleted because there are transactions that refer to it."));
}
else
{
- if (key_in_foreign_table($selected_id, 'sales_orders', 'debtor_no', true))
+ if (key_in_foreign_table($selected_id, 'sales_orders', 'debtor_no'))
{
$cancel_delete = 1;
display_error(_("Cannot delete the customer record because orders have been created against it."));
}
else
{
- if (key_in_foreign_table($selected_id, 'cust_branch', 'debtor_no', true))
+ if (key_in_foreign_table($selected_id, 'cust_branch', 'debtor_no'))
{
$cancel_delete = 1;
display_error(_("Cannot delete this customer because there are branch records set up against it."));
@@ -158,20 +155,22 @@ if (isset($_POST['delete']))
function customer_settings($selected_id)
{
- global $SysPrefs, $path_to_root;
+ global $SysPrefs, $path_to_root, $page_nested;
if (!$selected_id)
{
- $_POST['CustName'] = $_POST['cust_ref'] = $_POST['address'] = $_POST['tax_id'] = '';
- $_POST['dimension_id'] = 0;
- $_POST['dimension2_id'] = 0;
- $_POST['sales_type'] = -1;
- $_POST['curr_code'] = get_company_currency();
- $_POST['credit_status'] = -1;
- $_POST['payment_terms'] = $_POST['notes'] = '';
-
- $_POST['discount'] = $_POST['pymt_discount'] = percent_format(0);
- $_POST['credit_limit'] = price_format($SysPrefs->default_credit_limit());
+ if (list_updated('customer_id') || !isset($_POST['CustName'])) {
+ $_POST['CustName'] = $_POST['cust_ref'] = $_POST['address'] = $_POST['tax_id'] = '';
+ $_POST['dimension_id'] = 0;
+ $_POST['dimension2_id'] = 0;
+ $_POST['sales_type'] = -1;
+ $_POST['curr_code'] = get_company_currency();
+ $_POST['credit_status'] = -1;
+ $_POST['payment_terms'] = $_POST['notes'] = '';
+
+ $_POST['discount'] = percent_format(0);
+ $_POST['credit_limit'] = price_format($SysPrefs->default_credit_limit());
+ }
}
else
{
@@ -188,7 +187,6 @@ function customer_settings($selected_id)
$_POST['credit_status'] = $myrow["credit_status"];
$_POST['payment_terms'] = $myrow["payment_terms"];
$_POST['discount'] = percent_format($myrow["discount"] * 100);
- $_POST['pymt_discount'] = percent_format($myrow["pymt_discount"] * 100);
$_POST['credit_limit'] = price_format($myrow["credit_limit"]);
$_POST['notes'] = $myrow["notes"];
$_POST['inactive'] = $myrow["inactive"];
@@ -205,7 +203,8 @@ function customer_settings($selected_id)
text_row(_("GSTNo:"), 'tax_id', null, 40, 40);
- if (!$selected_id || is_new_customer($selected_id))
+ if (!$selected_id || is_new_customer($selected_id) || (!key_in_foreign_table($selected_id, 'debtor_trans', 'debtor_no') &&
+ !key_in_foreign_table($selected_id, 'sales_orders', 'debtor_no')))
{
currencies_list_row(_("Customer's Currency:"), 'curr_code', $_POST['curr_code']);
}
@@ -218,13 +217,21 @@ function customer_settings($selected_id)
if($selected_id)
record_status_list_row(_("Customer status:"), 'inactive');
-
+ elseif (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
+ {
+ table_section_title(_("Branch"));
+ text_row(_("Phone:"), 'phone', null, 32, 30);
+ text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
+ text_row(_("Fax Number:"), 'fax', null, 32, 30);
+ email_row(_("E-mail:"), 'email', null, 35, 55);
+ text_row(_("Bank Account Number:"), 'bank_account', null, 30, 60);
+ sales_persons_list_row( _("Sales Person:"), 'salesman', null);
+ }
table_section(2);
table_section_title(_("Sales"));
percent_row(_("Discount Percent:"), 'discount', $_POST['discount']);
- percent_row(_("Prompt Payment Discount Percent:"), 'pymt_discount', $_POST['pymt_discount']);
amount_row(_("Credit Limit:"), 'credit_limit', $_POST['credit_limit']);
payment_terms_list_row(_("Payment Terms:"), 'payment_terms', $_POST['payment_terms']);
@@ -243,15 +250,24 @@ function customer_settings($selected_id)
start_row();
echo '| '._('Customer branches').': | ';
hyperlink_params_td($path_to_root . "/sales/manage/customer_branches.php",
- ''. (@$_REQUEST['popup'] ? _("Select or &Add") : _("&Add or Edit ")).'',
- "debtor_no=".$selected_id.(@$_REQUEST['popup'] ? '&popup=1':''));
+ ''. ($page_nested ? _("Select or &Add") : _("&Add or Edit ")).'',
+ "debtor_no=".$selected_id.($page_nested ? '&popup=1':''));
end_row();
}
textarea_row(_("General Notes:"), 'notes', null, 35, 5);
+ if (!$selected_id && isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
+ {
+ table_section_title(_("Branch"));
+ locations_list_row(_("Default Inventory Location:"), 'location');
+ shipping_methods_list_row(_("Default Shipping:"), 'ship_via');
+ sales_areas_list_row( _("Sales Area:"), 'area', null);
+ tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null);
+ }
end_outer_table(1);
div_start('controls');
+ if (@$_REQUEST['popup']) hidden('popup', 1);
if (!$selected_id)
{
submit_center('submit', _("Add New Customer"), true, '', 'default');
@@ -259,7 +275,7 @@ function customer_settings($selected_id)
else
{
submit_center_first('submit', _("Update Customer"),
- _('Update customer data'), @$_REQUEST['popup'] ? true : 'default');
+ _('Update customer data'), $page_nested ? true : 'default');
submit_return('select', $selected_id, _("Select this customer and return to document entry."));
submit_center_last('delete', _("Delete Customer"),
_('Delete customer data if have been never used'), true);
@@ -293,12 +309,15 @@ else
hidden('customer_id');
}
+//if (!$selected_id || list_updated('customer_id'))
if (!$selected_id)
unset($_POST['_tabs_sel']); // force settings tab for new customer
tabbed_content_start('tabs', array(
'settings' => array(_('&General settings'), $selected_id),
'contacts' => array(_('&Contacts'), $selected_id),
+ 'transactions' => array(_('&Transactions'), (user_check_access('SA_SALESTRANSVIEW') ? $selected_id : null)),
+ 'orders' => array(_('Sales &Orders'), (user_check_access('SA_SALESTRANSVIEW') ? $selected_id : null)),
));
switch (get_post('_tabs_sel')) {
@@ -310,13 +329,18 @@ tabbed_content_start('tabs', array(
$contacts = new contacts('contacts', $selected_id, 'customer');
$contacts->show();
break;
+ case 'transactions':
+ $_GET['customer_id'] = $selected_id;
+ include_once($path_to_root."/sales/inquiry/customer_inquiry.php");
+ break;
case 'orders':
+ $_GET['customer_id'] = $selected_id;
+ include_once($path_to_root."/sales/inquiry/sales_orders_view.php");
+ break;
};
br();
tabbed_content_end();
-hidden('popup', @$_REQUEST['popup']);
end_form();
end_page();
-?>