diff --git a/Console/Command/Cleanlogs.php b/Console/Command/Cleanlogs.php index 0972f29..2a24cad 100644 --- a/Console/Command/Cleanlogs.php +++ b/Console/Command/Cleanlogs.php @@ -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; diff --git a/Controller/Adminhtml/Chat/Closechat.php b/Controller/Adminhtml/Chat/Closechat.php index 0193e06..f9b5e1c 100644 --- a/Controller/Adminhtml/Chat/Closechat.php +++ b/Controller/Adminhtml/Chat/Closechat.php @@ -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 * diff --git a/Controller/Adminhtml/Chat/MassCleanlog.php b/Controller/Adminhtml/Chat/MassCleanlog.php index 7f63b6c..ec1ecae 100644 --- a/Controller/Adminhtml/Chat/MassCleanlog.php +++ b/Controller/Adminhtml/Chat/MassCleanlog.php @@ -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; diff --git a/Controller/Adminhtml/Chat/MassDelete.php b/Controller/Adminhtml/Chat/MassDelete.php index 580b377..26e339c 100644 --- a/Controller/Adminhtml/Chat/MassDelete.php +++ b/Controller/Adminhtml/Chat/MassDelete.php @@ -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; diff --git a/Controller/Adminhtml/Chat/Msglog.php b/Controller/Adminhtml/Chat/Msglog.php index da25186..e7b330c 100644 --- a/Controller/Adminhtml/Chat/Msglog.php +++ b/Controller/Adminhtml/Chat/Msglog.php @@ -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, @@ -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; diff --git a/Controller/Adminhtml/Chat/Sendmsg.php b/Controller/Adminhtml/Chat/Sendmsg.php index 48a05c4..8d98600 100644 --- a/Controller/Adminhtml/Chat/Sendmsg.php +++ b/Controller/Adminhtml/Chat/Sendmsg.php @@ -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, @@ -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; diff --git a/Controller/Adminhtml/Customer/LoginPost.php b/Controller/Adminhtml/Customer/LoginPost.php index 5b96727..dedb875 100644 --- a/Controller/Adminhtml/Customer/LoginPost.php +++ b/Controller/Adminhtml/Customer/LoginPost.php @@ -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; diff --git a/Controller/Chat/Msglog.php b/Controller/Chat/Msglog.php index b7c1015..f6a187e 100644 --- a/Controller/Chat/Msglog.php +++ b/Controller/Chat/Msglog.php @@ -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 @@ -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; diff --git a/Controller/Chat/Sendmsg.php b/Controller/Chat/Sendmsg.php index fb5a73d..b172313 100644 --- a/Controller/Chat/Sendmsg.php +++ b/Controller/Chat/Sendmsg.php @@ -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 */ diff --git a/Controller/Customer/LoginPost.php b/Controller/Customer/LoginPost.php index 5b96727..af0107d 100644 --- a/Controller/Customer/LoginPost.php +++ b/Controller/Customer/LoginPost.php @@ -44,6 +44,8 @@ class LoginPost extends \Magento\Customer\Controller\AbstractAccount { * @var Session */ protected $session; + + protected $customerUrl; /** * diff --git a/Helper/Data.php b/Helper/Data.php index 3587ea0..3bf4a2c 100644 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -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 @@ -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; diff --git a/Helper/Url.php b/Helper/Url.php index c0e086b..e8ae6e6 100644 --- a/Helper/Url.php +++ b/Helper/Url.php @@ -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 diff --git a/Model/Config.php b/Model/Config.php index 00fbb36..fd95e3e 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -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 diff --git a/Model/Cron.php b/Model/Cron.php index eb0e5c0..4f59c72 100644 --- a/Model/Cron.php +++ b/Model/Cron.php @@ -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; diff --git a/Model/Menu/Config.php b/Model/Menu/Config.php index 32a8a3b..4cf27f0 100644 --- a/Model/Menu/Config.php +++ b/Model/Menu/Config.php @@ -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 * diff --git a/Model/MessageRepository.php b/Model/MessageRepository.php index 0720fad..a281657 100644 --- a/Model/MessageRepository.php +++ b/Model/MessageRepository.php @@ -47,7 +47,6 @@ class MessageRepository implements MessageRepositoryInterface private $collectionProcessor; - /** * @param ResourceMessage $resource * @param MessageFactory $messageFactory diff --git a/Model/Sender.php b/Model/Sender.php index df4f678..0ca0444 100644 --- a/Model/Sender.php +++ b/Model/Sender.php @@ -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; diff --git a/Ui/Component/Listing/Column/Reply.php b/Ui/Component/Listing/Column/Reply.php index 40abc10..9776517 100644 --- a/Ui/Component/Listing/Column/Reply.php +++ b/Ui/Component/Listing/Column/Reply.php @@ -28,14 +28,12 @@ class Reply extends Column { - /** * @var UrlInterface */ protected $urlBuilder; - /** /** * Constructor * diff --git a/composer.json b/composer.json index be4d891..b5e6326 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/etc/marketplace/menu.xml b/etc/marketplace/menu.xml index e76ee48..4a76a02 100644 --- a/etc/marketplace/menu.xml +++ b/etc/marketplace/menu.xml @@ -20,10 +20,6 @@ * @license http://www.landofcoder.com/LICENSE-1.0.html */ --> - - - - - + \ No newline at end of file diff --git a/etc/marketplace/routes.xml b/etc/marketplace/routes.xml index 0aef4c4..b672eeb 100644 --- a/etc/marketplace/routes.xml +++ b/etc/marketplace/routes.xml @@ -23,7 +23,7 @@ - +