From 3c632aa90963107c3450b5e67d6cc1aeafb680f2 Mon Sep 17 00:00:00 2001
From: Anton Evers <anton.evers@kega.nl>
Date: Tue, 13 Jun 2017 11:31:15 +0600
Subject: [PATCH] Move prefix and suffix default values to a new PR

---
 .../Checkout/Block/Checkout/AttributeMerger.php    | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index 1905826133c2a..dcfe1cd5e2038 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -321,24 +321,14 @@ protected function getDefaultValue($attributeCode)
                     return $this->getCustomer()->getFirstname();
                 }
                 break;
-            case 'lastname':
-                if ($this->getCustomer()) {
-                    return $this->getCustomer()->getLastname();
-                }
-                break;
             case 'middlename':
                 if ($this->getCustomer()) {
                     return $this->getCustomer()->getMiddlename();
                 }
                 break;
-            case 'prefix':
-                if ($this->getCustomer()) {
-                    return $this->getCustomer()->getPrefix();
-                }
-                break;
-            case 'suffix':
+            case 'lastname':
                 if ($this->getCustomer()) {
-                    return $this->getCustomer()->getSuffix();
+                    return $this->getCustomer()->getLastname();
                 }
                 break;
             case 'country_id':