From 60bec560e9d89481b2d40053da1360e9b398c85d Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 13 Jul 2024 14:25:13 -0700 Subject: [PATCH] 5.10.0 tested upgrade from 5.8.0 --- demo/ChurchCRM-Database.sql | 70 ++++++++----------------------------- package-lock.json | 4 +-- package.json | 2 +- src/composer.json | 2 +- src/composer.lock | 2 +- src/mysql/upgrade.json | 11 +++--- 6 files changed, 24 insertions(+), 67 deletions(-) diff --git a/demo/ChurchCRM-Database.sql b/demo/ChurchCRM-Database.sql index e16ac00768..190dc25671 100644 --- a/demo/ChurchCRM-Database.sql +++ b/demo/ChurchCRM-Database.sql @@ -3,7 +3,7 @@ -- Host: database Database: churchcrm -- ------------------------------------------------------ -- Server version 11.2.2-MariaDB-1:11.2.2+maria~ubu2204 --- Date: Sat, 15 Jun 2024 18:05:20 -0400 +-- Date: Sat, 13 Jul 2024 17:23:46 -0400 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -78,45 +78,6 @@ COMMIT; -- Dumped table `calendar_events` with 3 row(s) -- --- --- Table structure for table `canvassdata_can` --- - -DROP TABLE IF EXISTS `canvassdata_can`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `canvassdata_can` ( - `can_ID` mediumint(9) unsigned NOT NULL AUTO_INCREMENT, - `can_famID` mediumint(9) NOT NULL DEFAULT 0, - `can_Canvasser` mediumint(9) NOT NULL DEFAULT 0, - `can_FYID` mediumint(9) DEFAULT NULL, - `can_date` date DEFAULT NULL, - `can_Positive` text DEFAULT NULL, - `can_Critical` text DEFAULT NULL, - `can_Insightful` text DEFAULT NULL, - `can_Financial` text DEFAULT NULL, - `can_Suggestion` text DEFAULT NULL, - `can_NotInterested` tinyint(1) NOT NULL DEFAULT 0, - `can_WhyNotInterested` text DEFAULT NULL, - PRIMARY KEY (`can_ID`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `canvassdata_can` --- - -LOCK TABLES `canvassdata_can` WRITE; -/*!40000 ALTER TABLE `canvassdata_can` DISABLE KEYS */; -SET autocommit=0; -INSERT INTO `canvassdata_can` VALUES (1,17,0,23,'2019-09-09','asdsd','asdf','saf','sdfsdf','sdfsdf',1,'sdfsdf'); -/*!40000 ALTER TABLE `canvassdata_can` ENABLE KEYS */; -UNLOCK TABLES; -COMMIT; - --- Dumped table `canvassdata_can` with 1 row(s) --- - -- -- Table structure for table `church_location_person` -- @@ -200,7 +161,7 @@ CREATE TABLE `config_cfg` ( LOCK TABLES `config_cfg` WRITE; /*!40000 ALTER TABLE `config_cfg` DISABLE KEYS */; SET autocommit=0; -INSERT INTO `config_cfg` VALUES (10,'aFinanceQueries','28,30,31,32'),(21,'sDefaultCity','Kansas City'),(22,'sDefaultState','MO'),(23,'sDefaultCountry','United States'),(27,'sSMTPHost','crmEmailServer:1025'),(28,'bSMTPAuth','1'),(29,'sSMTPUser','c58d4ec1a5a021'),(30,'sSMTPPass','3cfab2ee59990c'),(45,'iChurchLatitude','39.1111974'),(46,'iChurchLongitude','-94.5838009'),(48,'bHideFriendDate',''),(49,'bHideFamilyNewsletter',''),(50,'bHideWeddingDate',''),(51,'bHideLatLon',''),(52,'bUseDonationEnvelopes',''),(58,'bUseScannedChecks',''),(65,'sTimeZone','America/Detroit'),(67,'bForceUppercaseZip',''),(72,'bEnableNonDeductible',''),(80,'bEnableSelfRegistration','1'),(999,'bRegistered',''),(1003,'sChurchName','Main St. Cathedral'),(1004,'sChurchAddress','123 Main St'),(1005,'sChurchCity','Kansas City'),(1006,'sChurchState','MO'),(1007,'sChurchZip','64106'),(1008,'sChurchPhone','555 123 4234'),(1009,'sChurchEmail','demo@churchcrm.io'),(1010,'sHomeAreaCode','555'),(1014,'sTaxSigner','Elder Joe Smith'),(1016,'sReminderSigner','Elder Joe Smith'),(1025,'sConfirmSigner','Elder Joe Smith'),(1027,'sPledgeSummary2','as of'),(1028,'sDirectoryDisclaimer1','Every effort was made to insure the accuracy of this directory. If there are any errors or omissions, please contact the church office.This directory is for the use of the people of'),(1034,'sChurchChkAcctNum','111111111'),(1035,'bEnableGravatarPhotos','1'),(1037,'sExternalBackupType','WebDAV'),(1046,'sLastIntegrityCheckTimeStamp','20240615-180510'),(1047,'sChurchCountry','United States'),(2010,'bAllowEmptyLastName',''),(2017,'bEnableExternalCalendarAPI',''),(2045,'bPHPMailerAutoTLS',''),(2046,'sPHPMailerSMTPSecure',''),(2050,'bEnabledMenuLinks',''),(2060,'IncludeDataInNewPersonNotifications',''),(2061,'bSearchIncludeFamilyCustomProperties',''),(2062,'bBackupExtraneousImages',''),(2064,'sLastSoftwareUpdateCheckTimeStamp','20240615-180511'),(2065,'bAllowPrereleaseUpgrade',''),(2069,'bRequire2FA',''),(2071,'bSendUserDeletedEmail',''),(20142,'bHSTSEnable',''); +INSERT INTO `config_cfg` VALUES (10,'aFinanceQueries','28,30,31,32'),(21,'sDefaultCity','Kansas City'),(22,'sDefaultState','MO'),(23,'sDefaultCountry','United States'),(27,'sSMTPHost','crmEmailServer:1025'),(28,'bSMTPAuth','1'),(29,'sSMTPUser','c58d4ec1a5a021'),(30,'sSMTPPass','3cfab2ee59990c'),(45,'iChurchLatitude','39.1111974'),(46,'iChurchLongitude','-94.5838009'),(48,'bHideFriendDate',''),(49,'bHideFamilyNewsletter',''),(50,'bHideWeddingDate',''),(51,'bHideLatLon',''),(52,'bUseDonationEnvelopes',''),(58,'bUseScannedChecks',''),(65,'sTimeZone','America/Detroit'),(67,'bForceUppercaseZip',''),(72,'bEnableNonDeductible',''),(80,'bEnableSelfRegistration','1'),(999,'bRegistered',''),(1003,'sChurchName','Main St. Cathedral'),(1004,'sChurchAddress','123 Main St'),(1005,'sChurchCity','Kansas City'),(1006,'sChurchState','MO'),(1007,'sChurchZip','64106'),(1008,'sChurchPhone','555 123 4234'),(1009,'sChurchEmail','demo@churchcrm.io'),(1010,'sHomeAreaCode','555'),(1014,'sTaxSigner','Elder Joe Smith'),(1016,'sReminderSigner','Elder Joe Smith'),(1025,'sConfirmSigner','Elder Joe Smith'),(1027,'sPledgeSummary2','as of'),(1028,'sDirectoryDisclaimer1','Every effort was made to insure the accuracy of this directory. If there are any errors or omissions, please contact the church office.This directory is for the use of the people of'),(1034,'sChurchChkAcctNum','111111111'),(1035,'bEnableGravatarPhotos','1'),(1037,'sExternalBackupType','WebDAV'),(1046,'sLastIntegrityCheckTimeStamp','20240713-172311'),(1047,'sChurchCountry','United States'),(2010,'bAllowEmptyLastName',''),(2017,'bEnableExternalCalendarAPI',''),(2045,'bPHPMailerAutoTLS',''),(2046,'sPHPMailerSMTPSecure',''),(2050,'bEnabledMenuLinks',''),(2060,'IncludeDataInNewPersonNotifications',''),(2061,'bSearchIncludeFamilyCustomProperties',''),(2062,'bBackupExtraneousImages',''),(2064,'sLastSoftwareUpdateCheckTimeStamp','20240713-172312'),(2065,'bAllowPrereleaseUpgrade',''),(2069,'bRequire2FA',''),(2071,'bSendUserDeletedEmail',''),(20142,'bHSTSEnable',''); /*!40000 ALTER TABLE `config_cfg` ENABLE KEYS */; UNLOCK TABLES; COMMIT; @@ -700,8 +661,6 @@ CREATE TABLE `family_fam` ( `fam_scanCredit` text DEFAULT NULL, `fam_SendNewsLetter` enum('FALSE','TRUE') NOT NULL DEFAULT 'FALSE', `fam_DateDeactivated` date DEFAULT NULL, - `fam_OkToCanvass` enum('FALSE','TRUE') NOT NULL DEFAULT 'FALSE', - `fam_Canvasser` smallint(5) unsigned NOT NULL DEFAULT 0, `fam_Latitude` double DEFAULT NULL, `fam_Longitude` double DEFAULT NULL, `fam_Envelope` mediumint(9) NOT NULL DEFAULT 0, @@ -716,7 +675,7 @@ CREATE TABLE `family_fam` ( LOCK TABLES `family_fam` WRITE; /*!40000 ALTER TABLE `family_fam` DISABLE KEYS */; SET autocommit=0; -INSERT INTO `family_fam` VALUES (1,'Campbell','3259 Daisy Dr','','Denton','AR','','United States','(728) 139-0768','','','',NULL,'2009-12-25 07:19:06','2016-11-19 15:50:57',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,33.174318,-97.0673599,0),(2,'Hart','4878 Valley View Ln','','Grand Rapids','ND','','United States','(042) 989-4488','','','',NULL,'2009-04-13 01:17:12','2016-11-19 15:53:10',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,47.9132828,-97.0864844,0),(3,'Lewis','2379 Northaven Rd','','Detroit','WV','','United States','(609) 441-0871','','','','2010-02-10','2007-11-19 10:08:41','2017-04-15 17:21:40',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(4,'Ray','4212 Parker Rd','','Chesapeake','WI','','US','(220) 345-1335','','','',NULL,'2003-10-14 16:05:17','2021-04-25 21:36:43',1,1,NULL,NULL,'FALSE','2017-04-15','FALSE',0,36.7001267,-76.2568083,0),(5,'Smith','5572 Robinson Rd','','Santa Clarita','KY','','United States','(886) 863-1106','','','','2016-09-12','2007-09-14 23:32:06','2017-04-15 17:22:04',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(6,'Dixon','6730 Mockingbird Hill','','Roanoke','IL','','United States','(449) 349-7865','','','',NULL,'2013-07-25 20:18:03','2016-11-19 15:52:44',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,37.316406,-79.8874658,0),(7,'Stewart','7045 Wycliff Ave','','Gainesville','SD','','United States','(813) 837-2427','','','',NULL,'2011-08-17 04:00:29','2016-11-19 15:56:55',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,0,0,0),(9,'Diaz','1158 Harrison Ct','','Hialeah','IA','','United States','(613) 399-6088','','','',NULL,'2013-04-20 15:01:05','2016-11-19 15:52:17',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,33.4447804,-112.0542146,0),(10,'Gordon','1255 Brown Terrace','','Louisville','MI','','United States','(215) 006-0420','','','','2011-07-13','2004-09-09 18:40:30','2019-09-11 23:04:11',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(11,'Newman','5427 Stevens Creek Blvd','','Orlando','MN','','United States','(792) 676-7007','','','',NULL,'2006-10-11 03:51:16','2016-11-19 15:54:22',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,46.729553,-94.6858998,0),(12,'Olson','1272 Shady Ln Dr','','Toledo','NE','','United States','(698) 235-3995','','','',NULL,'2014-08-31 04:21:43','2016-11-19 15:54:30',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,41.6932406,-83.5833554,0),(13,'Beck','6381 Valwood Pkwy','','Buffalo','ME','','United States','(237) 926-6342','','','','2010-07-22','2007-02-01 16:50:26','2016-11-19 15:49:36',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,46.8269852,-68.4858767,0),(14,'Berry','1931 Edwards Rd','','Riverside','PA','','United States','(174) 272-0341','','','',NULL,'2013-10-15 09:25:25','2016-11-19 15:49:57',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,40.0537096,-74.94436,0),(16,'Larson','3866 Edwards Rd','','Inglewood','CO','','United States','(663) 858-8880','','','',NULL,'2016-03-01 14:19:32','2016-11-19 15:53:48',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,29.3912942,-98.5103497,0),(17,'Cooper','1782 Daisy Dr','','Oxnard','GA','','United States','(718) 878-3276','','','',NULL,'2014-09-26 00:09:54','2016-11-19 15:51:35',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,34.2769999,-119.1552968,0),(18,'Riley','1403 Avondale Ave','','Scottsdale','ID','','United States','(055) 343-0760','','','','2010-12-22','2002-04-09 05:31:36','2016-11-19 16:43:48',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,33.4351234,-112.3063973,0),(19,'Kennedy','9481 Wycliff Ave','','Long Beach','KY','','United States','(306) 408-4342','','','',NULL,'2014-11-23 09:17:25','2016-11-19 15:53:40',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,37.8393332,-84.2700179,0),(20,'Black','4307 Avondale Ave','','Shiloh','CT','','United States','(828) 463-5829','','','',NULL,'2014-05-10 06:07:19','2016-11-19 15:50:25',1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,33.4250486,-112.3982715,0),(21,'Smith','123 Main St.','','Seattle','WA','98121','US','(206) 555-5555','','','',NULL,'2017-04-15 17:19:26','2021-04-25 09:45:44',-1,1,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(22,'Troy942274','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 10:24:12',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(23,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 10:50:11',NULL,-1,0,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(24,'Troy786080','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 10:54:55',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(25,'Troy961022','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:35:39',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(26,'Troy516502','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:41:04',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(27,'Troy409842','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:45:41',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(28,'Troy543267','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:47:38',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(29,'Troy408868','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:48:31',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(30,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 13:13:24',NULL,-1,0,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(31,'Troy490520','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 13:15:57',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(32,'Troy303237','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 16:24:31',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(33,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 16:55:43',NULL,-1,0,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(34,'Troy762409','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 16:58:11',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(35,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 17:24:16',NULL,-1,0,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(36,'Troy160814','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 17:29:15',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(37,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 17:37:18',NULL,-1,0,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(38,'Troy927699','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 17:39:21',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(39,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 20:05:48',NULL,-1,0,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(40,'Troy789764','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 20:07:53',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(41,'Troy46414','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 21:41:31',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(42,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 21:52:35',NULL,-1,0,NULL,NULL,'FALSE',NULL,'FALSE',0,NULL,NULL,0),(43,'Troy549983','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 21:55:18',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0),(44,'Troy228890','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 22:48:59',NULL,3,0,NULL,NULL,'TRUE',NULL,'FALSE',0,0,0,0); +INSERT INTO `family_fam` VALUES (1,'Campbell','3259 Daisy Dr','','Denton','AR','','United States','(728) 139-0768','','','',NULL,'2009-12-25 07:19:06','2016-11-19 15:50:57',1,1,NULL,NULL,'FALSE',NULL,33.174318,-97.0673599,0),(2,'Hart','4878 Valley View Ln','','Grand Rapids','ND','','United States','(042) 989-4488','','','',NULL,'2009-04-13 01:17:12','2016-11-19 15:53:10',1,1,NULL,NULL,'FALSE',NULL,47.9132828,-97.0864844,0),(3,'Lewis','2379 Northaven Rd','','Detroit','WV','','United States','(609) 441-0871','','','','2010-02-10','2007-11-19 10:08:41','2017-04-15 17:21:40',1,1,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(4,'Ray','4212 Parker Rd','','Chesapeake','WI','','US','(220) 345-1335','','','',NULL,'2003-10-14 16:05:17','2021-04-25 21:36:43',1,1,NULL,NULL,'FALSE','2017-04-15',36.7001267,-76.2568083,0),(5,'Smith','5572 Robinson Rd','','Santa Clarita','KY','','United States','(886) 863-1106','','','','2016-09-12','2007-09-14 23:32:06','2017-04-15 17:22:04',1,1,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(6,'Dixon','6730 Mockingbird Hill','','Roanoke','IL','','United States','(449) 349-7865','','','',NULL,'2013-07-25 20:18:03','2016-11-19 15:52:44',1,1,NULL,NULL,'FALSE',NULL,37.316406,-79.8874658,0),(7,'Stewart','7045 Wycliff Ave','','Gainesville','SD','','United States','(813) 837-2427','','','',NULL,'2011-08-17 04:00:29','2016-11-19 15:56:55',1,1,NULL,NULL,'FALSE',NULL,0,0,0),(9,'Diaz','1158 Harrison Ct','','Hialeah','IA','','United States','(613) 399-6088','','','',NULL,'2013-04-20 15:01:05','2016-11-19 15:52:17',1,1,NULL,NULL,'FALSE',NULL,33.4447804,-112.0542146,0),(10,'Gordon','1255 Brown Terrace','','Louisville','MI','','United States','(215) 006-0420','','','','2011-07-13','2004-09-09 18:40:30','2019-09-11 23:04:11',1,1,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(11,'Newman','5427 Stevens Creek Blvd','','Orlando','MN','','United States','(792) 676-7007','','','',NULL,'2006-10-11 03:51:16','2016-11-19 15:54:22',1,1,NULL,NULL,'FALSE',NULL,46.729553,-94.6858998,0),(12,'Olson','1272 Shady Ln Dr','','Toledo','NE','','United States','(698) 235-3995','','','',NULL,'2014-08-31 04:21:43','2016-11-19 15:54:30',1,1,NULL,NULL,'FALSE',NULL,41.6932406,-83.5833554,0),(13,'Beck','6381 Valwood Pkwy','','Buffalo','ME','','United States','(237) 926-6342','','','','2010-07-22','2007-02-01 16:50:26','2016-11-19 15:49:36',1,1,NULL,NULL,'FALSE',NULL,46.8269852,-68.4858767,0),(14,'Berry','1931 Edwards Rd','','Riverside','PA','','United States','(174) 272-0341','','','',NULL,'2013-10-15 09:25:25','2016-11-19 15:49:57',1,1,NULL,NULL,'FALSE',NULL,40.0537096,-74.94436,0),(16,'Larson','3866 Edwards Rd','','Inglewood','CO','','United States','(663) 858-8880','','','',NULL,'2016-03-01 14:19:32','2016-11-19 15:53:48',1,1,NULL,NULL,'FALSE',NULL,29.3912942,-98.5103497,0),(17,'Cooper','1782 Daisy Dr','','Oxnard','GA','','United States','(718) 878-3276','','','',NULL,'2014-09-26 00:09:54','2016-11-19 15:51:35',1,1,NULL,NULL,'FALSE',NULL,34.2769999,-119.1552968,0),(18,'Riley','1403 Avondale Ave','','Scottsdale','ID','','United States','(055) 343-0760','','','','2010-12-22','2002-04-09 05:31:36','2016-11-19 16:43:48',1,1,NULL,NULL,'FALSE',NULL,33.4351234,-112.3063973,0),(19,'Kennedy','9481 Wycliff Ave','','Long Beach','KY','','United States','(306) 408-4342','','','',NULL,'2014-11-23 09:17:25','2016-11-19 15:53:40',1,1,NULL,NULL,'FALSE',NULL,37.8393332,-84.2700179,0),(20,'Black','4307 Avondale Ave','','Shiloh','CT','','United States','(828) 463-5829','','','',NULL,'2014-05-10 06:07:19','2016-11-19 15:50:25',1,1,NULL,NULL,'FALSE',NULL,33.4250486,-112.3982715,0),(21,'Smith','123 Main St.','','Seattle','WA','98121','US','(206) 555-5555','','','',NULL,'2017-04-15 17:19:26','2021-04-25 09:45:44',-1,1,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(22,'Troy942274','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 10:24:12',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(23,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 10:50:11',NULL,-1,0,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(24,'Troy786080','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 10:54:55',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(25,'Troy961022','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:35:39',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(26,'Troy516502','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:41:04',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(27,'Troy409842','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:45:41',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(28,'Troy543267','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:47:38',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(29,'Troy408868','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 12:48:31',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(30,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 13:13:24',NULL,-1,0,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(31,'Troy490520','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 13:15:57',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(32,'Troy303237','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 16:24:31',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(33,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 16:55:43',NULL,-1,0,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(34,'Troy762409','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 16:58:11',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(35,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 17:24:16',NULL,-1,0,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(36,'Troy160814','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 17:29:15',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(37,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 17:37:18',NULL,-1,0,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(38,'Troy927699','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 17:39:21',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(39,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 20:05:48',NULL,-1,0,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(40,'Troy789764','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 20:07:53',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(41,'Troy46414','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 21:41:31',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(42,'Master','123 Main St.',NULL,'Kansas City','MO','98001','US','',NULL,NULL,NULL,NULL,'2021-04-25 21:52:35',NULL,-1,0,NULL,NULL,'FALSE',NULL,NULL,NULL,0),(43,'Troy549983','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 21:55:18',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0),(44,'Troy228890','4222 Clinton Way','','Los Angelas','CA','','US','','','','',NULL,'2021-04-25 22:48:59',NULL,3,0,NULL,NULL,'TRUE',NULL,0,0,0); /*!40000 ALTER TABLE `family_fam` ENABLE KEYS */; UNLOCK TABLES; COMMIT; @@ -1329,12 +1288,12 @@ CREATE TABLE `list_lst` ( LOCK TABLES `list_lst` WRITE; /*!40000 ALTER TABLE `list_lst` DISABLE KEYS */; SET autocommit=0; -INSERT INTO `list_lst` VALUES (1,1,1,'Member'),(1,2,2,'Regular Attender'),(1,3,3,'Guest'),(1,5,4,'Non-Attender'),(1,4,5,'Non-Attender (staff)'),(2,1,1,'Head of Household'),(2,2,2,'Spouse'),(2,3,3,'Child'),(2,4,4,'Other Relative'),(2,5,5,'Non Relative'),(3,1,1,'Ministry'),(3,2,2,'Team'),(3,3,3,'Bible Study'),(3,4,4,'Sunday School Class'),(4,1,1,'True / False'),(4,2,2,'Date'),(4,3,3,'Text Field (50 char)'),(4,4,4,'Text Field (100 char)'),(4,5,5,'Text Field (Long)'),(4,6,6,'Year'),(4,7,7,'Season'),(4,8,8,'Number'),(4,9,9,'Person from Group'),(4,10,10,'Money'),(4,11,11,'Phone Number'),(4,12,12,'Custom Drop-Down List'),(5,1,1,'bAll'),(5,2,2,'bAdmin'),(5,3,3,'bAddRecords'),(5,4,4,'bEditRecords'),(5,5,5,'bDeleteRecords'),(5,7,7,'bManageGroups'),(5,8,8,'bFinance'),(5,9,9,'bNotes'),(5,11,11,'bCanvasser'),(10,1,1,'Teacher'),(10,2,2,'Student'),(11,1,1,'Member'),(12,1,1,'Teacher'),(12,2,2,'Student'),(13,1,1,'Teacher'),(13,2,2,'Student'),(14,1,1,'Teacher'),(14,2,2,'Student'),(15,1,1,'Teacher'),(15,2,2,'Student'),(16,1,1,'Teacher'),(16,2,2,'Student'),(17,1,1,'Teacher'),(17,2,2,'Student'),(18,1,1,'Teacher'),(18,2,2,'Student'),(19,1,1,'Member'),(20,1,1,'Member'),(21,1,1,'Member'),(3,5,5,'Scouts'),(22,1,1,'Member'),(23,1,1,'Member'),(24,1,1,'Default Option'),(24,2,2,'My Custom Item 1'),(24,3,3,'My Custom Item 2'),(25,1,1,'Default Option'),(26,1,1,'Member'),(27,1,1,'Member'),(28,1,1,'Member'),(29,1,1,'Member'),(30,1,1,'Member'),(31,1,1,'Member'),(32,1,1,'Member'),(33,1,1,'Member'),(34,1,1,'Member'),(35,1,1,'Member'),(36,1,1,'Member'),(37,1,2,'Member'),(37,2,1,'sdfsdf'); +INSERT INTO `list_lst` VALUES (1,1,1,'Member'),(1,2,2,'Regular Attender'),(1,3,3,'Guest'),(1,5,4,'Non-Attender'),(1,4,5,'Non-Attender (staff)'),(2,1,1,'Head of Household'),(2,2,2,'Spouse'),(2,3,3,'Child'),(2,4,4,'Other Relative'),(2,5,5,'Non Relative'),(3,1,1,'Ministry'),(3,2,2,'Team'),(3,3,3,'Bible Study'),(3,4,4,'Sunday School Class'),(4,1,1,'True / False'),(4,2,2,'Date'),(4,3,3,'Text Field (50 char)'),(4,4,4,'Text Field (100 char)'),(4,5,5,'Text Field (Long)'),(4,6,6,'Year'),(4,7,7,'Season'),(4,8,8,'Number'),(4,9,9,'Person from Group'),(4,10,10,'Money'),(4,11,11,'Phone Number'),(4,12,12,'Custom Drop-Down List'),(5,1,1,'bAll'),(5,2,2,'bAdmin'),(5,3,3,'bAddRecords'),(5,4,4,'bEditRecords'),(5,5,5,'bDeleteRecords'),(5,7,7,'bManageGroups'),(5,8,8,'bFinance'),(5,9,9,'bNotes'),(10,1,1,'Teacher'),(10,2,2,'Student'),(11,1,1,'Member'),(12,1,1,'Teacher'),(12,2,2,'Student'),(13,1,1,'Teacher'),(13,2,2,'Student'),(14,1,1,'Teacher'),(14,2,2,'Student'),(15,1,1,'Teacher'),(15,2,2,'Student'),(16,1,1,'Teacher'),(16,2,2,'Student'),(17,1,1,'Teacher'),(17,2,2,'Student'),(18,1,1,'Teacher'),(18,2,2,'Student'),(19,1,1,'Member'),(20,1,1,'Member'),(21,1,1,'Member'),(3,5,5,'Scouts'),(22,1,1,'Member'),(23,1,1,'Member'),(24,1,1,'Default Option'),(24,2,2,'My Custom Item 1'),(24,3,3,'My Custom Item 2'),(25,1,1,'Default Option'),(26,1,1,'Member'),(27,1,1,'Member'),(28,1,1,'Member'),(29,1,1,'Member'),(30,1,1,'Member'),(31,1,1,'Member'),(32,1,1,'Member'),(33,1,1,'Member'),(34,1,1,'Member'),(35,1,1,'Member'),(36,1,1,'Member'),(37,1,2,'Member'),(37,2,1,'sdfsdf'); /*!40000 ALTER TABLE `list_lst` ENABLE KEYS */; UNLOCK TABLES; COMMIT; --- Dumped table `list_lst` with 75 row(s) +-- Dumped table `list_lst` with 74 row(s) -- -- @@ -1525,12 +1484,12 @@ CREATE TABLE `permissions` ( LOCK TABLES `permissions` WRITE; /*!40000 ALTER TABLE `permissions` DISABLE KEYS */; SET autocommit=0; -INSERT INTO `permissions` VALUES (1,'addPeople','Add People'),(3,'updatePeople','Update People'),(4,'deletePeopleRecords','Delete People Records'),(5,'curdProperties','Manage Properties '),(6,'crudClassifications','Manage Classifications'),(7,'crudGroups','Manage Groups'),(8,'crudRoles','Manage Roles'),(9,'crudDonations','Manage Donations'),(10,'curdFinance','Manage Finance'),(11,'curdNotes','Manage Notes'),(12,'canvasser','Canvasser volunteer'),(13,'editSelf','Edit own family only'),(14,'emailMailto','Allow to see Mailto Links'),(15,'createDirectory','Create Directories'),(16,'exportCSV','Export CSV files'),(18,'crudEvent','Manage Events'); +INSERT INTO `permissions` VALUES (1,'addPeople','Add People'),(3,'updatePeople','Update People'),(4,'deletePeopleRecords','Delete People Records'),(5,'curdProperties','Manage Properties '),(6,'crudClassifications','Manage Classifications'),(7,'crudGroups','Manage Groups'),(8,'crudRoles','Manage Roles'),(9,'crudDonations','Manage Donations'),(10,'curdFinance','Manage Finance'),(11,'curdNotes','Manage Notes'),(13,'editSelf','Edit own family only'),(14,'emailMailto','Allow to see Mailto Links'),(15,'createDirectory','Create Directories'),(16,'exportCSV','Export CSV files'),(18,'crudEvent','Manage Events'); /*!40000 ALTER TABLE `permissions` ENABLE KEYS */; UNLOCK TABLES; COMMIT; --- Dumped table `permissions` with 16 row(s) +-- Dumped table `permissions` with 15 row(s) -- -- @@ -1986,12 +1945,12 @@ CREATE TABLE `query_qry` ( LOCK TABLES `query_qry` WRITE; /*!40000 ALTER TABLE `query_qry` DISABLE KEYS */; SET autocommit=0; -INSERT INTO `query_qry` VALUES (3,'SELECT CONCAT(\'\',fam_Name,\'\') AS \'Family Name\', COUNT(*) AS \'No.\'\nFROM person_per\nINNER JOIN family_fam\nON fam_ID = per_fam_ID\nGROUP BY per_fam_ID\nORDER BY \'No.\' DESC','Family Member Count','Returns each family and the total number of people assigned to them.',0),(4,'SELECT per_ID as AddToCart,CONCAT(\'\',per_FirstName,\'\r\n\',per_LastName,\'\') AS Name,\r\nCONCAT(per_BirthMonth,\'/\',per_BirthDay,\'/\',per_BirthYear) AS \'Birth Date\',\r\nDATE_FORMAT(FROM_DAYS(TO_DAYS(NOW())-TO_DAYS(CONCAT(per_BirthYear,\'-\',per_BirthMonth,\'-\',per_BirthDay))),\'%Y\')+0 AS \'Age\'\r\nFROM person_per\r\nWHERE\r\nDATE_ADD(CONCAT(per_BirthYear,\'-\',per_BirthMonth,\'-\',per_BirthDay),INTERVAL\r\n~min~ YEAR) <= CURDATE()\r\nAND\r\nDATE_ADD(CONCAT(per_BirthYear,\'-\',per_BirthMonth,\'-\',per_BirthDay),INTERVAL\r\n(~max~ + 1) YEAR) >= CURDATE()','Person by Age','Returns any person records with ages between two given ages.',1),(6,'SELECT COUNT(per_ID) AS Total FROM person_per WHERE per_Gender = ~gender~','Total By Gender','Total of records matching a given gender.',0),(7,'SELECT per_ID as AddToCart, CONCAT(per_FirstName,\' \',per_LastName) AS Name FROM person_per WHERE per_fmr_ID = ~role~ AND per_Gender = ~gender~','Person by Role and Gender','Selects person records with the family role and gender specified.',1),(9,'SELECT \r\nper_ID as AddToCart, \r\nCONCAT(per_FirstName,\' \',per_LastName) AS Name, \r\nCONCAT(r2p_Value,\' \') AS Value\r\nFROM person_per,record2property_r2p\r\nWHERE per_ID = r2p_record_ID\r\nAND r2p_pro_ID = ~PropertyID~\r\nORDER BY per_LastName','Person by Property','Returns person records which are assigned the given property.',1),(15,'SELECT per_ID as AddToCart, CONCAT(\'\',COALESCE(`per_FirstName`,\'\'),\' \',COALESCE(`per_MiddleName`,\'\'),\' \',COALESCE(`per_LastName`,\'\'),\'\') AS Name, fam_City as City, fam_State as State, fam_Zip as ZIP, per_HomePhone as HomePhone, per_Email as Email, per_WorkEmail as WorkEmail FROM person_per RIGHT JOIN family_fam ON family_fam.fam_id = person_per.per_fam_id WHERE ~searchwhat~ LIKE \'%~searchstring~%\'','Advanced Search','Search by any part of Name, City, State, Zip, Home Phone, Email, or Work Email.',1),(18,'SELECT per_ID as AddToCart, per_BirthDay as Day, CONCAT(per_FirstName,\' \',per_LastName) AS Name FROM person_per WHERE per_cls_ID=~percls~ AND per_BirthMonth=~birthmonth~ ORDER BY per_BirthDay','Birthdays','People with birthdays in a particular month',0),(21,'SELECT per_ID as AddToCart, CONCAT(\'\',per_FirstName,\' \',per_LastName,\'\') AS Name FROM person_per LEFT JOIN person2group2role_p2g2r ON per_id = p2g2r_per_ID WHERE p2g2r_grp_ID=~group~ ORDER BY per_LastName','Registered students','Find Registered students',1),(22,'SELECT per_ID as AddToCart, DAYOFMONTH(per_MembershipDate) as Day, per_MembershipDate AS DATE, CONCAT(per_FirstName,\' \',per_LastName) AS Name FROM person_per WHERE per_cls_ID=1 AND MONTH(per_MembershipDate)=~membermonth~ ORDER BY per_MembershipDate','Membership anniversaries','Members who joined in a particular month',0),(23,'SELECT usr_per_ID as AddToCart, CONCAT(a.per_FirstName,\' \',a.per_LastName) AS Name FROM user_usr LEFT JOIN person_per a ON per_ID=usr_per_ID ORDER BY per_LastName','Select database users','People who are registered as database users',0),(24,'SELECT per_ID as AddToCart, CONCAT(\'\',per_FirstName,\' \',per_LastName,\'\') AS Name FROM person_per WHERE per_cls_id =1','Select all members','People who are members',0),(25,'SELECT per_ID as AddToCart, CONCAT(\'\',per_FirstName,\' \',per_LastName,\'\') AS Name FROM person_per LEFT JOIN person2volunteeropp_p2vo ON per_id = p2vo_per_ID WHERE p2vo_vol_ID = ~volopp~ ORDER BY per_LastName','Volunteers','Find volunteers for a particular opportunity',1),(26,'SELECT per_ID as AddToCart, CONCAT(per_FirstName,\' \',per_LastName) AS Name FROM person_per WHERE DATE_SUB(NOW(),INTERVAL ~friendmonths~ MONTH)3 AND fam_OkToCanvass=\"TRUE\" ORDER BY fam_Zip','Families to Canvass','People in families that are ok to canvass.',0),(28,'SELECT fam_Name, a.plg_amount as PlgFY1, b.plg_amount as PlgFY2 from family_fam left join pledge_plg a on a.plg_famID = fam_ID and a.plg_FYID=~fyid1~ and a.plg_PledgeOrPayment=\'Pledge\' left join pledge_plg b on b.plg_famID = fam_ID and b.plg_FYID=~fyid2~ and b.plg_PledgeOrPayment=\'Pledge\' order by fam_Name','Pledge comparison','Compare pledges between two fiscal years',1),(30,'SELECT per_ID as AddToCart, CONCAT(per_FirstName,\' \',per_LastName) AS Name, fam_address1, fam_city, fam_state, fam_zip FROM person_per join family_fam on per_fam_id=fam_id where per_fmr_id<>3 and per_fam_id in (select fam_id from family_fam inner join pledge_plg a on a.plg_famID=fam_ID and a.plg_FYID=~fyid1~ and a.plg_amount>0) and per_fam_id not in (select fam_id from family_fam inner join pledge_plg b on b.plg_famID=fam_ID and b.plg_FYID=~fyid2~ and b.plg_amount>0)','Missing pledges','Find people who pledged one year but not another',1),(31,'select per_ID as AddToCart, per_FirstName, per_LastName, per_email from person_per, autopayment_aut where aut_famID=per_fam_ID and aut_CreditCard!=\"\" and per_email!=\"\" and (per_fmr_ID=1 or per_fmr_ID=2 or per_cls_ID=1)','Credit Card People','People who are configured to pay by credit card.',0),(32,'SELECT fam_Name, fam_Envelope, b.fun_Name as Fund_Name, a.plg_amount as Pledge from family_fam left join pledge_plg a on a.plg_famID = fam_ID and a.plg_FYID=~fyid~ and a.plg_PledgeOrPayment=\'Pledge\' and a.plg_amount>0 join donationfund_fun b on b.fun_ID = a.plg_fundID order by fam_Name, a.plg_fundID','Family Pledge by Fiscal Year','Pledge summary by family name for each fund for the selected fiscal year',1),(100,'SELECT a.per_ID as AddToCart, CONCAT(\'\',a.per_FirstName,\' \',a.per_LastName,\'\') AS Name FROM person_per AS a LEFT JOIN person2volunteeropp_p2vo p2v1 ON (a.per_id = p2v1.p2vo_per_ID AND p2v1.p2vo_vol_ID = ~volopp1~) LEFT JOIN person2volunteeropp_p2vo p2v2 ON (a.per_id = p2v2.p2vo_per_ID AND p2v2.p2vo_vol_ID = ~volopp2~) WHERE p2v1.p2vo_per_ID=p2v2.p2vo_per_ID ORDER BY per_LastName','Volunteers','Find volunteers for who match two specific opportunity codes',1),(200,'SELECT a.per_ID as AddToCart, CONCAT(\'\',a.per_FirstName,\' \',a.per_LastName,\'\') AS Name FROM person_per AS a LEFT JOIN person_custom pc ON a.per_id = pc.per_ID WHERE pc.~custom~=\'~value~\' ORDER BY per_LastName','CustomSearch','Find people with a custom field value',1); +INSERT INTO `query_qry` VALUES (3,'SELECT CONCAT(\'\',fam_Name,\'\') AS \'Family Name\', COUNT(*) AS \'No.\'\nFROM person_per\nINNER JOIN family_fam\nON fam_ID = per_fam_ID\nGROUP BY per_fam_ID\nORDER BY \'No.\' DESC','Family Member Count','Returns each family and the total number of people assigned to them.',0),(4,'SELECT per_ID as AddToCart,CONCAT(\'\',per_FirstName,\'\r\n\',per_LastName,\'\') AS Name,\r\nCONCAT(per_BirthMonth,\'/\',per_BirthDay,\'/\',per_BirthYear) AS \'Birth Date\',\r\nDATE_FORMAT(FROM_DAYS(TO_DAYS(NOW())-TO_DAYS(CONCAT(per_BirthYear,\'-\',per_BirthMonth,\'-\',per_BirthDay))),\'%Y\')+0 AS \'Age\'\r\nFROM person_per\r\nWHERE\r\nDATE_ADD(CONCAT(per_BirthYear,\'-\',per_BirthMonth,\'-\',per_BirthDay),INTERVAL\r\n~min~ YEAR) <= CURDATE()\r\nAND\r\nDATE_ADD(CONCAT(per_BirthYear,\'-\',per_BirthMonth,\'-\',per_BirthDay),INTERVAL\r\n(~max~ + 1) YEAR) >= CURDATE()','Person by Age','Returns any person records with ages between two given ages.',1),(6,'SELECT COUNT(per_ID) AS Total FROM person_per WHERE per_Gender = ~gender~','Total By Gender','Total of records matching a given gender.',0),(7,'SELECT per_ID as AddToCart, CONCAT(per_FirstName,\' \',per_LastName) AS Name FROM person_per WHERE per_fmr_ID = ~role~ AND per_Gender = ~gender~','Person by Role and Gender','Selects person records with the family role and gender specified.',1),(9,'SELECT \r\nper_ID as AddToCart, \r\nCONCAT(per_FirstName,\' \',per_LastName) AS Name, \r\nCONCAT(r2p_Value,\' \') AS Value\r\nFROM person_per,record2property_r2p\r\nWHERE per_ID = r2p_record_ID\r\nAND r2p_pro_ID = ~PropertyID~\r\nORDER BY per_LastName','Person by Property','Returns person records which are assigned the given property.',1),(15,'SELECT per_ID as AddToCart, CONCAT(\'\',COALESCE(`per_FirstName`,\'\'),\' \',COALESCE(`per_MiddleName`,\'\'),\' \',COALESCE(`per_LastName`,\'\'),\'\') AS Name, fam_City as City, fam_State as State, fam_Zip as ZIP, per_HomePhone as HomePhone, per_Email as Email, per_WorkEmail as WorkEmail FROM person_per RIGHT JOIN family_fam ON family_fam.fam_id = person_per.per_fam_id WHERE ~searchwhat~ LIKE \'%~searchstring~%\'','Advanced Search','Search by any part of Name, City, State, Zip, Home Phone, Email, or Work Email.',1),(18,'SELECT per_ID as AddToCart, per_BirthDay as Day, CONCAT(per_FirstName,\' \',per_LastName) AS Name FROM person_per WHERE per_cls_ID=~percls~ AND per_BirthMonth=~birthmonth~ ORDER BY per_BirthDay','Birthdays','People with birthdays in a particular month',0),(21,'SELECT per_ID as AddToCart, CONCAT(\'\',per_FirstName,\' \',per_LastName,\'\') AS Name FROM person_per LEFT JOIN person2group2role_p2g2r ON per_id = p2g2r_per_ID WHERE p2g2r_grp_ID=~group~ ORDER BY per_LastName','Registered students','Find Registered students',1),(22,'SELECT per_ID as AddToCart, DAYOFMONTH(per_MembershipDate) as Day, per_MembershipDate AS DATE, CONCAT(per_FirstName,\' \',per_LastName) AS Name FROM person_per WHERE per_cls_ID=1 AND MONTH(per_MembershipDate)=~membermonth~ ORDER BY per_MembershipDate','Membership anniversaries','Members who joined in a particular month',0),(23,'SELECT usr_per_ID as AddToCart, CONCAT(a.per_FirstName,\' \',a.per_LastName) AS Name FROM user_usr LEFT JOIN person_per a ON per_ID=usr_per_ID ORDER BY per_LastName','Select database users','People who are registered as database users',0),(24,'SELECT per_ID as AddToCart, CONCAT(\'\',per_FirstName,\' \',per_LastName,\'\') AS Name FROM person_per WHERE per_cls_id =1','Select all members','People who are members',0),(25,'SELECT per_ID as AddToCart, CONCAT(\'\',per_FirstName,\' \',per_LastName,\'\') AS Name FROM person_per LEFT JOIN person2volunteeropp_p2vo ON per_id = p2vo_per_ID WHERE p2vo_vol_ID = ~volopp~ ORDER BY per_LastName','Volunteers','Find volunteers for a particular opportunity',1),(26,'SELECT per_ID as AddToCart, CONCAT(per_FirstName,\' \',per_LastName) AS Name FROM person_per WHERE DATE_SUB(NOW(),INTERVAL ~friendmonths~ MONTH)3 and per_fam_id in (select fam_id from family_fam inner join pledge_plg a on a.plg_famID=fam_ID and a.plg_FYID=~fyid1~ and a.plg_amount>0) and per_fam_id not in (select fam_id from family_fam inner join pledge_plg b on b.plg_famID=fam_ID and b.plg_FYID=~fyid2~ and b.plg_amount>0)','Missing pledges','Find people who pledged one year but not another',1),(31,'select per_ID as AddToCart, per_FirstName, per_LastName, per_email from person_per, autopayment_aut where aut_famID=per_fam_ID and aut_CreditCard!=\"\" and per_email!=\"\" and (per_fmr_ID=1 or per_fmr_ID=2 or per_cls_ID=1)','Credit Card People','People who are configured to pay by credit card.',0),(32,'SELECT fam_Name, fam_Envelope, b.fun_Name as Fund_Name, a.plg_amount as Pledge from family_fam left join pledge_plg a on a.plg_famID = fam_ID and a.plg_FYID=~fyid~ and a.plg_PledgeOrPayment=\'Pledge\' and a.plg_amount>0 join donationfund_fun b on b.fun_ID = a.plg_fundID order by fam_Name, a.plg_fundID','Family Pledge by Fiscal Year','Pledge summary by family name for each fund for the selected fiscal year',1),(100,'SELECT a.per_ID as AddToCart, CONCAT(\'\',a.per_FirstName,\' \',a.per_LastName,\'\') AS Name FROM person_per AS a LEFT JOIN person2volunteeropp_p2vo p2v1 ON (a.per_id = p2v1.p2vo_per_ID AND p2v1.p2vo_vol_ID = ~volopp1~) LEFT JOIN person2volunteeropp_p2vo p2v2 ON (a.per_id = p2v2.p2vo_per_ID AND p2v2.p2vo_vol_ID = ~volopp2~) WHERE p2v1.p2vo_per_ID=p2v2.p2vo_per_ID ORDER BY per_LastName','Volunteers','Find volunteers for who match two specific opportunity codes',1),(200,'SELECT a.per_ID as AddToCart, CONCAT(\'\',a.per_FirstName,\' \',a.per_LastName,\'\') AS Name FROM person_per AS a LEFT JOIN person_custom pc ON a.per_id = pc.per_ID WHERE pc.~custom~=\'~value~\' ORDER BY per_LastName','CustomSearch','Find people with a custom field value',1); /*!40000 ALTER TABLE `query_qry` ENABLE KEYS */; UNLOCK TABLES; COMMIT; --- Dumped table `query_qry` with 20 row(s) +-- Dumped table `query_qry` with 19 row(s) -- -- @@ -2235,7 +2194,6 @@ CREATE TABLE `user_usr` ( `usr_CalNoSchool7` date DEFAULT NULL, `usr_CalNoSchool8` date DEFAULT NULL, `usr_SearchFamily` tinyint(3) DEFAULT NULL, - `usr_Canvasser` tinyint(3) NOT NULL DEFAULT 0, `usr_TwoFactorAuthSecret` varchar(255) DEFAULT NULL, `usr_TwoFactorAuthLastKeyTimestamp` int(11) DEFAULT NULL, `usr_TwoFactorAuthRecoveryCodes` text DEFAULT NULL, @@ -2252,7 +2210,7 @@ CREATE TABLE `user_usr` ( LOCK TABLES `user_usr` WRITE; /*!40000 ALTER TABLE `user_usr` DISABLE KEYS */; SET autocommit=0; -INSERT INTO `user_usr` VALUES (1,'4bdf3fba58c956fc3991a1fde84929223f968e2853de596e49ae80a91499609b',0,'2024-04-25 14:51:54',366,0,0,0,0,0,0,0,0,1,10,'skin-red',1,1,'2016-01-01',23,5,'Admin','ajGwpy8Pdai22XDUpqjC5Ob04v0eG7EGgb4vz2bD2juT8YDmfM',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL),(3,'6d6abba93a4ea780f575e39b2ef6281357dd4e0b1a74ff3f459ee52fbb6614d8',0,'2022-12-29 18:40:16',0,0,1,1,1,1,1,1,1,0,10,'skin-yellow-light',0,0,'2016-01-01',26,0,'tony.wade@example.com','JZJApQ9XOnF7nvupWZlTWBRrqMtHE9eNcWBTUzEWGqL4Sdqp6C',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL),(95,'ed7162b5a395e9ba3f9012eda6e9d2150d5ab76cdb082dc4a1422b4f2da2d102',1,'2022-12-29 21:01:30',0,0,0,0,0,0,0,0,0,0,10,'skin-blue',0,0,'2016-01-01',26,0,'judith.matthews@example.com',NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL); +INSERT INTO `user_usr` VALUES (1,'4bdf3fba58c956fc3991a1fde84929223f968e2853de596e49ae80a91499609b',0,'2024-04-25 14:51:54',366,0,0,0,0,0,0,0,0,1,10,'skin-red',1,1,'2016-01-01',23,5,'Admin','ajGwpy8Pdai22XDUpqjC5Ob04v0eG7EGgb4vz2bD2juT8YDmfM',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL),(3,'6d6abba93a4ea780f575e39b2ef6281357dd4e0b1a74ff3f459ee52fbb6614d8',0,'2022-12-29 18:40:16',0,0,1,1,1,1,1,1,1,0,10,'skin-yellow-light',0,0,'2016-01-01',26,0,'tony.wade@example.com','JZJApQ9XOnF7nvupWZlTWBRrqMtHE9eNcWBTUzEWGqL4Sdqp6C',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(95,'ed7162b5a395e9ba3f9012eda6e9d2150d5ab76cdb082dc4a1422b4f2da2d102',1,'2022-12-29 21:01:30',0,0,0,0,0,0,0,0,0,0,10,'skin-blue',0,0,'2016-01-01',26,0,'judith.matthews@example.com',NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `user_usr` ENABLE KEYS */; UNLOCK TABLES; COMMIT; @@ -2274,7 +2232,7 @@ CREATE TABLE `version_ver` ( `ver_update_end` datetime DEFAULT NULL, PRIMARY KEY (`ver_ID`), UNIQUE KEY `ver_version` (`ver_version`) -) ENGINE=InnoDB AUTO_INCREMENT=35 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2284,12 +2242,12 @@ CREATE TABLE `version_ver` ( LOCK TABLES `version_ver` WRITE; /*!40000 ALTER TABLE `version_ver` DISABLE KEYS */; SET autocommit=0; -INSERT INTO `version_ver` VALUES (1,'3.5.0','2019-02-10 20:14:23',NULL),(2,'3.5.2','2019-09-10 22:54:56','2019-09-10 22:54:56'),(3,'3.5.4','2019-10-11 22:45:35','2019-10-11 22:45:35'),(4,'4.0.0','2020-06-16 13:11:20','2020-06-16 13:11:20'),(5,'4.1.0','2020-06-16 13:11:20','2020-06-16 13:11:21'),(6,'4.2.3','2020-10-17 01:46:16','2020-10-17 01:46:16'),(7,'4.3.1','2020-11-23 18:55:02','2020-11-23 18:55:02'),(8,'4.3.2','2020-12-10 01:57:09','2020-12-10 01:57:09'),(9,'4.4.0','2021-03-21 17:44:23','2021-03-21 17:44:23'),(10,'4.4.1','2021-05-09 13:58:09','2021-04-27 13:58:09'),(11,'4.4.2','2021-05-09 13:58:09','2021-04-27 13:58:09'),(12,'4.4.3','2021-05-09 13:58:09','2021-04-27 13:58:09'),(13,'4.4.4','2021-07-08 13:58:09','2021-07-08 13:58:09'),(14,'4.4.5','2021-07-09 13:58:09','2021-07-09 13:58:09'),(15,'4.5.0','2021-07-09 13:58:09','2021-09-03 13:58:09'),(16,'4.5.1','2022-12-03 14:02:00','2022-12-03 14:02:00'),(17,'4.5.2','2022-12-28 21:42:20','2022-12-28 21:42:20'),(18,'4.5.3','2023-01-01 20:32:08','2023-01-01 20:32:08'),(19,'5.0.0','2023-05-06 17:29:55','2023-05-06 17:29:55'),(20,'5.0.5','2023-10-21 19:04:42','2023-10-21 19:04:42'),(21,'5.1.0','2023-10-31 23:33:49','2023-10-31 23:33:49'),(22,'5.2.2','2023-11-05 12:28:43','2023-11-05 12:28:43'),(23,'5.2.3','2023-11-16 12:39:14','2023-11-16 12:39:14'),(24,'5.3.0','2023-11-18 11:10:21','2023-11-18 11:10:21'),(25,'5.3.1','2023-11-21 02:04:10','2023-11-21 02:04:10'),(27,'5.4.0','2023-12-03 20:27:58','2023-12-03 20:27:58'),(29,'5.4.3','2024-01-03 23:24:10','2024-01-03 23:24:10'),(30,'5.5.0','2024-01-03 23:43:18','2024-01-03 23:43:18'),(31,'5.6.0','2024-03-07 20:35:26','2024-03-07 20:35:26'),(32,'5.7.0','2024-03-08 11:58:40','2024-03-08 11:58:40'),(33,'5.8.0','2024-04-25 14:50:41','2024-04-25 14:50:41'),(34,'5.9.3','2024-06-15 18:05:02','2024-06-15 18:05:02'); +INSERT INTO `version_ver` VALUES (1,'3.5.0','2019-02-10 20:14:23',NULL),(2,'3.5.2','2019-09-10 22:54:56','2019-09-10 22:54:56'),(3,'3.5.4','2019-10-11 22:45:35','2019-10-11 22:45:35'),(4,'4.0.0','2020-06-16 13:11:20','2020-06-16 13:11:20'),(5,'4.1.0','2020-06-16 13:11:20','2020-06-16 13:11:21'),(6,'4.2.3','2020-10-17 01:46:16','2020-10-17 01:46:16'),(7,'4.3.1','2020-11-23 18:55:02','2020-11-23 18:55:02'),(8,'4.3.2','2020-12-10 01:57:09','2020-12-10 01:57:09'),(9,'4.4.0','2021-03-21 17:44:23','2021-03-21 17:44:23'),(10,'4.4.1','2021-05-09 13:58:09','2021-04-27 13:58:09'),(11,'4.4.2','2021-05-09 13:58:09','2021-04-27 13:58:09'),(12,'4.4.3','2021-05-09 13:58:09','2021-04-27 13:58:09'),(13,'4.4.4','2021-07-08 13:58:09','2021-07-08 13:58:09'),(14,'4.4.5','2021-07-09 13:58:09','2021-07-09 13:58:09'),(15,'4.5.0','2021-07-09 13:58:09','2021-09-03 13:58:09'),(16,'4.5.1','2022-12-03 14:02:00','2022-12-03 14:02:00'),(17,'4.5.2','2022-12-28 21:42:20','2022-12-28 21:42:20'),(18,'4.5.3','2023-01-01 20:32:08','2023-01-01 20:32:08'),(19,'5.0.0','2023-05-06 17:29:55','2023-05-06 17:29:55'),(20,'5.0.5','2023-10-21 19:04:42','2023-10-21 19:04:42'),(21,'5.1.0','2023-10-31 23:33:49','2023-10-31 23:33:49'),(22,'5.2.2','2023-11-05 12:28:43','2023-11-05 12:28:43'),(23,'5.2.3','2023-11-16 12:39:14','2023-11-16 12:39:14'),(24,'5.3.0','2023-11-18 11:10:21','2023-11-18 11:10:21'),(25,'5.3.1','2023-11-21 02:04:10','2023-11-21 02:04:10'),(27,'5.4.0','2023-12-03 20:27:58','2023-12-03 20:27:58'),(29,'5.4.3','2024-01-03 23:24:10','2024-01-03 23:24:10'),(30,'5.5.0','2024-01-03 23:43:18','2024-01-03 23:43:18'),(31,'5.6.0','2024-03-07 20:35:26','2024-03-07 20:35:26'),(32,'5.7.0','2024-03-08 11:58:40','2024-03-08 11:58:40'),(33,'5.8.0','2024-04-25 14:50:41','2024-04-25 14:50:41'),(35,'5.9.0','2024-07-13 17:23:00','2024-07-13 17:23:00'),(36,'5.10.0','2024-07-13 17:23:02','2024-07-13 17:23:02'); /*!40000 ALTER TABLE `version_ver` ENABLE KEYS */; UNLOCK TABLES; COMMIT; --- Dumped table `version_ver` with 32 row(s) +-- Dumped table `version_ver` with 33 row(s) -- -- @@ -2406,4 +2364,4 @@ DROP TABLE IF EXISTS `email_list`; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on: Sat, 15 Jun 2024 18:05:21 -0400 +-- Dump completed on: Sat, 13 Jul 2024 17:23:47 -0400 diff --git a/package-lock.json b/package-lock.json index cc7e3b2556..6e3124edcf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "churchcrm", - "version": "5.9.3", + "version": "5.10.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "churchcrm", - "version": "5.9.3", + "version": "5.10.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index a087ec25e4..95c98e0de8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "churchcrm", - "version": "5.9.3", + "version": "5.10.0", "description": "Free Church CRM Software", "repository": { "type": "git", diff --git a/src/composer.json b/src/composer.json index 1bd8dd2e03..39cff7c252 100644 --- a/src/composer.json +++ b/src/composer.json @@ -3,7 +3,7 @@ "description": "Free Church CRM Software", "license": "MIT", "type": "project", - "version": "5.9.3", + "version": "5.10.0", "keywords": [ "church", "crm" diff --git a/src/composer.lock b/src/composer.lock index 9c64c08e8a..2fe09bdc89 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ab99604cd76ec6604f44ce2d7fe44324", + "content-hash": "590ade05aea84d8829927978ab6e47d8", "packages": [ { "name": "azuyalabs/yasumi", diff --git a/src/mysql/upgrade.json b/src/mysql/upgrade.json index 5c0373dd98..f7fca4bfe3 100644 --- a/src/mysql/upgrade.json +++ b/src/mysql/upgrade.json @@ -391,11 +391,10 @@ "versions": [ "5.9.0", "5.9.1", - "5.9.2" + "5.9.2", + "5.9.3" ], - "scripts": [ - - ], - "dbVersion": "5.9.3" + "scripts": [], + "dbVersion": "5.10.0" } -} +} \ No newline at end of file