Skip to content

Commit

Permalink
Merge remote-tracking branch 'git-36981/no-author/customer-01' into b…
Browse files Browse the repository at this point in the history 
…luetooth_delivery
  • Loading branch information
@engcom-Echo
engcom-Echo committed Sep 15, 2023
2 parents fcd7697 + 36ad44e commit 6e7d436
Show file tree
Hide file tree
Showing 22 changed files with 8 additions and 46 deletions.
3 changes: 2 additions & 1 deletion app/code/Magento/Customer/Block/Address/Book.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* Customer address book block
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Book extends \Magento\Framework\View\Element\Template
Expand Down Expand Up @@ -167,6 +166,7 @@ public function getAdditionalAddresses()
try {
$addresses = $this->addressesGrid->getAdditionalAddresses();
} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
return false;
}
return empty($addresses) ? false : $addresses;
}
Expand Down Expand Up @@ -198,6 +198,7 @@ public function getCustomer()
try {
$customer = $this->currentCustomer->getCustomer();
} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
return null;
}
return $customer;
}
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* Address renderer interface
*
* @api
* @author Magento Core Team <[email protected]>
*/
interface RendererInterface
{
Expand Down
7 changes: 3 additions & 4 deletions app/code/Magento/Customer/Block/Adminhtml/Form/Element/Boolean.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@
* See COPYING.txt for license details.
*/

namespace Magento\Customer\Block\Adminhtml\Form\Element;

/**
* Customer Widget Form Boolean Element Block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Block\Adminhtml\Form\Element;

class Boolean extends \Magento\Framework\Data\Form\Element\Select
{
/**
* Prepare default SELECT values
*
* @return void
*/
protected function _construct()
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Customer Widget Form File Element Block
*
* @author Magento Core Team <[email protected]>
*/
class File extends \Magento\Framework\Data\Form\Element\AbstractElement
{
Expand All @@ -18,8 +16,6 @@ class File extends \Magento\Framework\Data\Form\Element\AbstractElement
protected $_assetRepo;

/**
* Adminhtml data
*
* @var \Magento\Backend\Helper\Data
*/
protected $_adminhtmlData = null;
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Widget Form Image File Element Block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Block\Adminhtml\Form\Element;

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Customer/Block/Adminhtml/Grid/Filter/Country.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Country customer grid column filter
*
* @author Magento Core Team <[email protected]>
*/
class Country extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
{
Expand All @@ -34,6 +32,8 @@ public function __construct(
}

/**
* Return options
*
* @return array
*/
protected function _getOptions()
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

/**
* Adminhtml customers wishlist grid item action renderer for few action controls in one cell
*
* @author Magento Core Team <[email protected]>
*/
class Multiaction extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Block/Adminhtml/Group.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Adminhtml customers group page content block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Block\Adminhtml;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

/**
* VAT ID element renderer
*
* @author Magento Core Team <[email protected]>
*/
class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Adminhtml VAT ID validation block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Block\Adminhtml\System\Config;

Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Customer/Block/Form/Login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Customer login form block
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Login extends \Magento\Framework\View\Element\Template
Expand Down
4 changes: 1 addition & 3 deletions app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* VAT validation controller
*
* @author Magento Core Team <[email protected]>
*/
abstract class Validatevat extends \Magento\Backend\App\Action
{
Expand All @@ -17,7 +15,7 @@ abstract class Validatevat extends \Magento\Backend\App\Action
*
* @see _isAllowed()
*/
const ADMIN_RESOURCE = 'Magento_Customer::manage';
public const ADMIN_RESOURCE = 'Magento_Customer::manage';

/**
* Perform customer VAT ID validation
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Address/Form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Address Form Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Address;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Boolean customer attribute backend model
*
* @author Magento Core Team <[email protected]>
*/
class Boolean extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/AbstractData.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Abstract Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/Boolean.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Boolean Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/Date.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Date Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/File.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute File Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/Hidden.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Hidden text Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/Attribute/Data/Image.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Customer Attribute Image File Data Model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Customer\Model\Attribute\Data;

Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Customer group collection
*
* @author Magento Core Team <[email protected]>
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

/**
* Flat customer online grid collection
*
* @author Magento Core Team <[email protected]>
*/
class Collection extends SearchResult
{
Expand Down

0 comments on commit 6e7d436

Please sign in to comment.