Skip to content

Revert Customers.php to before CRM commit #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dalers wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Revert Customers.php to before CRM commit #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d496e1d
change wiki sub-menu link text
dalers Aug 10, 2026
ecd2759
cleanup customer notes table
dalers Aug 10, 2026
2eb27fb
make section order same as SelectProduct.php
dalers Aug 11, 2026
1fda74c
complete SelectProduct.php look
dalers Aug 11, 2026
9a8950b
Revert Customers.php to version before commit f554f0c
dalers Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 11 additions & 146 deletions Customers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,6 @@
include(__DIR__ . '/includes/SQL_CommonFunctions.php');
include(__DIR__ . '/includes/CountriesArray.php');

$IndustryOptions = array();
$SQL = "SELECT industryname
FROM crmindustries
WHERE active='1'
ORDER BY industryname";
$Result = DB_query($SQL, '', '', false, false);
if ($Result) {
while ($MyRow = DB_fetch_array($Result)) {
$IndustryOptions[] = $MyRow['industryname'];
}
}

echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . __('Customer') .
'" alt="" />' . ' ' . __('Customer Maintenance') . '
Expand Down Expand Up @@ -172,13 +160,7 @@
taxref='" . $_POST['TaxRef'] . "',
customerpoline='" . $_POST['CustomerPOLine'] . "',
typeid='" . $_POST['typeid'] . "',
language_id='" . $_POST['LanguageID'] . "',
industry='" . $_POST['Industry'] . "',
website='" . $_POST['Website'] . "',
leadsource='" . $_POST['LeadSource'] . "',
lifecycle='" . $_POST['Lifecycle'] . "',
employeecount='" . $_POST['EmployeeCount'] . "',
annualrevenue='" . filter_number_format($_POST['AnnualRevenue']) . "'
language_id='" . $_POST['LanguageID'] . "'
WHERE debtorno = '" . $_POST['DebtorNo'] . "'";
} else {

Expand Down Expand Up @@ -208,13 +190,7 @@
taxref='" . $_POST['TaxRef'] . "',
customerpoline='" . $_POST['CustomerPOLine'] . "',
typeid='" . $_POST['typeid'] . "',
language_id='" . $_POST['LanguageID'] . "',
industry='" . $_POST['Industry'] . "',
website='" . $_POST['Website'] . "',
leadsource='" . $_POST['LeadSource'] . "',
lifecycle='" . $_POST['Lifecycle'] . "',
employeecount='" . $_POST['EmployeeCount'] . "',
annualrevenue='" . filter_number_format($_POST['AnnualRevenue']) . "'
language_id='" . $_POST['LanguageID'] . "'
WHERE debtorno = '" . $_POST['DebtorNo'] . "'";

if ($OldCurrency != $_POST['CurrCode']) {
Expand Down Expand Up @@ -259,13 +235,7 @@
taxref,
customerpoline,
typeid,
language_id,
industry,
website,
leadsource,
lifecycle,
employeecount,
annualrevenue)
language_id)
VALUES ('" . $_POST['DebtorNo'] ."',
'" . $_POST['CustName'] ."',
'" . $_POST['Address1'] ."',
Expand All @@ -287,13 +257,7 @@
'" . $_POST['TaxRef'] . "',
'" . $_POST['CustomerPOLine'] . "',
'" . $_POST['typeid'] . "',
'" . $_POST['LanguageID'] . "',
'" . $_POST['Industry'] . "',
'" . $_POST['Website'] . "',
'" . $_POST['LeadSource'] . "',
'" . $_POST['Lifecycle'] . "',
'" . $_POST['EmployeeCount'] . "',
'" . filter_number_format($_POST['AnnualRevenue']) . "')";
'" . $_POST['LanguageID'] . "')";

$ErrMsg = __('This customer could not be added because');
$Result = DB_query($SQL, $ErrMsg);
Expand Down Expand Up @@ -481,7 +445,8 @@
$DataError =0;

