Skip to content

Commit c0baeef

Browse files
authored
Merge pull request #5 from landofcoder/fix-issue-marketplace-menu-duplicate
added files fix for marketplace
2 parents e4a2ebc + 1a305b9 commit c0baeef

File tree

21 files changed

+50
-35
lines changed

21 files changed

+50
-35
lines changed

Console/Command/Cleanlogs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(
5050
\Lof\ChatSystem\Model\ChatMessageFactory $chatmessageFactory,
5151
\Lof\ChatSystem\Helper\Data $helper,
5252
\Magento\Framework\Stdlib\DateTime\DateTime $date
53-
) {
53+
) {
5454
$this->_resource = $resource;
5555
$this->_cache = $cache;
5656
$this->helper = $helper;

Controller/Adminhtml/Chat/Closechat.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@
2525
class Closechat extends \Magento\Backend\App\Action
2626
{
2727

28-
/**
29-
* @param Action\Context $context
30-
*/
31-
public function __construct(Action\Context $context)
32-
{
33-
parent::__construct($context);
34-
}
35-
36-
37-
3828
/**
3929
* Save action
4030
*

Controller/Adminhtml/Chat/MassCleanlog.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ public function __construct(
6060
\Lof\ChatSystem\Helper\Data $helper,
6161
\Magento\Framework\Stdlib\DateTime\DateTime $date,
6262
ChatCollectionFactory $chatCollectionFactory
63-
)
64-
{
63+
) {
6564
$this->filter = $filter;
6665
$this->collectionFactory = $collectionFactory;
6766
$this->chatCollectionFactory = $chatCollectionFactory;

Controller/Adminhtml/Chat/MassDelete.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ public function __construct(
5050
Filter $filter,
5151
CollectionFactory $collectionFactory,
5252
\Lof\ChatSystem\Model\ChatMessageFactory $chatMessageFactory
53-
)
54-
{
53+
) {
5554
$this->filter = $filter;
5655
$this->collectionFactory = $collectionFactory;
5756
$this->chatMessageFactory = $chatMessageFactory;

Controller/Adminhtml/Chat/Msglog.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ class Msglog extends \Magento\Framework\App\Action\Action
6666
protected $chat;
6767
protected $_chatModelFactory;
6868

69+
protected $resultPageFactory;
70+
protected $_coreRegistry;
71+
protected $_customerSession;
72+
6973
public function __construct(
7074
Context $context,
7175
\Magento\Store\Model\StoreManager $storeManager,
@@ -78,7 +82,7 @@ public function __construct(
7882
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
7983
\Magento\Customer\Model\Session $customerSession,
8084
\Lof\ChatSystem\Model\ChatFactory $chatModelFactory
81-
) {
85+
) {
8286
$this->chat = $chat;
8387
$this->resultPageFactory = $resultPageFactory;
8488
$this->_helper = $helper;

Controller/Adminhtml/Chat/Sendmsg.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ class Sendmsg extends \Magento\Framework\App\Action\Action
6868
protected $_chatModelFactory;
6969

7070
protected $authSession;
71+
protected $resultPageFactory;
72+
protected $_coreRegistry;
73+
protected $_customerSession;
7174

7275
public function __construct(
7376
Context $context,
@@ -82,7 +85,7 @@ public function __construct(
8285
\Magento\Customer\Model\Session $customerSession,
8386
\Lof\ChatSystem\Model\ChatFactory $chatModelFactory,
8487
\Magento\Backend\Model\Auth\Session $authSession
85-
) {
88+
) {
8689
$this->resultPageFactory = $resultPageFactory;
8790
$this->_helper = $helper;
8891
$this->_message = $message;

Controller/Adminhtml/Customer/LoginPost.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
/**
3333
* This class contains validating seller login functions
3434
*/
35-
class LoginPost extends \Magento\Customer\Controller\AbstractAccount {
35+
class LoginPost extends \Magento\Customer\Controller\AbstractAccount
36+
{
3637
/** @var AccountManagementInterface */
3738
protected $customerAccountManagement;
3839

Controller/Chat/Msglog.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ class Msglog extends \Magento\Framework\App\Action\Action
8282

8383
protected $blacklistFactory;
8484

85+
protected $resultPageFactory;
86+
87+
protected $_coreRegistry;
88+
89+
protected $_customerSession;
90+
8591
/**
8692
* @param Context $context
8793
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -107,7 +113,7 @@ public function __construct(
107113
\Magento\Customer\Model\Session $customerSession,
108114
\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
109115
\Lof\ChatSystem\Model\BlacklistFactory $blacklistFactory
110-
) {
116+
) {
111117
$this->chatFactory = $chatFactory;
112118
$this->chat = $chatFactory->create();
113119
$this->resultPageFactory = $resultPageFactory;

Controller/Chat/Sendmsg.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ class Sendmsg extends \Magento\Framework\App\Action\Action
7878

7979
protected $blacklistFactory;
8080

81+
protected $resultPageFactory;
82+
83+
protected $_coreRegistry;
84+
85+
protected $_customerSession;
86+
8187
/**
8288
* @var \Magento\Store\Model\StoreManager
8389
*/

Controller/Customer/LoginPost.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ class LoginPost extends \Magento\Customer\Controller\AbstractAccount {
4444
* @var Session
4545
*/
4646
protected $session;
47+
48+
protected $customerUrl;
4749

4850
/**
4951
*

0 commit comments

Comments
 (0)