Skip to content
This repository has been archived by the owner on Dec 16, 2021. It is now read-only.

Commit

Permalink
Completely fix birthday/anniversary issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Galbraith committed Jun 30, 2015
1 parent 053b457 commit 71066a0
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 25 deletions.
12 changes: 9 additions & 3 deletions src/Ctct/Components/Activities/AddContacts.php
View file
Expand Up @@ -38,12 +38,18 @@ public function __construct(Array $contacts, Array $lists, Array $columnNames =
if (isset($contact->first_name)) {
$usedColumns[] = Config::get('activities_columns.first_name');
}
if (isset($contact->middle_name)) {
$usedColumns[] = Config::get('activities_columns.middle_name');
}
if (isset($contact->last_name)) {
$usedColumns[] = Config::get('activities_columns.last_name');
}
if (isset($contact->birthday_day)) {
$usedColumns[] = Config::get('activities_columns.birthday_day');
}
if (isset($contact->birthday_month)) {
$usedColumns[] = Config::get('activities_columns.birthday_month');
}
if (isset($contact->anniversary)) {
$usedColumns[] = Config::get('activities_columns.anniversary');
}
if (isset($contact->job_title)) {
$usedColumns[] = Config::get('activities_columns.job_title');
}
Expand Down
7 changes: 0 additions & 7 deletions src/Ctct/Components/Contacts/Contact.php
View file
Expand Up @@ -31,12 +31,6 @@ class Contact extends Component
*/
public $first_name;

/**
* Middle name of the contact
* @var string
*/
public $middle_name;

/**
* Last name of the contact
* @var string
Expand Down Expand Up @@ -156,7 +150,6 @@ public static function create(array $props)
$contact->id = parent::getValue($props, "id");
$contact->status = parent::getValue($props, "status");
$contact->first_name = parent::getValue($props, "first_name");
$contact->middle_name = parent::getValue($props, "middle_name");
$contact->last_name = parent::getValue($props, "last_name");
$contact->confirmed = parent::getValue($props, "confirmed");
$contact->source = parent::getValue($props, "source");
Expand Down
4 changes: 3 additions & 1 deletion src/Ctct/Util/Config.php
View file
Expand Up @@ -69,8 +69,10 @@ class Config
'activities_columns' => array(
'email' => 'EMAIL',
'first_name' => 'FIRST NAME',
'middle_name' => 'MIDDLE NAME',
'last_name' => 'LAST NAME',
'birthday_day' => 'BIRTHDAY_DAY',
'birthday_month' => 'BIRTHDAY_MONTH',
'anniversary' => 'ANNIVERSARY',
'job_title' => 'JOB TITLE',
'company_name' => 'COMPANY NAME',
'work_phone' => 'WORK PHONE',
Expand Down
1 change: 0 additions & 1 deletion test/Json/Contacts/get_contact.json
View file
Expand Up @@ -42,7 +42,6 @@
],
"prefix_name": "Mr.",
"first_name": "John",
"middle_name": "S",
"last_name": "Smith",
"job_title": "Software Engineer",
"company_name": "Constant Contact",
Expand Down
2 changes: 0 additions & 2 deletions test/Json/Contacts/get_contacts.json
View file
Expand Up @@ -49,7 +49,6 @@
],
"prefix_name": "",
"first_name": "",
"middle_name": "",
"last_name": "",
"job_title": "",
"department_name": "",
Expand Down Expand Up @@ -96,7 +95,6 @@
],
"prefix_name": "",
"first_name": "Jimmy",
"middle_name": "",
"last_name": "Roving",
"job_title": "Bear Tamer",
"department_name": "Animals",
Expand Down
2 changes: 0 additions & 2 deletions test/Json/Contacts/get_contacts_modified_since.json
View file
Expand Up @@ -51,7 +51,6 @@
],
"prefix_name": "",
"first_name": "John",
"middle_name": "",
"last_name": "Doe",
"job_title": "",
"company_name": "",
Expand Down Expand Up @@ -94,7 +93,6 @@
],
"prefix_name": "",
"first_name": "",
"middle_name": "",
"last_name": "",
"job_title": "",
"company_name": "",
Expand Down
2 changes: 0 additions & 2 deletions test/Json/Contacts/get_contacts_no_next.json
View file
Expand Up @@ -47,7 +47,6 @@
],
"prefix_name": "",
"first_name": "",
"middle_name": "",
"last_name": "",
"job_title": "",
"department_name": "",
Expand Down Expand Up @@ -93,7 +92,6 @@
],
"prefix_name": "",
"first_name": "Jimmy",
"middle_name": "",
"last_name": "Roving",
"job_title": "Bear Tamer",
"department_name": "Animals",
Expand Down
6 changes: 0 additions & 6 deletions test/Services/ContactServiceUnitTest.php
View file
Expand Up @@ -36,7 +36,6 @@ public function testGetContacts()
$this->assertEquals("", $contact->fax);
$this->assertEquals("", $contact->prefix_name);
$this->assertEquals("Jimmy", $contact->first_name);
$this->assertEquals("", $contact->middle_name);
$this->assertEquals("Roving", $contact->last_name);
$this->assertEquals("Bear Tamer", $contact->job_title);
$this->assertEquals("Animal Trainer Pro", $contact->company_name);
Expand Down Expand Up @@ -120,7 +119,6 @@ public function testGetContactsNoNextLink()
$this->assertEquals("", $contact->fax);
$this->assertEquals("", $contact->prefix_name);
$this->assertEquals("Jimmy", $contact->first_name);
$this->assertEquals("", $contact->middle_name);
$this->assertEquals("Roving", $contact->last_name);
$this->assertEquals("Bear Tamer", $contact->job_title);
$this->assertEquals("Animal Trainer Pro", $contact->company_name);
Expand Down Expand Up @@ -179,7 +177,6 @@ public function testGetContact()
$this->assertEquals("555-1212", $contact->fax);
$this->assertEquals("Mr.", $contact->prefix_name);
$this->assertEquals("John", $contact->first_name);
$this->assertEquals("S", $contact->middle_name);
$this->assertEquals("Smith", $contact->last_name);
$this->assertEquals("Software Engineer", $contact->job_title);
$this->assertEquals("Constant Contact", $contact->company_name);
Expand Down Expand Up @@ -250,7 +247,6 @@ public function testGetContactByEmail()
$this->assertEquals("", $contact->fax);
$this->assertEquals("", $contact->prefix_name);
$this->assertEquals("Jimmy", $contact->first_name);
$this->assertEquals("", $contact->middle_name);
$this->assertEquals("Roving", $contact->last_name);
$this->assertEquals("Bear Tamer", $contact->job_title);
$this->assertEquals("Animal Trainer Pro", $contact->company_name);
Expand Down Expand Up @@ -308,7 +304,6 @@ public function testAddContact()
$this->assertEquals("555-1212", $contact->fax);
$this->assertEquals("Mr.", $contact->prefix_name);
$this->assertEquals("John", $contact->first_name);
$this->assertEquals("S", $contact->middle_name);
$this->assertEquals("Smith", $contact->last_name);
$this->assertEquals("Software Engineer", $contact->job_title);
$this->assertEquals("Constant Contact", $contact->company_name);
Expand Down Expand Up @@ -448,7 +443,6 @@ public function testUpdateContact()
$this->assertEquals("555-1212", $contact->fax);
$this->assertEquals("Mr.", $contact->prefix_name);
$this->assertEquals("John", $contact->first_name);
$this->assertEquals("S", $contact->middle_name);
$this->assertEquals("Smith", $contact->last_name);
$this->assertEquals("Software Engineer", $contact->job_title);
$this->assertEquals("Constant Contact", $contact->company_name);
Expand Down
1 change: 0 additions & 1 deletion test/Services/ListServiceUnitTest.php
View file
Expand Up @@ -126,7 +126,6 @@ public function testGetContactsFromList()
$this->assertEquals("", $contact->fax);
$this->assertEquals("", $contact->prefix_name);
$this->assertEquals("Jimmy", $contact->first_name);
$this->assertEquals("", $contact->middle_name);
$this->assertEquals("Roving", $contact->last_name);
$this->assertEquals("Bear Tamer", $contact->job_title);
$this->assertEquals("Animal Trainer Pro", $contact->company_name);
Expand Down

0 comments on commit 71066a0

Please sign in to comment.