Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Console/Command/Cleanlogs.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct(
\Lof\ChatSystem\Model\ChatMessageFactory $chatmessageFactory,
\Lof\ChatSystem\Helper\Data $helper,
\Magento\Framework\Stdlib\DateTime\DateTime $date
) {
) {
$this->_resource = $resource;
$this->_cache = $cache;
$this->helper = $helper;
Expand Down
10 changes: 0 additions & 10 deletions Controller/Adminhtml/Chat/Closechat.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@
class Closechat extends \Magento\Backend\App\Action
{

/**
* @param Action\Context $context
*/
public function __construct(Action\Context $context)
{
parent::__construct($context);
}



/**
* Save action
*
Expand Down
3 changes: 1 addition & 2 deletions Controller/Adminhtml/Chat/MassCleanlog.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ public function __construct(
\Lof\ChatSystem\Helper\Data $helper,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
ChatCollectionFactory $chatCollectionFactory
)
{
) {
$this->filter = $filter;
$this->collectionFactory = $collectionFactory;
$this->chatCollectionFactory = $chatCollectionFactory;
Expand Down
3 changes: 1 addition & 2 deletions Controller/Adminhtml/Chat/MassDelete.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ public function __construct(
Filter $filter,
CollectionFactory $collectionFactory,
\Lof\ChatSystem\Model\ChatMessageFactory $chatMessageFactory
)
{
) {
$this->filter = $filter;
$this->collectionFactory = $collectionFactory;
$this->chatMessageFactory = $chatMessageFactory;
Expand Down
6 changes: 5 additions & 1 deletion Controller/Adminhtml/Chat/Msglog.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ class Msglog extends \Magento\Framework\App\Action\Action
protected $chat;
protected $_chatModelFactory;

protected $resultPageFactory;
protected $_coreRegistry;
protected $_customerSession;

public function __construct(
Context $context,
\Magento\Store\Model\StoreManager $storeManager,
Expand All @@ -78,7 +82,7 @@ public function __construct(
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
\Magento\Customer\Model\Session $customerSession,
\Lof\ChatSystem\Model\ChatFactory $chatModelFactory
) {
) {
$this->chat = $chat;
$this->resultPageFactory = $resultPageFactory;
$this->_helper = $helper;
Expand Down
5 changes: 4 additions & 1 deletion Controller/Adminhtml/Chat/Sendmsg.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ class Sendmsg extends \Magento\Framework\App\Action\Action
protected $_chatModelFactory;

protected $authSession;
protected $resultPageFactory;
protected $_coreRegistry;
protected $_customerSession;

public function __construct(
Context $context,
Expand All @@ -82,7 +85,7 @@ public function __construct(
\Magento\Customer\Model\Session $customerSession,
\Lof\ChatSystem\Model\ChatFactory $chatModelFactory,
\Magento\Backend\Model\Auth\Session $authSession
) {
) {
$this->resultPageFactory = $resultPageFactory;
$this->_helper = $helper;
$this->_message = $message;
Expand Down
3 changes: 2 additions & 1 deletion Controller/Adminhtml/Customer/LoginPost.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
/**
* This class contains validating seller login functions
*/
class LoginPost extends \Magento\Customer\Controller\AbstractAccount {
class LoginPost extends \Magento\Customer\Controller\AbstractAccount
{
/** @var AccountManagementInterface */
protected $customerAccountManagement;

Expand Down
8 changes: 7 additions & 1 deletion Controller/Chat/Msglog.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ class Msglog extends \Magento\Framework\App\Action\Action

protected $blacklistFactory;

protected $resultPageFactory;

protected $_coreRegistry;

protected $_customerSession;

/**
* @param Context $context
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
Expand All @@ -107,7 +113,7 @@ public function __construct(
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
\Lof\ChatSystem\Model\BlacklistFactory $blacklistFactory
) {
) {
$this->chatFactory = $chatFactory;
$this->chat = $chatFactory->create();
$this->resultPageFactory = $resultPageFactory;
Expand Down
6 changes: 6 additions & 0 deletions Controller/Chat/Sendmsg.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ class Sendmsg extends \Magento\Framework\App\Action\Action

protected $blacklistFactory;

protected $resultPageFactory;

protected $_coreRegistry;

protected $_customerSession;

/**
* @var \Magento\Store\Model\StoreManager
*/
Expand Down
2 changes: 2 additions & 0 deletions Controller/Customer/LoginPost.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class LoginPost extends \Magento\Customer\Controller\AbstractAccount {
* @var Session
*/
protected $session;

protected $customerUrl;

/**
*
Expand Down
5 changes: 4 additions & 1 deletion Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper

protected $_current_chat_id = 0;

protected $_remoteAddress;
protected $_localeDate;

/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
Expand Down Expand Up @@ -103,7 +106,7 @@ public function __construct(
\Magento\Framework\Stdlib\DateTime\DateTime $date,
\Magento\Framework\Registry $registry,
\Magento\Framework\Session\SessionManagerInterface $session
) {
) {
parent::__construct($context);
$this->_storeManager = $storeManager;
$this->orderFactory = $orderFactory;
Expand Down
7 changes: 5 additions & 2 deletions Helper/Url.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,19 @@ public function __construct(
EncoderInterface $urlEncoder
) {
$this->_frontendUrl = $frontendUrl;
$this->_actionFlag = $actionFlag;
$this->_actionFlag = $actionFlag;
$this->request = $request;
$this->urlBuilder = $urlBuilder;
$this->scopeConfig = $scopeConfig;
$this->customerSession = $customerSession;
$this->urlEncoder = $urlEncoder;
}
public function getFrontendUrl($route = '', $params = []){

public function getFrontendUrl($route = '', $params = [])
{
return $this->_frontendUrl->getUrl($route,$params);
}

/**
* Redirect to URL
* @param string $url
Expand Down
2 changes: 2 additions & 0 deletions Model/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class Config
*/
protected $context;

protected $configAdminCustom;

/**
* @param \Magento\Config\Model\Config\Backend\Admin\Custom $configAdminCustom
* @param \Magento\Framework\Module\Manager $moduleManager
Expand Down
3 changes: 1 addition & 2 deletions Model/Cron.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ public function __construct(
\Lof\ChatSystem\Helper\Data $helper,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Stdlib\DateTime\DateTime $date
)
{
) {
$this->chatmessageFactory = $chatmessageFactory;
$this->logger = $logger;
$this->helper = $helper;
Expand Down
6 changes: 6 additions & 0 deletions Model/Menu/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ class Config extends \Magento\Backend\Model\Menu\Config
const CACHE_ID = 'chatsystem_menu_config';
const CACHE_MENU_OBJECT = 'chatsystem_menu_object';

protected $_menu = null;

protected $_director;

protected $_configCacheType;

/**
* Initialize menu object
*
Expand Down
1 change: 0 additions & 1 deletion Model/MessageRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ class MessageRepository implements MessageRepositoryInterface

private $collectionProcessor;


/**
* @param ResourceMessage $resource
* @param MessageFactory $messageFactory
Expand Down
1 change: 0 additions & 1 deletion Model/Sender.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public function __construct(
\Magento\Framework\Message\ManagerInterface $messageManager,
\Lof\ChatSystem\Helper\Data $helper,
\Magento\User\Model\UserFactory $userFactory

) {
$this->messageManager = $messageManager;
$this->config = $config;
Expand Down
2 changes: 0 additions & 2 deletions Ui/Component/Listing/Column/Reply.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@
class Reply extends Column
{


/**
* @var UrlInterface
*/
protected $urlBuilder;


/**
/**
* Constructor
*
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"landofcoder/module-all" : "1.*"
},
"type": "magento2-module",
"version": "1.0.6.1",
"version": "1.0.7",
"keywords": [
"landofcoder",
"landofcoder chat system",
Expand Down
6 changes: 1 addition & 5 deletions etc/marketplace/menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
* @license http://www.landofcoder.com/LICENSE-1.0.html
*/
-->

<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
<menu>
<add id="Lof_ChatSystem::chatsystem" title="Chat" module="Lof_ChatSystem" sortOrder="280" icon="fa fa-commenting-o" resource="Lof_ChatSystem::chatsystem"/>
<add id="Lof_ChatSystem::chat" title="Chat with customer" module="Lof_ChatSystem" action="lofchatsystem/chat/index" sortOrder="10" resource="Lof_ChatSystem::chat" parent="Lof_ChatSystem::chatsystem" />
</menu>
<menu/>
</config>
2 changes: 1 addition & 1 deletion etc/marketplace/routes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="lof_all">
<route id="lofchatsystem" frontName="lofchatsystem">
<route id="lofchatsystemclient" frontName="lofchatsystemclient">
<module name="Lof_ChatSystem" />
</route>
</router>
Expand Down