From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 27 May 2012 20:38:42 +0000 (+0200)
Subject: 0001606: Statement are not sent to general contact
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=cd064a3158de30c0fb33c390635de234aa59089d;p=textcart.git

0001606: Statement are not sent to general contact
---

diff --git a/includes/db/crm_contacts_db.inc b/includes/db/crm_contacts_db.inc
index 3b47790..94a5a99 100644
--- a/includes/db/crm_contacts_db.inc
+++ b/includes/db/crm_contacts_db.inc
@@ -110,7 +110,12 @@ function get_crm_persons($type=null, $action=null, $entity=null, $person=null, $
 	else
 	 	$sql .= " ORDER BY contact_id";
 
-	return db_query($sql, "Can't get crm persons");
+	$result = db_query($sql, "Can't get crm persons");
+	// fallback to general contacts
+	if (!db_num_rows($result) && $action && $action != 'general')
+		return get_crm_persons($type, 'general', $entity, $person, $unique);
+	else
+		return $result;
 }
 
 function get_crm_person($id)
diff --git a/sales/includes/db/customers_db.inc b/sales/includes/db/customers_db.inc
index 3a67e4e..b1f8343 100644
--- a/sales/includes/db/customers_db.inc
+++ b/sales/includes/db/customers_db.inc
@@ -155,8 +155,11 @@ function get_customer_contacts($customer_id, $action=null)
 	$results = array();
 	$res = get_crm_persons('customer', $action, $customer_id);
 	while($contact = db_fetch($res))
+	{
+		if ($contact['lang'] == 'C') // Fix for improper lang in demo sql files.
+			$contact['lang'] = '';
 		$results[] = $contact;
-
+	}	
 	return $results;
 }
 
diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 205355a..a720b7d 100644
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -520,15 +520,15 @@ CREATE TABLE IF NOT EXISTS `0_crm_persons` (
 -- Dumping data for table `0_crm_persons`
 --
 
-INSERT INTO `0_crm_persons` VALUES(1, 'Beefeater', '', NULL, NULL, NULL, NULL, NULL, '', 'C', '', 0);
+INSERT INTO `0_crm_persons` VALUES(1, 'Beefeater', '', NULL, NULL, NULL, NULL, NULL, '', '', '', 0);
 INSERT INTO `0_crm_persons` VALUES(2, 'Ghostbusters', '', NULL, NULL, NULL, NULL, NULL, '', NULL, '', 0);
-INSERT INTO `0_crm_persons` VALUES(3, 'Brezan', '', NULL, NULL, NULL, NULL, NULL, '', 'C', '', 0);
+INSERT INTO `0_crm_persons` VALUES(3, 'Brezan', '', NULL, NULL, NULL, NULL, NULL, '', '', '', 0);
 INSERT INTO `0_crm_persons` VALUES(4, 'Beefeater', 'Main Branch', NULL, '', '', '', '', '', NULL, '', 0);
 INSERT INTO `0_crm_persons` VALUES(5, 'Ghostbusters', 'Main Branch', NULL, 'Address 1\nAddress 2\nAddress 3', '', '', '', '', NULL, '', 0);
 INSERT INTO `0_crm_persons` VALUES(6, 'Brezan', 'Main Branch', NULL, 'Address 1\nAddress 2\nAddress 3', '', '', '', '', NULL, '', 0);
-INSERT INTO `0_crm_persons` VALUES(7, 'Junk Beer', 'Contact', NULL, 'Address 1\nAddress 2\nAddress 3', '+45 55667788', '', '', '', 'C', '', 0);
+INSERT INTO `0_crm_persons` VALUES(7, 'Junk Beer', 'Contact', NULL, 'Address 1\nAddress 2\nAddress 3', '+45 55667788', '', '', '', '', '', 0);
 INSERT INTO `0_crm_persons` VALUES(8, 'Lucky Luke', 'Luke', NULL, 'Address 1\nAddress 2\nAddress 3', '(111) 222.333.444', '', '', '', NULL, '', 0);
-INSERT INTO `0_crm_persons` VALUES(9, 'Money Makers', 'Makers', NULL, 'Address 1\nAddress 2\nAddress 3', '+44 444 555 666', '', '', '', 'C', '', 0);
+INSERT INTO `0_crm_persons` VALUES(9, 'Money Makers', 'Makers', NULL, 'Address 1\nAddress 2\nAddress 3', '+44 444 555 666', '', '', '', '', '', 0);
 
 -- --------------------------------------------------------