diff --git a/app/code/Magento/Messaging/Block/Messaging.php b/app/code/Magento/Messaging/Block/Messaging.php
index 11ede2e1284b3f03140dad2646bf0dfe187bf465..4b9cb210ece2c08e51d875b7de3f00814110782e 100644
--- a/app/code/Magento/Messaging/Block/Messaging.php
+++ b/app/code/Magento/Messaging/Block/Messaging.php
@@ -3,8 +3,29 @@ namespace Magento\Messaging\Block;
class Messaging extends \Magento\Framework\View\Element\Template
{
- public function getText()
- {
+ /**
+ * @var \Magento\Framework\App\ObjectManager
+ */
+ public $om;
+
+ /**
+ * @var \Magento\Customer\Model\Session
+ */
+ public $session;
+
+ public function getText() {
return 'Hello world!';
}
+
+ public function getId() {
+ if ($om === null || $session === null) {
+ $om = \Magento\Framework\App\ObjectManager::getInstance();
+ $session = $om->get('\Magento\Customer\Model\Session');
+ }
+ if ($session->isLoggedIn()) {
+ return $session->getCustomer()->getId();
+ } else {
+ return -1;
+ }
+ }
}
\ No newline at end of file
diff --git a/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml b/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
index eb9f38ba14e88f366216a650caaaca9ce33ec692..d61a1e1a5734091fde214ec3d8bc369065feaa91 100644
--- a/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
+++ b/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
@@ -1,10 +1,10 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" layout="1column">
<head>
<title>Messaging</title>
- <css src="Messaging::css/chat.css" />
- <script src="Messaging::js/chat.js" />
- <script src="Messaging::js/angular.js" />
- <script src="Messaging::js/jquery.js" />
+ <css src="Magento_Messaging::css/chat.css" />
+ <script src="Magento_Messaging::js/chat.js" />
+ <script src="Magento_Messaging::js/angular.js" />
+ <script src="Magento_Messaging::js/jquery.js" />
</head>
<body ng-app="chatlistbox" ng-controller="controller">
<referenceContainer name="content">
diff --git a/app/code/Magento/Messaging/view/frontend/requirejs-config.js b/app/code/Magento/Messaging/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000000000000000000000000000000..03b382c9f5e6f3cf02eff4946e4a196bc0ae11cb
--- /dev/null
+++ b/app/code/Magento/Messaging/view/frontend/requirejs-config.js
@@ -0,0 +1,7 @@
+var config = {
+ map: {
+ '*': {
+ messaging: 'Magento_Messaging/js/test',
+ }
+ }
+};
\ No newline at end of file
diff --git a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
index 21ed1f6fb4b3d634a5e903f08d89ffa54f3b5227..6094746e846750efd05ef1e7ead286d71e09fe10 100644
--- a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
@@ -17,4 +17,12 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+require(['jquery'],function($){
+ $(document).ready(function() {
+ alert('hai');
+ });
+});
+</script>
\ No newline at end of file