echo '<fieldset>
<legend>', __('Create Customer Details'), '</legend>';
<legend>', __('Create Customer Details'), '</legend>
<fieldset class="Column1">';

/* if $AutoDebtorNo in config.php has not been set or if it has been set to a number less than one,
then provide an input box for the DebtorNo to manually assigned */
Expand Down Expand Up @@ -579,9 +544,11 @@
echo '<field>
<label for="ClientSince">' . __('Customer Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</label>
<input tabindex="10" type="date" name="ClientSince" value="' . $DateString . '" size="11" maxlength="10" />
</field>';
</field>
</fieldset>';

echo '<field>
echo '<fieldset class="Column2">
<field>
<label for="Discount">' . __('Discount Percent') . ':</label>
<input tabindex="11" type="text" class="number" name="Discount" value="0" size="5" maxlength="4" />
</field>
Expand Down Expand Up @@ -700,51 +667,6 @@
</select>
</field>
</fieldset>
<fieldset>
<legend>' . __('CRM Details') . '</legend>
<field>
<label for="Industry">' . __('Industry') . ':</label>
<select name="Industry">
<option value=""></option>';
$IndustryFound = false;
foreach ($IndustryOptions as $IndustryName) {
$Selected = '';
if (isset($_POST['Industry']) and $_POST['Industry'] == $IndustryName) {
$Selected = ' selected="selected"';
$IndustryFound = true;
}
echo '<option value="' . htmlspecialchars($IndustryName, ENT_QUOTES, 'UTF-8') . '"' . $Selected . '>' . htmlspecialchars($IndustryName, ENT_QUOTES, 'UTF-8') . '</option>';
}
if (isset($_POST['Industry']) and $_POST['Industry'] != '' and !$IndustryFound) {
echo '<option selected="selected" value="' . htmlspecialchars($_POST['Industry'], ENT_QUOTES, 'UTF-8') . '">' . htmlspecialchars($_POST['Industry'], ENT_QUOTES, 'UTF-8') . '</option>';
}
echo '</select>
</field>
<field>
<label for="Website">' . __('Website') . ':</label>
<input maxlength="120" name="Website" size="40" type="url" value="' . (isset($_POST['Website']) ? htmlspecialchars($_POST['Website']) : '') . '" />
</field>
<field>
<label for="LeadSource">' . __('Lead Source') . ':</label>
<input maxlength="40" name="LeadSource" size="30" type="text" value="' . (isset($_POST['LeadSource']) ? htmlspecialchars($_POST['LeadSource']) : '') . '" />
</field>
<field>
<label for="Lifecycle">' . __('Lifecycle Stage') . ':</label>
<select name="Lifecycle">';
$LifecycleVal = isset($_POST['Lifecycle']) ? $_POST['Lifecycle'] : 'lead';
foreach (['lead' => __('Lead'), 'prospect' => __('Prospect'), 'customer' => __('Customer'), 'churned' => __('Churned')] as $LcKey => $LcLabel) {
echo '<option value="' . $LcKey . '"' . ($LifecycleVal == $LcKey ? ' selected="selected"' : '') . '>' . $LcLabel . '</option>';
}
echo '</select>
</field>
<field>
<label for="EmployeeCount">' . __('Employee Count') . ':</label>
<input maxlength="11" name="EmployeeCount" size="10" type="number" min="0" value="' . (isset($_POST['EmployeeCount']) ? (int)$_POST['EmployeeCount'] : '') . '" />
</field>
<field>
<label for="AnnualRevenue">' . __('Annual Revenue') . ':</label>
<input maxlength="14" name="AnnualRevenue" size="15" type="text" value="' . (isset($_POST['AnnualRevenue']) ? number_format($_POST['AnnualRevenue'], 2) : '') . '" />
</field>
</fieldset>';
if ($DataError ==0){
echo '<div class="centre">
Expand Down Expand Up @@ -785,13 +707,7 @@
taxref,
customerpoline,
typeid,
language_id,
industry,
website,
leadsource,
lifecycle,
employeecount,
annualrevenue
language_id
FROM debtorsmaster
WHERE debtorno = '" . $DebtorNo . "'";

Expand Down Expand Up @@ -828,12 +744,6 @@
$_POST['CustomerPOLine'] = $MyRow['customerpoline'];
$_POST['typeid'] = $MyRow['typeid'];
$_POST['LanguageID'] = $MyRow['language_id'];
$_POST['Industry'] = $MyRow['industry'];
$_POST['Website'] = $MyRow['website'];
$_POST['LeadSource'] = $MyRow['leadsource'];
$_POST['Lifecycle'] = $MyRow['lifecycle'];
$_POST['EmployeeCount'] = $MyRow['employeecount'];
$_POST['AnnualRevenue'] = $MyRow['annualrevenue'];

echo '<input type="hidden" name="DebtorNo" value="' . $DebtorNo . '" />';

Expand Down Expand Up @@ -1175,51 +1085,6 @@
echo '</select>
</field>
</fieldset>
<fieldset class="Column2">
<legend>' . __('CRM Details') . '</legend>
<field>
<label for="Industry">' . __('Industry') . ':</label>
<select name="Industry">
<option value=""></option>';
$IndustryFound = false;
foreach ($IndustryOptions as $IndustryName) {
$Selected = '';
if (isset($_POST['Industry']) and $_POST['Industry'] == $IndustryName) {
$Selected = ' selected="selected"';
$IndustryFound = true;
}
echo '<option value="' . htmlspecialchars($IndustryName, ENT_QUOTES, 'UTF-8') . '"' . $Selected . '>' . htmlspecialchars($IndustryName, ENT_QUOTES, 'UTF-8') . '</option>';
}
if (isset($_POST['Industry']) and $_POST['Industry'] != '' and !$IndustryFound) {
echo '<option selected="selected" value="' . htmlspecialchars($_POST['Industry'], ENT_QUOTES, 'UTF-8') . '">' . htmlspecialchars($_POST['Industry'], ENT_QUOTES, 'UTF-8') . '</option>';
}
echo '</select>
</field>
<field>
<label for="Website">' . __('Website') . ':</label>
<input maxlength="120" name="Website" size="40" type="url" value="' . htmlspecialchars($_POST['Website'] ?? '') . '" />
</field>
<field>
<label for="LeadSource">' . __('Lead Source') . ':</label>
<input maxlength="40" name="LeadSource" size="30" type="text" value="' . htmlspecialchars($_POST['LeadSource'] ?? '') . '" />
</field>
<field>
<label for="Lifecycle">' . __('Lifecycle Stage') . ':</label>
<select name="Lifecycle">';
foreach (['lead' => __('Lead'), 'prospect' => __('Prospect'), 'customer' => __('Customer'), 'churned' => __('Churned')] as $LcKey => $LcLabel) {
echo '<option value="' . $LcKey . '"' . (($_POST['Lifecycle'] ?? 'customer') == $LcKey ? ' selected="selected"' : '') . '>' . $LcLabel . '</option>';
}
echo '</select>
</field>
<field>
<label for="EmployeeCount">' . __('Employee Count') . ':</label>
<input maxlength="11" name="EmployeeCount" size="10" type="number" min="0" value="' . (int)($_POST['EmployeeCount'] ?? 0) . '" />
</field>
<field>
<label for="AnnualRevenue">' . __('Annual Revenue') . ':</label>
<input maxlength="14" name="AnnualRevenue" size="15" type="text" value="' . number_format($_POST['AnnualRevenue'] ?? 0, 2) . '" />
</field>
</fieldset>
</fieldset>';

if (isset($_GET['delete'])) { //User hit delete link on customer contacts
Expand Down
Loading