From 6cf2a8a19b4f4beec6c383fff022ba9a0ef198cd Mon Sep 17 00:00:00 2001
From: Sergey Nosov <snosov@ebay.com>
Date: Thu, 24 Sep 2015 17:08:36 +0300
Subject: [PATCH] SUPEE-7016: Newsletter subscribers filter for
 firstname/lastname doesn't work.

- solution from MAGETWO-40190 (b0c9cf580ac68b020479633fa80beeed8df74b56, 2ecaf464cb31e4abf506320ef7f5482ea753c8b6, a8aa0e76868a49870d36eaeb7fb5436234b1b2de)
---
 .../Newsletter/Model/Resource/Subscriber/Collection.php   | 6 +-----
 app/code/Magento/Newsletter/Model/Subscriber.php          | 4 ++--
 .../Magento/Newsletter/Test/Unit/Model/SubscriberTest.php | 4 ++--
 .../view/adminhtml/layout/newsletter_subscriber_block.xml | 4 ++--
 .../Model/Resource/Subscriber/CollectionTest.php          | 8 ++++----
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
index b2e5333c515e3..13c7ee9fc9ed8 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
@@ -146,11 +146,7 @@ public function showCustomerInfo()
             [
                 'customer' => $this->getTable('customer_entity')
             ],
-            'main_table.customer_id = customer.entity_id',
-            [
-                'customer_lastname' => 'lastname',
-                'customer_firstname' => 'firstname'
-            ]
+            'main_table.customer_id = customer.entity_id'
         );
         return $this;
     }
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index 68059af6e30d6..be26e78f1d181 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -789,8 +789,8 @@ public function sendUnsubscriptionEmail()
     public function getSubscriberFullName()
     {
         $name = null;
-        if ($this->hasCustomerFirstname() || $this->hasCustomerLastname()) {
-            $name = $this->getCustomerFirstname() . ' ' . $this->getCustomerLastname();
+        if ($this->hasFirstname() || $this->hasLastname()) {
+            $name = $this->getFirstname() . ' ' . $this->getLastname();
         }
         return $name;
     }
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
index 90d5c2ca0a488..37ce3e8487176 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
@@ -279,8 +279,8 @@ public function testUnsubscribeException()
 
     public function testGetSubscriberFullName()
     {
-        $this->subscriber->setCustomerFirstname('John');
-        $this->subscriber->setCustomerLastname('Doe');
+        $this->subscriber->setFirstname('John');
+        $this->subscriber->setLastname('Doe');
 
         $this->assertEquals('John Doe', $this->subscriber->getSubscriberFullName());
     }
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
index d8d3e3fd12461..a7519990856e3 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
@@ -89,7 +89,7 @@
                     <block class="Magento\Backend\Block\Widget\Grid\Column" as="firstname">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Customer First Name</argument>
-                            <argument name="index" xsi:type="string">customer_firstname</argument>
+                            <argument name="index" xsi:type="string">firstname</argument>
                             <argument name="default" xsi:type="string">----</argument>
                             <argument name="header_css_class" xsi:type="string">col-first-name</argument>
                             <argument name="column_css_class" xsi:type="string">col-first-name</argument>
@@ -98,7 +98,7 @@
                     <block class="Magento\Backend\Block\Widget\Grid\Column" as="lastname">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Customer Last Name</argument>
-                            <argument name="index" xsi:type="string">customer_lastname</argument>
+                            <argument name="index" xsi:type="string">lastname</argument>
                             <argument name="default" xsi:type="string">----</argument>
                             <argument name="header_css_class" xsi:type="string">col-last-name</argument>
                             <argument name="column_css_class" xsi:type="string">col-last-name</argument>
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/Resource/Subscriber/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/Resource/Subscriber/CollectionTest.php
index 59e508eeb5c93..ffc389d1b8ec2 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/Resource/Subscriber/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/Resource/Subscriber/CollectionTest.php
@@ -30,10 +30,10 @@ public function testShowCustomerInfo()
         $subscribers = $this->_collectionModel->getItems();
         $this->assertCount(2, $subscribers);
         $subscriber = array_shift($subscribers);
-        $this->assertEquals('John', $subscriber->getCustomerFirstname(), $subscriber->getSubscriberEmail());
-        $this->assertEquals('Smith', $subscriber->getCustomerLastname(), $subscriber->getSubscriberEmail());
+        $this->assertEquals('John', $subscriber->getFirstname(), $subscriber->getSubscriberEmail());
+        $this->assertEquals('Smith', $subscriber->getLastname(), $subscriber->getSubscriberEmail());
         $subscriber = array_shift($subscribers);
-        $this->assertNull($subscriber->getCustomerFirstname(), $subscriber->getSubscriberEmail());
-        $this->assertNull($subscriber->getCustomerLastname(), $subscriber->getSubscriberEmail());
+        $this->assertNull($subscriber->getFirstname(), $subscriber->getSubscriberEmail());
+        $this->assertNull($subscriber->getLastname(), $subscriber->getSubscriberEmail());
     }
 }