From: Janusz Dobrowolski Date: Thu, 19 Jun 2008 15:20:50 +0000 (+0000) Subject: Ajax improvements X-Git-Tag: v2.4.2~19^2~2003 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=0e484731f1e6036625f5f22a59be003d0b409ef2;p=fa-stable.git Ajax improvements --- diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php index 4e9ca586..55e32abb 100644 --- a/purchasing/allocations/supplier_allocation_main.php +++ b/purchasing/allocations/supplier_allocation_main.php @@ -54,7 +54,7 @@ function display_allocatable_transactions() $supplier_id = $_POST['supplier_id']; $trans_items = get_allocatable_from_supp_transactions($supplier_id, $settled); - + div_start('alloc_tbl'); start_table($table_style); if (!isset($_POST['supplier_id'])) $th = array(_("Transaction Type"), _("#"), _("Reference"), _("Date"), _("Supplier"), @@ -102,12 +102,15 @@ function display_allocatable_transactions() if (db_num_rows($trans_items) == 0) display_note(_("There are no allocations to be done."), 1, 2); - + div_end(); end_form(); } //-------------------------------------------------------------------------------- +if (get_post('_ShowSettled_update')) { + $Ajax->activate('alloc_tbl'); +} display_allocatable_transactions(); //-------------------------------------------------------------------------------- diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php index 8d85e423..b0c67256 100644 --- a/sales/allocations/customer_allocation_main.php +++ b/sales/allocations/customer_allocation_main.php @@ -56,7 +56,7 @@ function display_allocatable_transactions() $customer_id = $_POST['customer_id']; $trans_items = get_allocatable_from_cust_transactions($customer_id, $settled); - + div_start('alloc_tbl'); start_table($table_style); if (!isset($_POST['customer_id'])) $th = array(_("Transaction Type"), _("#"), _("Reference"), _("Date"), _("Customer"), @@ -107,12 +107,14 @@ function display_allocatable_transactions() if (db_num_rows($trans_items) == 0) display_note(_("There are no allocations to be done."), 1, 2); - + div_end(); end_form(); } //-------------------------------------------------------------------------------- - +if (get_post('_ShowSettled_update')) { + $Ajax->activate('alloc_tbl'); +} display_allocatable_transactions(); //-------------------------------------------------------------------------------- diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 9fa1a2a2..fd20ebb0 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -436,8 +436,10 @@ textarea_row(_("Memo"), 'Comments', null, 50, 4); end_table(1); -submit_center_first('Update', _("Update")); -submit_center_last('process_delivery', _("Process Dispatch")); +submit_center_first('Update', _("Update"), + _('Refresh document page'), true); +submit_center_last('process_delivery', _("Process Dispatch"), + _('Check entered data and save document'), true); end_form(); diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 18d674c6..540b4515 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -430,8 +430,10 @@ textarea_row(_("Memo"), 'Comments', null, 50, 4); end_table(1); -submit_center_first('Update', _("Update")); -submit_center_last('process_invoice', _("Process Invoice")); +submit_center_first('Update', _("Update"), + _('Refresh document page'), true); +submit_center_last('process_invoice', _("Process Invoice"), + _('Check entered data and save document'), true); end_form(); diff --git a/sales/manage/customers.php b/sales/manage/customers.php index 0f101574..e7ebac57 100644 --- a/sales/manage/customers.php +++ b/sales/manage/customers.php @@ -10,16 +10,7 @@ include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/ui.inc"); -if (isset($_GET['New']) || !isset($_POST['customer_id']) || $_POST['customer_id'] == "") -{ - $_POST['New'] = "1"; -} - -if (isset($_POST['SelectCustomer'])) -{ - unset($_POST['New']); -} - +$new_customer = (!isset($_POST['customer_id']) || $_POST['customer_id'] == ""); //-------------------------------------------------------------------------------------------- function can_process() @@ -55,11 +46,12 @@ function can_process() function handle_submit() { - global $path_to_root; + global $path_to_root, $new_customer, $Ajax; + if (!can_process()) return; - if (!isset($_POST['New'])) + if ($new_customer == false) { $sql = "UPDATE ".TB_PREF."debtors_master SET name=" . db_escape($_POST['CustName']) . ", @@ -79,7 +71,6 @@ function handle_submit() db_query($sql,"The customer could not be updated"); display_notification(_("Customer has been updated.")); - clear_fields(); } else @@ -98,15 +89,13 @@ function handle_submit() db_query($sql,"The customer could not be added"); - $new_customer_id = db_insert_id(); - + $_POST['customer_id'] = db_insert_id(); + $new_customer = false; commit_transaction(); display_notification(_("A new customer has been added.")); - hyperlink_params($path_to_root . "/sales/manage/customer_branches.php", _("Add branches for this customer"), "debtor_no=$new_customer_id"); - - clear_fields(); + $Ajax->activate('_page_body'); } } @@ -165,28 +154,15 @@ if (isset($_POST['delete'])) { //ie not cancelled the delete as a result of above tests $sql = "DELETE FROM ".TB_PREF."debtors_master WHERE debtor_no='" . $_POST['customer_id'] . "'"; db_query($sql,"cannot delete customer"); - - meta_forward($_SERVER['PHP_SELF']); + + display_notification(_("Selected customer has been deleted.")); + unset($_POST['customer_id']); + $new_customer = true; + $Ajax->activate('_page_body'); +// meta_forward($_SERVER['PHP_SELF']); } //end if Delete Customer } -function clear_fields() -{ - unset($_POST['CustName']); - unset($_POST['address']); - unset($_POST['tax_id']); - unset($_POST['email']); - unset($_POST['dimension_id']); - unset($_POST['dimension2_id']); - unset($_POST['credit_status']); - unset($_POST['payment_terms']); - unset($_POST['discount']); - unset($_POST['pymt_discount']); - unset($_POST['credit_limit']); - unset($_POST['sales_type']); - unset($_POST['customer_id']); - $_POST['New'] = 1; -} check_db_has_sales_types(_("There are no sales types defined. Please define at least one sales type before adding a customer.")); @@ -195,10 +171,8 @@ start_form(); if (db_has_customers()) { start_table("class = 'tablestyle_noborder'"); - start_row(); - customer_list_cells(_("Select a customer: "), 'customer_id', null); - submit_cells('SelectCustomer', _("Edit Customer")); - end_row(); + customer_list_row(_("Select a customer: "), 'customer_id', null, + _('New customer'), true); end_table(); } else @@ -206,23 +180,19 @@ else hidden('customer_id', $_POST['customer_id']); } -hyperlink_params($_SERVER['PHP_SELF'], _("Enter a new customer"), "New=1"); -echo "
"; - start_table($table_style2, 7, 6); echo ""; // outer table + start_table("class='tablestyle_noborder'"); -if (isset($_POST['New'])) +if ($new_customer) { - - hidden('New', 'Yes'); - $_POST['CustName'] = $_POST['address'] = $_POST['tax_id'] = ''; $_POST['dimension_id'] = 0; $_POST['dimension2_id'] = 0; $_POST['sales_type'] = -1; + $_POST['email'] = ''; $_POST['curr_code'] = get_company_currency(); $_POST['credit_status'] = -1; $_POST['payment_terms'] = ''; @@ -260,7 +230,7 @@ text_row(_("GSTNo:"), 'tax_id', null, 40, 40); // Sherifoz 23.09.03 currency can't be changed if editing -if (isset($_POST['New'])) +if ($new_customer) { currencies_list_row(_("Customer's Currency:"), 'curr_code', $_POST['curr_code']); } @@ -292,19 +262,25 @@ amount_row(_("Credit Limit:"), 'credit_limit', $_POST['credit_limit']); payment_terms_list_row(_("Payment Terms:"), 'payment_terms', $_POST['payment_terms']); credit_status_list_row(_("Credit Status:"), 'credit_status', $_POST['credit_status']); - +if (!$new_customer) { +start_row(); + hyperlink_params_td($path_to_root . "/sales/manage/customer_branches.php", _("Edit customer branches"), "debtor_no=".$_POST['customer_id']); +end_row(); +} end_table(); end_table(1); // outer table -if (isset($_POST['New'])) +if ($new_customer) { - submit_center('submit', _("Add New Customer")); + submit_center('submit', _("Add New Customer"), true, '', true); } else { - submit_center_first('submit', _("Update Customer")); - submit_center_last('delete', _("Delete Customer")); + submit_center_first('submit', _("Update Customer"), + _('Update customer data'), true); + submit_center_last('delete', _("Delete Customer"), + _('Delete user data if have been never used'), true); } end_form();