diff --git a/src/AutoPaymentEditor.php b/src/AutoPaymentEditor.php
index dce728bfe2..0d9a37a8b3 100644
--- a/src/AutoPaymentEditor.php
+++ b/src/AutoPaymentEditor.php
@@ -14,6 +14,8 @@
//Include the function library
require 'Include/Config.php';
require 'Include/Functions.php';
+require 'bin/vancowebservices.php';
+
use ChurchCRM\Utils\InputUtils;
use ChurchCRM\dto\SystemConfig;
@@ -24,7 +26,7 @@
//Get Family name
if ($iFamily) {
- $sSQL = 'SELECT * FROM family_fam where fam_ID = '.$iFamily;
+ $sSQL = 'SELECT * FROM family_fam where fam_ID = ' . $iFamily;
$rsFamily = RunQuery($sSQL);
extract(mysqli_fetch_array($rsFamily));
} else {
@@ -92,35 +94,35 @@
aut_Serial,
aut_DateLastEdited,
aut_EditedBy)
- VALUES ('.
- $iFamily.','.
- $bEnableBankDraft.','.
- $bEnableCreditCard.','.
- "'".$dNextPayDate."',".
- "'".$iFYID."',".
- "'".$nAmount."',".
- "'".$iInterval."',".
- "'".$iFund."',".
- "'".$tFirstName."',".
- "'".$tLastName."',".
- "'".$tAddress1."',".
- "'".$tAddress2."',".
- "'".$tCity."',".
- "'".$tState."',".
- "'".$tZip."',".
- "'".$tCountry."',".
- "'".$tPhone."',".
- "'".$tEmail."',".
- "'".$tCreditCard."',".
- "'".$tExpMonth."',".
- "'".$tExpYear."',".
- "'".$tBankName."',".
- "'".$tRoute."',".
- "'".$tAccount."',".
- "'". 1 ."',".
- "'".date('YmdHis')."',".
- $_SESSION['iUserID'].
- ')';
+ VALUES (' .
+ $iFamily . ',' .
+ $bEnableBankDraft . ',' .
+ $bEnableCreditCard . ',' .
+ "'" . $dNextPayDate . "'," .
+ "'" . $iFYID . "'," .
+ "'" . $nAmount . "'," .
+ "'" . $iInterval . "'," .
+ "'" . $iFund . "'," .
+ "\"" . $tFirstName . "\"," .
+ "\"" . $tLastName . "\"," .
+ "\"" . $tAddress1 . "\"," .
+ "\"" . $tAddress2 . "\"," .
+ "\"" . $tCity . "\"," .
+ "\"" . $tState . "\"," .
+ "'" . $tZip . "'," .
+ "\"" . $tCountry . "\"," .
+ "'" . $tPhone . "'," .
+ "'" . $tEmail . "'," .
+ "'" . $tCreditCard . "'," .
+ "'" . $tExpMonth . "'," .
+ "'" . $tExpYear . "'," .
+ "'" . $tBankName . "'," .
+ "'" . $tRoute . "'," .
+ "'" . $tAccount . "'," .
+ "'" . 1 . "'," .
+ "'" . date('YmdHis') . "'," .
+ $_SESSION['iUserID'] .
+ ')';
RunQuery($sSQL);
$sSQL = 'SELECT MAX(aut_ID) AS iAutID FROM autopayment_aut';
@@ -128,7 +130,7 @@
extract(mysqli_fetch_array($rsAutID));
}
-$sPageTitle = gettext('Automatic payment configuration for the '.$fam_Name.' family');
+$sPageTitle = gettext('Automatic payment configuration for the ') . $fam_Name . gettext(' family');
//Is this the second pass?
if (isset($_POST['Submit'])) {
@@ -175,34 +177,34 @@
$tRoute = InputUtils::LegacyFilterInput($_POST['Route']);
$tAccount = InputUtils::LegacyFilterInput($_POST['Account']);
- $sSQL = 'UPDATE autopayment_aut SET '.
- 'aut_FamID = '.$iFamily.','.
- 'aut_EnableBankDraft ='.$bEnableBankDraft.','.
- 'aut_EnableCreditCard ='.$bEnableCreditCard.','.
- "aut_NextPayDate ='".$dNextPayDate."',".
- "aut_Amount ='".$nAmount."',".
- "aut_FYID ='".$iFYID."',".
- "aut_Interval ='".$iInterval."',".
- "aut_Fund ='".$iFund."',".
- "aut_FirstName ='".$tFirstName."',".
- "aut_LastName ='".$tLastName."',".
- "aut_Address1 ='".$tAddress1."',".
- "aut_Address2 ='".$tAddress2."',".
- "aut_City ='".$tCity."',".
- "aut_State ='".$tState."',".
- "aut_Zip ='".$tZip."',".
- "aut_Country ='".$tCountry."',".
- "aut_Phone ='".$tPhone."',".
- "aut_Email ='".$tEmail."',".
- "aut_CreditCard ='".$tCreditCard."',".
- "aut_ExpMonth ='".$tExpMonth."',".
- "aut_ExpYear ='".$tExpYear."',".
- "aut_BankName ='".$tBankName."',".
- "aut_Route ='".$tRoute."',".
- "aut_Account ='".$tAccount."',".
- "aut_DateLastEdited ='".date('YmdHis')."',".
- 'aut_EditedBy ='.$_SESSION['iUserID'].
- ' WHERE aut_ID = '.$iAutID;
+ $sSQL = 'UPDATE autopayment_aut SET ' .
+ 'aut_FamID = ' . $iFamily . ',' .
+ 'aut_EnableBankDraft =' . $bEnableBankDraft . ',' .
+ 'aut_EnableCreditCard =' . $bEnableCreditCard . ',' .
+ "aut_NextPayDate ='" . $dNextPayDate . "'," .
+ "aut_Amount ='" . $nAmount . "'," .
+ "aut_FYID ='" . $iFYID . "'," .
+ "aut_Interval ='" . $iInterval . "'," .
+ "aut_Fund ='" . $iFund . "'," .
+ "aut_FirstName ='" . $tFirstName . "'," .
+ "aut_LastName ='" . $tLastName . "'," .
+ "aut_Address1 ='" . $tAddress1 . "'," .
+ "aut_Address2 ='" . $tAddress2 . "'," .
+ "aut_City ='" . $tCity . "'," .
+ "aut_State ='" . $tState . "'," .
+ "aut_Zip ='" . $tZip . "'," .
+ "aut_Country ='" . $tCountry . "'," .
+ "aut_Phone ='" . $tPhone . "'," .
+ "aut_Email ='" . $tEmail . "'," .
+ "aut_CreditCard ='" . $tCreditCard . "'," .
+ "aut_ExpMonth ='" . $tExpMonth . "'," .
+ "aut_ExpYear ='" . $tExpYear . "'," .
+ "aut_BankName ='" . $tBankName . "'," .
+ "aut_Route ='" . $tRoute . "'," .
+ "aut_Account ='" . $tAccount . "'," .
+ "aut_DateLastEdited ='" . date('YmdHis') . "'," .
+ 'aut_EditedBy =' . $_SESSION['iUserID'] .
+ ' WHERE aut_ID = ' . $iAutID;
RunQuery($sSQL);
if (isset($_POST['Submit'])) {
@@ -211,11 +213,11 @@
Redirect($linkBack);
} else {
//Send to the view of this pledge
- Redirect('AutoPaymentEditor.php?AutID='.$iAutID.'&FamilyID='.$iFamily.'&linkBack=', $linkBack);
+ Redirect('AutoPaymentEditor.php?AutID=' . $iAutID . '&FamilyID=' . $iFamily . '&linkBack=', $linkBack);
}
}
} else { // not submitting, just get ready to build the page
- $sSQL = 'SELECT * FROM autopayment_aut WHERE aut_ID = '.$iAutID;
+ $sSQL = 'SELECT * FROM autopayment_aut WHERE aut_ID = ' . $iAutID;
$rsAutopayment = RunQuery($sSQL);
extract(mysqli_fetch_array($rsAutopayment));
@@ -275,530 +277,760 @@
if (SystemConfig::getValue('sElectronicTransactionProcessor') == 'Vanco') {
?>
-
-
+
-
+
\ No newline at end of file
diff --git a/src/CartView.php b/src/CartView.php
index ea2ad6e77b..353ff06b56 100644
--- a/src/CartView.php
+++ b/src/CartView.php
@@ -1,29 +1,29 @@
-
-
= gettext('You have no items in your cart.') ?>
-
+
= gettext('You have no items in your cart.') ?>
+
-
= $_GET['iCount'].' '.($_GET['iCount'] == 1 ? 'Record' : 'Records').' Emptied into Event ID:'.$_GET['iEID'] ?>
- = $_GET['iCount'] . ' ' . ($_GET['iCount'] == 1 ? 'Record' : 'Records') . ' Emptied into Event ID:' . $_GET['iEID'] ?>
+
\n";
- echo '
';
-} else {
+ }
+ echo '
\n";
+ echo '';
+ } else {
// Create array with Classification Information (lst_ID = 1)
$sClassSQL = 'SELECT * FROM list_lst WHERE lst_ID=1 ORDER BY lst_OptionSequence';
- $rsClassification = RunQuery($sClassSQL);
- unset($aClassificationName);
- $aClassificationName[0] = 'Unassigned';
- while ($aRow = mysqli_fetch_array($rsClassification)) {
- extract($aRow);
- $aClassificationName[intval($lst_OptionID)] = $lst_OptionName;
- }
+ $rsClassification = RunQuery($sClassSQL);
+ unset($aClassificationName);
+ $aClassificationName[0] = 'Unassigned';
+ while ($aRow = mysqli_fetch_array($rsClassification)) {
+ extract($aRow);
+ $aClassificationName[intval($lst_OptionID)] = $lst_OptionName;
+ }
// Create array with Family Role Information (lst_ID = 2)
$sFamRoleSQL = 'SELECT * FROM list_lst WHERE lst_ID=2 ORDER BY lst_OptionSequence';
- $rsFamilyRole = RunQuery($sFamRoleSQL);
- unset($aFamilyRoleName);
- $aFamilyRoleName[0] = 'Unassigned';
- while ($aRow = mysqli_fetch_array($rsFamilyRole)) {
- extract($aRow);
- $aFamilyRoleName[intval($lst_OptionID)] = $lst_OptionName;
- }
+ $rsFamilyRole = RunQuery($sFamRoleSQL);
+ unset($aFamilyRoleName);
+ $aFamilyRoleName[0] = 'Unassigned';
+ while ($aRow = mysqli_fetch_array($rsFamilyRole)) {
+ extract($aRow);
+ $aFamilyRoleName[intval($lst_OptionID)] = $lst_OptionName;
+ }
- $sSQL = 'SELECT * FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID IN ('.ConvertCartToString($_SESSION['aPeopleCart']).') ORDER BY per_LastName';
- $rsCartItems = RunQuery($sSQL);
- $iNumPersons = mysqli_num_rows($rsCartItems);
+ $sSQL = 'SELECT * FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID IN (' . ConvertCartToString($_SESSION['aPeopleCart']) . ') ORDER BY per_LastName';
+ $rsCartItems = RunQuery($sSQL);
+ $iNumPersons = mysqli_num_rows($rsCartItems);
- $sSQL = 'SELECT distinct per_fam_ID FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID IN ('.ConvertCartToString($_SESSION['aPeopleCart']).') ORDER BY per_fam_ID';
- $iNumFamilies = mysqli_num_rows(RunQuery($sSQL));
+ $sSQL = 'SELECT distinct per_fam_ID FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID IN (' . ConvertCartToString($_SESSION['aPeopleCart']) . ') ORDER BY per_fam_ID';
+ $iNumFamilies = mysqli_num_rows(RunQuery($sSQL));
- if ($iNumPersons > 16) {
- ?>
-
-
+ if ($iNumPersons > 16) {
+ ?>
+
+
-
+
- 0) {
- ?>
-
-
-
-
= gettext('Empty Cart') ?>
-
-
= gettext('Empty Cart to Group') ?>
- 0) {
?>
-
= gettext('Empty Cart to Family') ?>
-
-
= gettext('Empty Cart to Event') ?>
-
-
-
= gettext('CSV Export') ?>
-
-
= gettext('Map Cart') ?>
-
= gettext('Name Tags') ?>
-
+
+
+
= gettext('Empty Cart') ?>
+
+
= gettext('Empty Cart to Group') ?>
+
+
+
= gettext('Empty Cart to Family') ?>
+
+
= gettext('Empty Cart to Event') ?>
- // Email Cart links
- // Note: This will email entire group, even if a specific role is currently selected.
- $sSQL = "SELECT per_Email, fam_Email
+
+
= gettext('CSV Export') ?>
+
+
= gettext('Map Cart') ?>
+
= gettext('Name Tags') ?>
+
".gettext('Email Cart').'';
- echo "
".gettext('Email (BCC)').'';
+ if ($bEmailMailto) { // Does user have permission to email groups
+ // Display link
+ echo "
" . gettext('Email Cart') . '';
+ echo "
" . gettext('Email (BCC)') . '';
+ }
}
- }
- //Text Cart Link
- $sSQL = "SELECT per_CellPhone, fam_CellPhone FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID NOT IN (SELECT per_ID FROM person_per INNER JOIN record2property_r2p ON r2p_record_ID = per_ID INNER JOIN property_pro ON r2p_pro_ID = pro_ID AND pro_Name = 'Do Not SMS') AND per_ID IN (".ConvertCartToString($_SESSION['aPeopleCart']).')';
- $rsPhoneList = RunQuery($sSQL);
- $sPhoneLink = '';
- $sCommaDelimiter = ', ';
-
- while (list($per_CellPhone, $fam_CellPhone) = mysqli_fetch_row($rsPhoneList)) {
- $sPhone = SelectWhichInfo($per_CellPhone, $fam_CellPhone, false);
- if ($sPhone) {
- /* if ($sPhoneLink) // Don't put delimiter before first phone
- $sPhoneLink .= $sCommaDelimiter; */
- // Add phone only if phone is not already in string
- if (!stristr($sPhoneLink, $sPhone)) {
- $sPhoneLink .= $sPhone .= $sCommaDelimiter;
+ //Text Cart Link
+ $sSQL = "SELECT per_CellPhone, fam_CellPhone FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID NOT IN (SELECT per_ID FROM person_per INNER JOIN record2property_r2p ON r2p_record_ID = per_ID INNER JOIN property_pro ON r2p_pro_ID = pro_ID AND pro_Name = 'Do Not SMS') AND per_ID IN (" . ConvertCartToString($_SESSION['aPeopleCart']) . ')';
+ $rsPhoneList = RunQuery($sSQL);
+ $sPhoneLink = '';
+ $sCommaDelimiter = ', ';
+
+ while (list($per_CellPhone, $fam_CellPhone) = mysqli_fetch_row($rsPhoneList)) {
+ $sPhone = SelectWhichInfo($per_CellPhone, $fam_CellPhone, false);
+ if ($sPhone) {
+ /* if ($sPhoneLink) // Don't put delimiter before first phone
+ $sPhoneLink .= $sCommaDelimiter; */
+ // Add phone only if phone is not already in string
+ if (!stristr($sPhoneLink, $sPhone)) {
+ $sPhoneLink .= $sPhone .= $sCommaDelimiter;
+ }
}
}
- }
- if ($sPhoneLink) {
- if ($bEmailMailto) { // Does user have permission to email groups
+ if ($sPhoneLink) {
+ if ($bEmailMailto) { // Does user have permission to email groups
- // Display link
- echo '
Text Cart';
- echo '';
- }
+ // Display link
+ echo ' ' . gettext("Text Cart");
+ echo '';
+ }
+ } ?>
+ = gettext('Create Directory From Cart') ?>
+
+
+
+
+
+
+
-
= gettext('Create Directory From Cart') ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0): ?>
-
-
-
-
-
+
+
+
+ 0): ?>
+
+
+
+
+
= gettext('Name') ?>
= gettext('Address') ?>
@@ -290,101 +299,104 @@ function codename()
= gettext('Classification') ?>
= gettext('Family Role') ?>
-
-
-
- 0) {
- $sEmail = $per_WorkEmail;
- }
-
- if (strlen($sEmail)) {
- $sValidEmail = gettext('Yes');
- if (!stristr($sEmailLink, $sEmail)) {
- $email_array[] = $sEmail;
-
- if ($iEmailNum == 0) {
- // Comma is not needed before first email address
- $sEmailLink .= $sEmail;
- $iEmailNum++;
- } else {
- $sEmailLink .= $sMailtoDelimiter.$sEmail;
- }
+
+
+
+ 0) {
+ $sEmail = $per_WorkEmail;
+ }
+
+ if (strlen($sEmail)) {
+ $sValidEmail = gettext('Yes');
+ if (!stristr($sEmailLink, $sEmail)) {
+ $email_array[] = $sEmail;
+
+ if ($iEmailNum == 0) {
+ // Comma is not needed before first email address
+ $sEmailLink .= $sEmail;
+ $iEmailNum++;
+ } else {
+ $sEmailLink .= $sMailtoDelimiter . $sEmail;
+ }
+ }
+ } else {
+ $sValidEmail = gettext('No');
+ }
+
+ $sAddress1 = SelectWhichInfo($per_Address1, $fam_Address1, false);
+ $sAddress2 = SelectWhichInfo($per_Address2, $fam_Address2, false);
+
+ if (strlen($sAddress1) > 0 || strlen($sAddress2) > 0) {
+ $sValidAddy = gettext('Yes');
+ } else {
+ $sValidAddy = gettext('No');
+ }
+
+ $personName = $per_FirstName . ' ' . $per_LastName;
+ $thumbnail = SystemURLs::getRootPath() . '/api/persons/' . $per_ID . '/thumbnail'; ?>
+
+
+
+  
+
+ = FormatFullName($per_Title, $per_FirstName, $per_MiddleName, $per_LastName, $per_Suffix, 1) ?>
+
+
+ = $sValidAddy ?>
+ = $sValidEmail ?>
+ = gettext('Remove') ?>
+
+ = $aClassificationName[$per_cls_ID] ?>
+ = $aFamilyRoleName[$per_fmr_ID] ?>
+
+
+
+
+
+
+
+
+
+
+
+
-Deleted Email message succesfuly';
-}
-?>
+ RunQuery($sSQL);
+ echo 'Deleted Email message succesfuly ';
+ }
+
+ ?>
diff --git a/src/FamilyView.php b/src/FamilyView.php
index 7265d4a256..e15aae719b 100644
--- a/src/FamilyView.php
+++ b/src/FamilyView.php
@@ -56,7 +56,7 @@
$family->activate();
}
$family->save();
- Redirect("FamilyView.php?FamilyID=". $_POST['FID']);
+ Redirect("FamilyView.php?FamilyID=" . $_POST['FID']);
exit;
}
// Get the list of funds
@@ -66,7 +66,7 @@
if (isset($_POST["UpdatePledgeTable"]) && $_SESSION['bFinance']) {
$_SESSION['sshowPledges'] = isset($_POST["ShowPledges"]);
$_SESSION['sshowPayments'] = isset($_POST["ShowPayments"]);
- $_SESSION['sshowSince'] = DateTime::createFromFormat("Y-m-d", InputUtils::LegacyFilterInput($_POST["ShowSinceDate"])) ;
+ $_SESSION['sshowSince'] = DateTime::createFromFormat("Y-m-d", InputUtils::LegacyFilterInput($_POST["ShowSinceDate"]));
}
$dSQL = "SELECT fam_ID FROM family_fam order by fam_Name";
@@ -173,7 +173,7 @@
window.CRM.currentFamily = = $iFamilyID ?>;
-
= gettext(" This Family is Deactivated") ?>
@@ -182,31 +182,35 @@
} ?>
-
-
-
-
-
-
-
-
-
@@ -363,22 +370,25 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
getPeople() as $person) {
- ?>
-
-
-
- = $person->getFullName() ?>
-
-
- getFamilyRoleName();
- $labelColor = 'label-default';
- if ($famRole == 'Head of Household') {
- } elseif ($famRole == 'Spouse') {
- $labelColor = 'label-info';
- } elseif ($famRole == 'Child') {
- $labelColor = 'label-warning';
- } ?>
+ ?>
+
+
+
+ = $person->getFullName() ?>
+
+
+ getFamilyRoleName();
+ $labelColor = 'label-default';
+ if ($famRole == 'Head of Household') {
+ } elseif ($famRole == 'Spouse') {
+ $labelColor = 'label-info';
+ } elseif ($famRole == 'Child') {
+ $labelColor = 'label-warning';
+ } ?>
= $famRole ?>
@@ -387,11 +397,11 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
getEmail();
- if ($tmpEmail != "") {
- array_push($sFamilyEmails, $tmpEmail); ?>
+ if ($tmpEmail != "") {
+ array_push($sFamilyEmails, $tmpEmail); ?>
= $tmpEmail ?>
+ } ?>
@@ -401,25 +411,26 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
+ ?>
-
+
+ } ?>
+ } ?>
@@ -437,13 +448,13 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
= gettext("Assigned Properties") ?>
+ ?>
= gettext("Automatic Payments") ?>
= gettext("Pledges and Payments") ?>
+ } ?>
@@ -492,14 +503,16 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
">
-
+
">
-
+
@@ -600,24 +613,27 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
= gettext("Assign a New Property") ?>:
@@ -690,11 +706,11 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
= gettext("Edit") ?>
+ href="AutoPaymentEditor.php?AutID== $aut_ID ?>&FamilyID== $iFamilyID ?>&linkBack=FamilyView.php?FamilyID== $iFamilyID ?>">= gettext("Edit") ?>
= gettext("Delete") ?>
+ href="AutoPaymentDelete.php?AutID== $aut_ID ?>&linkBack=FamilyView.php?FamilyID== $iFamilyID ?>">= gettext("Delete") ?>
= $aut_DateLastEdited ?>
@@ -735,27 +751,28 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
- name="UpdatePledgeTable"
+
+ name="UpdatePledgeTable"
style="font-size: 8pt;">
-
- = gettext("Pledge or Payment") ?>
- = gettext("Fund") ?>
- = gettext("Fiscal Year") ?>
- = gettext("Date") ?>
- = gettext("Amount") ?>
- = gettext("NonDeductible") ?>
- = gettext("Schedule") ?>
- = gettext("Method") ?>
- = gettext("Comment") ?>
- = gettext("Edit") ?>
- = gettext("Delete") ?>
- = gettext("Date Updated") ?>
- = gettext("Updated By") ?>
-
+
+ = gettext("Pledge or Payment") ?>
+ = gettext("Fund") ?>
+ = gettext("Fiscal Year") ?>
+ = gettext("Date") ?>
+ = gettext("Amount") ?>
+ = gettext("NonDeductible") ?>
+ = gettext("Schedule") ?>
+ = gettext("Method") ?>
+ = gettext("Comment") ?>
+ = gettext("Edit") ?>
+ = gettext("Delete") ?>
+ = gettext("Date Updated") ?>
+ = gettext("Updated By") ?>
+
@@ -783,7 +800,7 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?> $_SESSION['sshowSince'])
+ ($_SESSION['sshowSince'] == "" || DateTime::createFromFormat("Y-m-d", $plg_date) > $_SESSION['sshowSince'])
) {
?>
@@ -817,11 +834,11 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
Edit
+ href="PledgeEditor.php?GroupKey== $plg_GroupKey ?>&linkBack=FamilyView.php?FamilyID== $iFamilyID ?>">Edit
Delete
+ href="PledgeDelete.php?GroupKey== $plg_GroupKey ?>&linkBack=FamilyView.php?FamilyID== $iFamilyID ?>">Delete
= $plg_DateLastEdited ?>
@@ -868,11 +885,11 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
-
-
+
+
-
+
@@ -902,7 +919,8 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?>
= gettext("Select how do you want to request the family information to be verified") ?>
@@ -925,14 +943,16 @@ class="fa fa-cart-plus"> = gettext("Add All Family Members to Cart") ?> 0 && !empty(SystemConfig::getValue('sSMTPHost'))) {
?>
= gettext("Online Verification") ?>
+ class="btn btn-warning warning"> = gettext("Online Verification") ?>
-
= gettext("PDF Report") ?>
= gettext("Verified In Person") ?>
+ class="btn btn-success"> = gettext("Verified In Person") ?>
+
@@ -948,24 +968,25 @@ class="btn btn-success"> = gettext("Verified In Per
= gettext("We could not find the family you were looking for. Meanwhile, you may") ?> = gettext("return to member dashboard") ?>
+ href="/MembersDashboard.php">= gettext("return to member dashboard") ?>
-
+
diff --git a/src/Login.php b/src/Login.php
index 4f622cc04f..9ecc36d882 100644
--- a/src/Login.php
+++ b/src/Login.php
@@ -143,9 +143,6 @@
}
-
-
-
// Set the page title and include HTML header
$sPageTitle = gettext('Login');
require 'Include/HeaderNotLoggedIn.php';
@@ -186,35 +183,30 @@
-
+
- = gettext("I forgot my password")?>
- = gettext("I forgot my password") ?>
+
diff --git a/src/UserList.php b/src/UserList.php
index 3ab55bac36..0a7cdddc9d 100644
--- a/src/UserList.php
+++ b/src/UserList.php
@@ -61,41 +61,48 @@
-
+
getId() != $_SESSION['user']->getId()) {
?>
-
- getId() ?>, '= $user->getPerson()->getFullName() ?>')">
+
- = $user->getPerson()->getFullName() ?>
+
+ = $user->getPerson()->getFullName() ?>
+
= $user->getLastLogin(SystemConfig::getValue('sDateFormatShort')) ?>
= $user->getLoginCount() ?>
isLocked()) {
?>
= $user->getFailedLogins() ?>
- getFailedLogins();
}
- if ($user->getFailedLogins()> 0) {
+ if ($user->getFailedLogins() > 0) {
?>
-
- getId() ?>, '= $user->getPerson()->getFullName() ?>')">
+
-
+
getId() != $_SESSION['user']->getId() && !empty($user->getEmail())) {
?>
-
- getId() ?>, '= $user->getPerson()->getFullName() ?>')">
+
-
@@ -117,7 +124,7 @@ function deleteUser(userId, userName) {
bootbox.confirm({
title: "= gettext("User Delete Confirmation") ?>",
message: '' +
- '= gettext("Please confirm removal of user status from:") ?> '+ userName +'
',
+ '= gettext("Please confirm removal of user status from:") ?> ' + userName + ' ',
callback: function (result) {
if (result) {
$.ajax({
@@ -139,7 +146,7 @@ function restUserLoginCount(userId, userName) {
bootbox.confirm({
title: "= gettext("Action Confirmation") ?>",
message: '' +
- '= gettext("Please confirm reset failed login count") ?>: '+ userName +'
',
+ "= gettext("Please confirm reset failed login count") ?>: " + userName + " ",
callback: function (result) {
if (result) {
$.ajax({
@@ -160,7 +167,7 @@ function resetUserPassword(userId, userName) {
bootbox.confirm({
title: "= gettext("Action Confirmation") ?>",
message: '' +
- '= gettext("Please confirm the password reset of this user") ?>: '+ userName +'
',
+ "= gettext("Please confirm the password reset of this user") ?>: " + userName + " ",
callback: function (result) {
if (result) {
$.ajax({