Webpushnotification_Pushassist - Version 1.0.4

Version Notes

Built a stable version 1.0.4

Download this release

Release Info

Developer PushAssist Team
Extension Webpushnotification_Pushassist
Version 1.0.4
Comparing to
See all releases


Code changes from version 1.0.3 to 1.0.4

Files changed (24) hide show
  1. app/code/community/Webpushnotification/Pushassist/Block/Adminhtml/Settings.php +4 -0
  2. app/code/community/Webpushnotification/Pushassist/Helper/Data.php +33 -0
  3. app/code/community/Webpushnotification/Pushassist/controllers/Adminhtml/Pushassist/CreateaccountController.php +50 -45
  4. app/code/community/Webpushnotification/Pushassist/controllers/Adminhtml/Pushassist/NotificationsendController.php +4 -2
  5. app/code/community/Webpushnotification/Pushassist/controllers/Adminhtml/Pushassist/SettingsController.php +111 -0
  6. app/code/community/Webpushnotification/Pushassist/etc/config.xml +23 -4
  7. app/design/adminhtml/default/default/layout/pushassist.xml +9 -0
  8. app/design/adminhtml/default/default/template/pushassist/campaign.phtml +20 -16
  9. app/design/adminhtml/default/default/template/pushassist/create_account.phtml +27 -33
  10. app/design/adminhtml/default/default/template/pushassist/createcampaign.phtml +11 -9
  11. app/design/adminhtml/default/default/template/pushassist/createsegments.phtml +21 -19
  12. app/design/adminhtml/default/default/template/pushassist/dashboard.phtml +43 -41
  13. app/design/adminhtml/default/default/template/pushassist/notification.phtml +26 -27
  14. app/design/adminhtml/default/default/template/pushassist/segments.phtml +19 -21
  15. app/design/adminhtml/default/default/template/pushassist/sendnotification.phtml +56 -59
  16. app/design/adminhtml/default/default/template/pushassist/settings.phtml +366 -0
  17. app/design/adminhtml/default/default/template/pushassist/subscribers.phtml +19 -17
  18. app/locale/en_US/Webpushnotification_Pushassist.csv +1 -0
  19. app/locale/fr_FR/Webpushnotification_Pushassist.csv +1 -0
  20. package.xml +7 -7
  21. skin/adminhtml/default/default/pushassist/5122pushassist_default.png +0 -0
  22. skin/adminhtml/default/default/pushassist/7991logo.png +0 -0
  23. skin/adminhtml/default/default/pushassist/content_base.css +121 -34
  24. skin/adminhtml/default/default/pushassist/pushassist_opt_in_box_setting.png +0 -0
app/code/community/Webpushnotification/Pushassist/Block/Adminhtml/Settings.php ADDED
@@ -0,0 +1,4 @@
 
 
 
 
1
+ <?php
2
+ class Webpushnotification_Pushassist_Block_Adminhtml_Settings extends Mage_Adminhtml_Block_Template {
3
+
4
+ }
app/code/community/Webpushnotification/Pushassist/Helper/Data.php CHANGED
@@ -192,6 +192,39 @@ class Webpushnotification_Pushassist_Helper_Data extends Mage_Core_Helper_Abstra
192
  return json_decode($response_add_campaigns,true);
193
  }
194
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
195
 
196
  }
197
 
192
  return json_decode($response_add_campaigns,true);
193
  }
194
 
195
+ public function gcm_setting($gcm_setting_response_array){
196
+
197
+ $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
198
+ $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
199
+ $gcm_request_json = json_encode($gcm_setting_response_array);
200
+ $gcm_setting = new Zend_Http_Client();
201
+ $gcm_setting->setUri('https://api.pushassist.com/gcmsettings/');
202
+ $gcm_setting->setHeaders('X-Auth-Token', $check_api_key);
203
+ $gcm_setting->setHeaders('X-Auth-Secret', $check_secret_key);
204
+ $gcm_setting->setHeaders(Zend_Http_Client::CONTENT_TYPE, 'application/json');
205
+ $gcm_setting->setMethod(Zend_Http_Client::POST);
206
+ $gcm_setting->setRawData($gcm_request_json);
207
+ $response_gcm_setting = $gcm_setting->request()->getBody();
208
+ return json_decode($response_gcm_setting,true);
209
+
210
+ }
211
+
212
+ public function settings($settings_response_array){
213
+
214
+ $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
215
+ $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
216
+ $settings_request_json = json_encode($settings_response_array);
217
+ $settings = new Zend_Http_Client();
218
+ $settings->setUri('https://api.pushassist.com/settings/');
219
+ $settings->setHeaders('X-Auth-Token', $check_api_key);
220
+ $settings->setHeaders('X-Auth-Secret', $check_secret_key);
221
+ $settings->setHeaders(Zend_Http_Client::CONTENT_TYPE, 'application/json');
222
+ $settings->setMethod(Zend_Http_Client::POST);
223
+ $settings->setRawData($settings_request_json);
224
+ $response_settings = $settings->request()->getBody();
225
+ return json_decode($response_settings,true);
226
+
227
+ }
228
 
229
  }
230
 
app/code/community/Webpushnotification/Pushassist/controllers/Adminhtml/Pushassist/CreateaccountController.php CHANGED
@@ -19,7 +19,8 @@ class Webpushnotification_Pushassist_Adminhtml_Pushassist_CreateaccountControlle
19
  "password" => trim($post['password']),
20
  "protocol" => trim($post['protocol']),
21
  "siteurl" => trim($post['site_url']),
22
- "subdomain" => trim($post['sub_domain'])
 
23
  )
24
  );
25
 
@@ -93,58 +94,62 @@ class Webpushnotification_Pushassist_Adminhtml_Pushassist_CreateaccountControlle
93
  public function loginAction(){
94
 
95
  $post = $this->getRequest()->getPost();
96
-
97
-
98
  $result_array = Mage::helper('pushassist')->check_account_details($post);
99
 
100
- if($result_array['status'] == 'Success' || $result_array['apiKey'] != ''){
 
101
 
102
- $apiKey=$result_array['apiKey'];
103
- $apiSecret=$result_array['apiSecret'];
104
- $planType=$result_array['planType'];
105
- $subscribers_limit=$result_array['subscribers_limit'];
106
- $subscribers_remain=$result_array['subscribers_remain'];
107
- $jsPath=$result_array['jsPath'];
108
 
109
- if( $apiKey != '' ){
110
- Mage::getModel('core/config')->saveConfig('pushassistsection/general/apikey',$apiKey ,'default',0);
111
- }
112
- if($apiSecret != ''){
113
- Mage::getModel('core/config')->saveConfig('pushassistsection/general/secretkey',$apiSecret ,'default',0);
114
- }
115
- if($subscribers_remain != ''){
116
- Mage::getModel('core/config')->saveConfig('pushassistsection/general/subscribers_remain',$subscribers_remain ,'default',0);
117
- }
118
- if( $planType != '' ){
119
- Mage::getModel('core/config')->saveConfig('pushassistsection/general/planType',$planType ,'default',0);
120
- }
121
- if($subscribers_limit != ''){
122
- Mage::getModel('core/config')->saveConfig('pushassistsection/general/subscribers_limit',$subscribers_limit ,'default',0);
 
 
 
 
 
 
 
 
 
 
 
123
  }
124
- if($subscribers_remain != ''){
125
- Mage::getModel('core/config')->saveConfig('pushassistsection/general/subscribers_remain',$subscribers_remain ,'default',0);
126
- }
127
- if($jsPath != ''){
128
- Mage::getModel('core/config')->saveConfig('pushassistsection/general/jsPath',$jsPath ,'default',0);
 
 
129
  }
130
-
131
- $message = $this->__($result_array['response_message']);
132
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
133
- Mage::app()->getResponse()->setRedirect(Mage::helper("adminhtml")->getUrl("adminhtml/pushassist_dashboard/index/"));
134
  }
135
-
136
- if($result_array['status'] == 'Error') {
137
-
138
- $message = $this->__($result_array['error_message']);
139
- Mage::getSingleton('adminhtml/session')->addError($message);
140
- $this->_redirect('*/*/');
 
 
141
  }
142
- if($result_array['error'] != '') {
143
-
144
- $message = $this->__($result_array['error']);
145
- Mage::getSingleton('adminhtml/session')->addError($message);
146
- $this->_redirect('*/*/');
147
- }
148
 
149
  }
150
  }
19
  "password" => trim($post['password']),
20
  "protocol" => trim($post['protocol']),
21
  "siteurl" => trim($post['site_url']),
22
+ "subdomain" => trim($post['sub_domain']),
23
+ "psa_source" => 'Magento'
24
  )
25
  );
26
 
94
  public function loginAction(){
95
 
96
  $post = $this->getRequest()->getPost();
 
 
97
  $result_array = Mage::helper('pushassist')->check_account_details($post);
98
 
99
+ if(isset($result_array['apiKey'])){
100
+ if($result_array['apiKey'] != ''){
101
 
102
+ $apiKey=$result_array['apiKey'];
103
+ $apiSecret=$result_array['apiSecret'];
104
+ $planType=$result_array['planType'];
105
+ $subscribers_limit=$result_array['subscribers_limit'];
106
+ $subscribers_remain=$result_array['subscribers_remain'];
107
+ $jsPath=$result_array['jsPath'];
108
 
109
+ if( $apiKey != '' ){
110
+ Mage::getModel('core/config')->saveConfig('pushassistsection/general/apikey',$apiKey ,'default',0);
111
+ }
112
+ if($apiSecret != ''){
113
+ Mage::getModel('core/config')->saveConfig('pushassistsection/general/secretkey',$apiSecret ,'default',0);
114
+ }
115
+ if($subscribers_remain != ''){
116
+ Mage::getModel('core/config')->saveConfig('pushassistsection/general/subscribers_remain',$subscribers_remain ,'default',0);
117
+ }
118
+ if( $planType != '' ){
119
+ Mage::getModel('core/config')->saveConfig('pushassistsection/general/planType',$planType ,'default',0);
120
+ }
121
+ if($subscribers_limit != ''){
122
+ Mage::getModel('core/config')->saveConfig('pushassistsection/general/subscribers_limit',$subscribers_limit ,'default',0);
123
+ }
124
+ if($subscribers_remain != ''){
125
+ Mage::getModel('core/config')->saveConfig('pushassistsection/general/subscribers_remain',$subscribers_remain ,'default',0);
126
+ }
127
+ if($jsPath != ''){
128
+ Mage::getModel('core/config')->saveConfig('pushassistsection/general/jsPath',$jsPath ,'default',0);
129
+ }
130
+ if(isset($result_array['response_message'])){
131
+ $message = $this->__($result_array['response_message']);}else{$message =''; }
132
+ Mage::getSingleton('adminhtml/session')->addSuccess($message);
133
+ Mage::app()->getResponse()->setRedirect(Mage::helper("adminhtml")->getUrl("adminhtml/pushassist_dashboard/index/"));
134
  }
135
+ }
136
+ if(isset($result_array['status'])){
137
+ if($result_array['status'] == 'Error') {
138
+
139
+ $message = $this->__($result_array['error_message']);
140
+ Mage::getSingleton('adminhtml/session')->addError($message);
141
+ $this->_redirect('*/*/');
142
  }
 
 
 
 
143
  }
144
+
145
+ if(isset($result_array['error'])){
146
+ if($result_array['error'] != '') {
147
+
148
+ $message = $this->__($result_array['error']);
149
+ Mage::getSingleton('adminhtml/session')->addError($message);
150
+ $this->_redirect('*/*/');
151
+ }
152
  }
 
 
 
 
 
 
153
 
154
  }
155
  }
app/code/community/Webpushnotification/Pushassist/controllers/Adminhtml/Pushassist/NotificationsendController.php CHANGED
@@ -13,7 +13,7 @@ class Webpushnotification_Pushassist_Adminhtml_Pushassist_NotificationsendContro
13
 
14
 
15
  if(isset($_FILES['fileupload']['name']) && $_FILES['fileupload']['name'] != '') {
16
-
17
  $uploader = new Varien_File_Uploader('fileupload');
18
  $uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
19
  $uploader->setAllowRenameFiles(false);
@@ -23,7 +23,9 @@ class Webpushnotification_Pushassist_Adminhtml_Pushassist_NotificationsendContro
23
  $path = Mage::getBaseDir('media').DS.'pushassist'.DS;
24
  $uploader->save($path, $new_file_name);
25
  $post['fileupload'] = 'pushassist'.DS.$new_file_name;
26
- $full_image_path=Mage::getBaseUrl().'media/pushassist/'.$new_file_name;
 
 
27
  }
28
 
29
 
13
 
14
 
15
  if(isset($_FILES['fileupload']['name']) && $_FILES['fileupload']['name'] != '') {
16
+ $baseurl=Mage::getBaseUrl( Mage_Core_Model_Store::URL_TYPE_WEB, true );
17
  $uploader = new Varien_File_Uploader('fileupload');
18
  $uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
19
  $uploader->setAllowRenameFiles(false);
23
  $path = Mage::getBaseDir('media').DS.'pushassist'.DS;
24
  $uploader->save($path, $new_file_name);
25
  $post['fileupload'] = 'pushassist'.DS.$new_file_name;
26
+ $full_image_path=$baseurl.'media/pushassist/'.$new_file_name;
27
+ }else{
28
+ $full_image_path='';
29
  }
30
 
31
 
app/code/community/Webpushnotification/Pushassist/controllers/Adminhtml/Pushassist/SettingsController.php ADDED
@@ -0,0 +1,111 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class Webpushnotification_Pushassist_Adminhtml_Pushassist_SettingsController extends Mage_Adminhtml_Controller_Action
3
+ {
4
+ public function indexAction() {
5
+ $this->loadLayout();
6
+ $this->_title($this->__("Settings"));
7
+ $this->renderLayout();
8
+ }
9
+
10
+ public function settingsAction(){
11
+
12
+ $post = $this->getRequest()->getPost();
13
+ if($post){
14
+
15
+ if(isset($_FILES['fileupload']['name']) && $_FILES['fileupload']['name'] != '') {
16
+ $baseurl=Mage::getBaseUrl( Mage_Core_Model_Store::URL_TYPE_WEB, true );
17
+ $uploader = new Varien_File_Uploader('fileupload');
18
+ $uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
19
+ $uploader->setAllowRenameFiles(false);
20
+ $uploader->setFilesDispersion(false);
21
+ $random_digit=rand(0000,9999);
22
+ $new_file_name=$random_digit.$_FILES['fileupload']['name'];
23
+ $path = Mage::getBaseDir('media').DS.'pushassist'.DS.'site'.DS;
24
+ $uploader->save($path, $new_file_name);
25
+ $post['fileupload'] = 'pushassist'.DS.$new_file_name;
26
+ $full_image_path=$baseurl.'media/pushassist/site/'.$new_file_name;
27
+ }else{
28
+ $full_image_path='';
29
+ }
30
+
31
+
32
+ $response_array = array("templatesetting" => array("interval_time" => $post['pushassist_timeinterval'],
33
+ "opt_in_title" => trim($post['pushassist_opt_in_title']),
34
+ "opt_in_subtitle" => trim($post['pushassist_opt_in_subtitle']),
35
+ "allow_button_text" => trim($post['pushassist_allow_button_text']),
36
+ "disallow_button_text" => trim($post['pushassist_disallow_button_text']),
37
+ "template" => $post['template'],
38
+ "location" => $post['psa_template_location'],
39
+ "image_data" => $full_image_path, // read image file & pass image data
40
+ "image_name" => trim($new_file_name),
41
+ "child_window_title" => trim($post['pushassist_child_window_title']),
42
+ "child_window_message" => trim($post['pushassist_child_window_message']),
43
+ "notification_title" => trim($post['pushassist_setting_title']),
44
+ "notification_message" => trim($post['pushassist_setting_message']),
45
+ "redirect_url" => trim($post['pushassist_redirect_url']))
46
+ );
47
+
48
+ $response = Mage::helper('pushassist')->settings($response_array);
49
+
50
+ if($response['status'] == 'Success'){
51
+ $message = $this->__($response['response_message']);
52
+ Mage::getSingleton('adminhtml/session')->addSuccess($message);
53
+ $this->_redirect('*/pushassist_settings/index');
54
+
55
+
56
+ } else if($response['status'] == 'Error') {
57
+
58
+ $message = $this->__($response['error_message']);
59
+ Mage::getSingleton('adminhtml/session')->addError($message);
60
+ $this->_redirect('*/*/');
61
+ } else if($response['error'] != '') {
62
+
63
+ $message = $this->__($response['error']);
64
+ Mage::getSingleton('adminhtml/session')->addError($message);
65
+ $this->_redirect('*/*/');
66
+ }
67
+ else {
68
+ $message = $this->__($response['errors']);
69
+ Mage::getSingleton('adminhtml/session')->addError($message);
70
+ $this->_redirect('*/*/');
71
+
72
+ }
73
+ }
74
+ }
75
+
76
+ public function gsmsettingAction(){
77
+
78
+ $post = $this->getRequest()->getPost();
79
+ if($post){
80
+ $response_array = array("accountgcmsetting" => array("project_number" => $post['pushassist_gcm_project_no'],
81
+ "project_api_key" => trim($post['pushassist_gcm_api_key']))
82
+ );
83
+
84
+ $response = Mage::helper('pushassist')->gcm_setting($response_array);
85
+
86
+ if($response['status'] == 'Success'){
87
+ $message = $this->__($response['response_message']);
88
+ Mage::getSingleton('adminhtml/session')->addSuccess($message);
89
+ $this->_redirect('*/pushassist_settings/index');
90
+
91
+
92
+ } else if($response['status'] == 'Error') {
93
+
94
+ $message = $this->__($response['error_message']);
95
+ Mage::getSingleton('adminhtml/session')->addError($message);
96
+ $this->_redirect('*/*/');
97
+ } else if($response['error'] != '') {
98
+
99
+ $message = $this->__($response['error']);
100
+ Mage::getSingleton('adminhtml/session')->addError($message);
101
+ $this->_redirect('*/*/');
102
+ }
103
+ else {
104
+ $message = $this->__($response['errors']);
105
+ Mage::getSingleton('adminhtml/session')->addError($message);
106
+ $this->_redirect('*/*/');
107
+
108
+ }
109
+ }
110
+ }
111
+ }
app/code/community/Webpushnotification/Pushassist/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Webpushnotification_Pushassist>
5
- <version>1.0.3</version>
6
  </Webpushnotification_Pushassist>
7
  </modules>
8
  <global>
@@ -67,7 +67,7 @@
67
  <action>adminhtml/pushassist_segments</action>
68
  </segments>
69
  <createsegments module="pushassist">
70
- <title>Create Segment</title>
71
  <sort_order>5</sort_order>
72
  <action>adminhtml/pushassist_createsegments</action>
73
  </createsegments>
@@ -76,11 +76,17 @@
76
  <sort_order>6</sort_order>
77
  <action>adminhtml/pushassist_subscribers</action>
78
  </subscribers>
 
 
 
 
 
79
  <campaign module="pushassist">
80
  <title>Campaigns</title>
81
- <sort_order>7</sort_order>
82
  <action>adminhtml/pushassist_campaign</action>
83
  </campaign>
 
84
  <!-- <createcampaign module="pushassist">
85
  <title>Create Campaign</title>
86
  <sort_order>8</sort_order>
@@ -116,14 +122,18 @@
116
  <title>Segments</title>
117
  </segments>
118
  <createsegments translate="title">
119
- <title>Create Segment</title>
120
  </createsegments>
121
  <subscribers translate="title">
122
  <title>Subscribers</title>
123
  </subscribers>
 
 
 
124
  <campaign translate="title">
125
  <title>Campaign</title>
126
  </campaign>
 
127
  <!--<createcampaign translate="title">
128
  <title>Create Campaign</title>
129
  </createcampaign>-->
@@ -140,5 +150,14 @@
140
  </pushassist>
141
  </updates>
142
  </layout>
 
 
 
 
 
 
 
 
 
143
  </adminhtml>
144
  </config>
2
  <config>
3
  <modules>
4
  <Webpushnotification_Pushassist>
5
+ <version>1.0.4</version>
6
  </Webpushnotification_Pushassist>
7
  </modules>
8
  <global>
67
  <action>adminhtml/pushassist_segments</action>
68
  </segments>
69
  <createsegments module="pushassist">
70
+ <title>Create Segments</title>
71
  <sort_order>5</sort_order>
72
  <action>adminhtml/pushassist_createsegments</action>
73
  </createsegments>
76
  <sort_order>6</sort_order>
77
  <action>adminhtml/pushassist_subscribers</action>
78
  </subscribers>
79
+ <settings module="pushassist">
80
+ <title>Settings</title>
81
+ <sort_order>7</sort_order>
82
+ <action>adminhtml/pushassist_settings</action>
83
+ </settings>
84
  <campaign module="pushassist">
85
  <title>Campaigns</title>
86
+ <sort_order>8</sort_order>
87
  <action>adminhtml/pushassist_campaign</action>
88
  </campaign>
89
+
90
  <!-- <createcampaign module="pushassist">
91
  <title>Create Campaign</title>
92
  <sort_order>8</sort_order>
122
  <title>Segments</title>
123
  </segments>
124
  <createsegments translate="title">
125
+ <title>Create Segments</title>
126
  </createsegments>
127
  <subscribers translate="title">
128
  <title>Subscribers</title>
129
  </subscribers>
130
+ <settings translate="title">
131
+ <title>Settings</title>
132
+ </settings>
133
  <campaign translate="title">
134
  <title>Campaign</title>
135
  </campaign>
136
+
137
  <!--<createcampaign translate="title">
138
  <title>Create Campaign</title>
139
  </createcampaign>-->
150
  </pushassist>
151
  </updates>
152
  </layout>
153
+ <translate>
154
+ <modules>
155
+ <Webpushnotification_Pushassist>
156
+ <files>
157
+ <default>Webpushnotification_Pushassist.csv</default>
158
+ </files>
159
+ </Webpushnotification_Pushassist>
160
+ </modules>
161
+ </translate>
162
  </adminhtml>
163
  </config>
app/design/adminhtml/default/default/layout/pushassist.xml CHANGED
@@ -66,6 +66,15 @@
66
  <block type="pushassist/adminhtml_campaign" name="campaign" template="pushassist/campaign.phtml"/>
67
  </reference>
68
  </adminhtml_pushassist_campaign_index>
 
 
 
 
 
 
 
 
 
69
  <!--<adminhtml_pushassist_createcampaign_index>
70
  <reference name="head">
71
  <action method="addItem"><type>skin_css</type><name>pushassist/content_base.css</name><params/></action>
66
  <block type="pushassist/adminhtml_campaign" name="campaign" template="pushassist/campaign.phtml"/>
67
  </reference>
68
  </adminhtml_pushassist_campaign_index>
69
+ <adminhtml_pushassist_settings_index>
70
+ <reference name="head">
71
+ <action method="addItem"><type>skin_css</type><name>pushassist/content_base.css</name><params/></action>
72
+ <action method="addJs"><script>pushassist/jquery.min.js</script></action>
73
+ </reference>
74
+ <reference name="content">
75
+ <block type="pushassist/adminhtml_settings" name="settings" template="pushassist/settings.phtml"/>
76
+ </reference>
77
+ </adminhtml_pushassist_settings_index>
78
  <!--<adminhtml_pushassist_createcampaign_index>
79
  <reference name="head">
80
  <action method="addItem"><type>skin_css</type><name>pushassist/content_base.css</name><params/></action>
app/design/adminhtml/default/default/template/pushassist/campaign.phtml CHANGED
@@ -3,29 +3,31 @@ $get_campaigns = Mage::helper('pushassist')->get_campaigns();
3
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
4
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
5
  $account_response = Mage::helper('pushassist')->get_account_details();
 
6
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
7
-
8
- if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] == '' && $account_response ) {
9
  if( count($get_campaigns) > 0){
10
  //print_r($get_segement);
11
  ?>
12
  <div id="Psidebar" >
13
  <ul>
14
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
15
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
16
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
17
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
18
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
19
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
20
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
21
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
22
- </ul>
 
23
  </div>
24
  <!-- Content Start -->
25
  <div id="pushassist" class="content dashboard clearfix">
26
  <!-- Start Page Header -->
27
  <div class="page-header">
28
- <h1 class="title">Campaigns</h1>
29
  </div>
30
  <!-- End Page Header -->
31
 
@@ -39,10 +41,12 @@ if( count($get_campaigns) > 0){
39
 
40
  <div class="panel-body">
41
 
42
- <p><strong>Campaigns</strong></p>
43
- <p class="margin-b-20">Following screenshot shows how you can create and schedule a campaign. <strong> This feature is available in premium plans.</strong> </p>
 
 
44
  <p class="align-center margin-b-25">
45
- <a href="<?php echo $account_url;?>" target="_blank" class="btn btn-default margin-t-0">Upgrade to Premium</a>
46
  </p>
47
  <div class="margin-t-15 image_wrapper">
48
 
@@ -58,7 +62,7 @@ if( count($get_campaigns) > 0){
58
  </div>
59
  <!-- Content End -->
60
  <?php }else{
61
- echo "No result found.";
62
  }
63
  }else{
64
  Mage::app()->getResponse()->setRedirect(Mage::helper("adminhtml")->getUrl("adminhtml/pushassist_createaccount/index/"));
3
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
4
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
5
  $account_response = Mage::helper('pushassist')->get_account_details();
6
+ if(isset($account_response['account_name'])){
7
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
8
+ }
9
+ if($check_api_key!='' && $check_secret_key != '' && (!isset($account_response['error'] )) && $account_response ) {
10
  if( count($get_campaigns) > 0){
11
  //print_r($get_segement);
12
  ?>
13
  <div id="Psidebar" >
14
  <ul>
15
+ <!-- <li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
16
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
17
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
18
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
19
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
20
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
21
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
22
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
23
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
24
+ </ul>
25
  </div>
26
  <!-- Content Start -->
27
  <div id="pushassist" class="content dashboard clearfix">
28
  <!-- Start Page Header -->
29
  <div class="page-header">
30
+ <h1 class="title"><?php echo $this->__('Campaigns');?></h1>
31
  </div>
32
  <!-- End Page Header -->
33
 
41
 
42
  <div class="panel-body">
43
 
44
+ <p><strong><?php echo $this->__('Campaigns');?></strong></p>
45
+ <p class="margin-b-20">
46
+ <?php echo $this->__('Following screenshot shows how you can create and schedule a campaign.');?>
47
+ <strong><?php echo $this->__('This feature is available in premium plans.');?> </strong> </p>
48
  <p class="align-center margin-b-25">
49
+ <a href="<?php echo $account_url;?>" target="_blank" class="btn btn-default margin-t-0"><?php echo $this->__('Upgrade to Premium');?></a>
50
  </p>
51
  <div class="margin-t-15 image_wrapper">
52
 
62
  </div>
63
  <!-- Content End -->
64
  <?php }else{
65
+ echo $this->__('No result found.');
66
  }
67
  }else{
68
  Mage::app()->getResponse()->setRedirect(Mage::helper("adminhtml")->getUrl("adminhtml/pushassist_createaccount/index/"));
app/design/adminhtml/default/default/template/pushassist/create_account.phtml CHANGED
@@ -2,19 +2,23 @@
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
 
5
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
6
  $allsites='https://'.$account_response['account_name'].'.pushassist.com/allsites/';
 
7
  ?>
8
  <div id="Psidebar" >
9
  <ul>
10
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
11
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
12
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
13
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
14
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
15
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
16
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
17
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
 
 
18
  </ul>
19
  </div>
20
  <!-- Content Start -->
@@ -23,7 +27,7 @@ $allsites='https://'.$account_response['account_name'].'.pushassist.com/allsites
23
 
24
  <!-- Start Page Header -->
25
  <div class="page-header">
26
- <h1 class="title">Create Account</h1>
27
  </div>
28
  <!-- End Page Header -->
29
 
@@ -31,7 +35,7 @@ $allsites='https://'.$account_response['account_name'].'.pushassist.com/allsites
31
  <div class="container-widget clearfix">
32
  <div class="alert alert-danger alert-dismissable" id="pushassist_error" style="display: none"></div>
33
  <div class="col-md-6" style="<?php if(isset($account_response['account_name'])) { echo 'display:none'; }?>">
34
- <h3>Create an Account</h3>
35
  <div class="panel panel-default">
36
  <div class="panel-body">
37
  <form name="registration_form" id="registration_form" class="space-top" action="<?php echo $this->getUrl('*/*/createaccount'); ?>" method="post">
@@ -105,7 +109,7 @@ $allsites='https://'.$account_response['account_name'].'.pushassist.com/allsites
105
  <div class="col-sm-12">
106
  <div class="form-group">
107
  <div>
108
- <button type="submit" class="btn btn-default">Create Account</button>
109
  </div>
110
  </div>
111
  </div>
@@ -139,7 +143,7 @@ $allsites='https://'.$account_response['account_name'].'.pushassist.com/allsites
139
  <div class="col-sm-12">
140
  <div class="form-group">
141
  <div class="">
142
- <button type="submit" class="btn btn-default">Submit</button>
143
  </div>
144
  </div>
145
  </div>
@@ -148,7 +152,7 @@ $allsites='https://'.$account_response['account_name'].'.pushassist.com/allsites
148
  </form>
149
  </div>
150
  </div>
151
- <h3>How to get API Keys</h3>
152
  <div class="panel panel-default">
153
 
154
  If you are an existing user of PushAssist you can find your api keys under your PushAssit control panel.To get your API and Secret
@@ -159,31 +163,21 @@ $allsites='https://'.$account_response['account_name'].'.pushassist.com/allsites
159
 
160
  <hr>
161
  <br>
162
- <p><strong>What is a GCM Key? How do I get export my subscribers, What if I want to switch to other
163
- vendor.</strong></p>
164
- <p class="margin-b-15 margin-t-15">At the time of installation, you have to provide your GCM (Google
165
- Cloud Messaging) API Key for Chrome and Certificate Details for Safari that is used.</p>
166
- <p>We need this information to export your subscriber’s ID’s. Please note that only premium accounts
167
- can export the subscribers.</p>
168
- <p class="margin-b-15 margin-t-15">Please read <a href="https://pushassist.com/adding-your-own-gcm-key-project-id-in-pushassist/" target="_blank"> GCM registration </a> guidelines here.</p>
 
 
169
 
170
 
171
 
172
  </div>
173
  </div><!-- col-md-6-->
174
- <div class="col-md-6" style="<?php if(!isset($account_response['account_name'])) { echo 'display:none'; }?>">
175
- <div class="panel panel-default">
176
- <div class="panel-body">
177
- <p>Screenshot of advance configurations that are possible with your PushAssist account. &nbsp;&nbsp;&nbsp;
178
-
179
- <a href="<?php echo $allsites;?>" class="btn btn-default margin-t-0" target="_blank">Customize Now</a></p>
180
-
181
- <div class="margin-t-15 image_wrapper">
182
- <img src="<?php echo $this->getSkinUrl('pushassist/notification_setting.png') ?>" alt="Notification Opt-in Box Setting">
183
- </div>
184
- </div>
185
- </div>
186
- </div>
187
  </div><!-- Container End -->
188
 
189
  </div>
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
5
+ if(isset($account_response['account_name'])){
6
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
7
  $allsites='https://'.$account_response['account_name'].'.pushassist.com/allsites/';
8
+ }
9
  ?>
10
  <div id="Psidebar" >
11
  <ul>
12
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>"><?php echo $this->__('Create an Account');?></a></li>
13
+ <!--<li><a href="<?php //echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
14
+ <li><a href="<?php //echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
15
+ <li><a href="<?php //echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
16
+ <li><a href="<?php //echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
17
+ <li><a href="<?php //echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segments</a></li>
18
+ <li><a href="<?php //echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
19
+ <li><a href="<?php //echo $this->getUrl('*/pushassist_settings'); ?>">Settings</a></li>
20
+ <li><a href="<?php //echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
21
+ -->
22
  </ul>
23
  </div>
24
  <!-- Content Start -->
27
 
28
  <!-- Start Page Header -->
29
  <div class="page-header">
30
+ <h1 class="title"><?php echo $this->__('Create Account');?></h1>
31
  </div>
32
  <!-- End Page Header -->
33
 
35
  <div class="container-widget clearfix">
36
  <div class="alert alert-danger alert-dismissable" id="pushassist_error" style="display: none"></div>
37
  <div class="col-md-6" style="<?php if(isset($account_response['account_name'])) { echo 'display:none'; }?>">
38
+ <h3><?php echo $this->__('Create an Account');?></h3>
39
  <div class="panel panel-default">
40
  <div class="panel-body">
41
  <form name="registration_form" id="registration_form" class="space-top" action="<?php echo $this->getUrl('*/*/createaccount'); ?>" method="post">
109
  <div class="col-sm-12">
110
  <div class="form-group">
111
  <div>
112
+ <button type="submit" class="btn btn-default"><?php echo $this->__('Create Account');?></button>
113
  </div>
114
  </div>
115
  </div>
143
  <div class="col-sm-12">
144
  <div class="form-group">
145
  <div class="">
146
+ <button type="submit" class="btn btn-default"><?php echo $this->__('Submit');?></button>
147
  </div>
148
  </div>
149
  </div>
152
  </form>
153
  </div>
154
  </div>
155
+ <h3><?php echo $this->__('How to get API Keys');?></h3>
156
  <div class="panel panel-default">
157
 
158
  If you are an existing user of PushAssist you can find your api keys under your PushAssit control panel.To get your API and Secret
163
 
164
  <hr>
165
  <br>
166
+ <p><strong><?php echo $this->__('What is a GCM Key? How do I get export my subscribers, What if I want to switch to other vendor.');?></strong></p>
167
+ <p class="margin-b-15 margin-t-15">
168
+ <?php echo $this->__('At the time of installation, you have to provide your GCM (Google
169
+ Cloud Messaging) API Key for Chrome and Certificate Details for Safari that is used.');?>
170
+ </p>
171
+ <p><?php echo $this->__('We need this information to export your subscriber’s ID’s. Please note that only premium accounts
172
+ can export the subscribers.');?></p>
173
+ <p class="margin-b-15 margin-t-15">Please read <a href="https://pushassist.com/adding-your-own-gcm-key-project-id-in-pushassist/" target="_blank">
174
+ <?php echo $this->__('GCM registration');?> </a><?php echo $this->__('guidelines here.');?> </p>
175
 
176
 
177
 
178
  </div>
179
  </div><!-- col-md-6-->
180
+
 
 
 
 
 
 
 
 
 
 
 
 
181
  </div><!-- Container End -->
182
 
183
  </div>
app/design/adminhtml/default/default/template/pushassist/createcampaign.phtml CHANGED
@@ -2,8 +2,9 @@
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
 
5
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
6
-
7
  if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] == '' && $account_response) {
8
  ?>
9
  <form action="<?php echo $this->getUrl('*/*/sendcampaign'); ?>" method="post" name="campaign" enctype='multipart/form-data'>
@@ -11,14 +12,15 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
11
  <!-- Content Start -->
12
  <div id="Psidebar" >
13
  <ul>
14
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
15
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
16
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
17
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
18
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
19
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
20
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
21
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
 
22
  </ul>
23
  </div>
24
  <div id="pushassist" class="content clearfix">
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
5
+ if(isset($account_response['account_name'])){
6
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
7
+ }
8
  if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] == '' && $account_response) {
9
  ?>
10
  <form action="<?php echo $this->getUrl('*/*/sendcampaign'); ?>" method="post" name="campaign" enctype='multipart/form-data'>
12
  <!-- Content Start -->
13
  <div id="Psidebar" >
14
  <ul>
15
+ <!--<li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
16
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
17
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
18
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
19
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
20
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
21
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
22
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
23
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
24
  </ul>
25
  </div>
26
  <div id="pushassist" class="content clearfix">
app/design/adminhtml/default/default/template/pushassist/createsegments.phtml CHANGED
@@ -2,30 +2,32 @@
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
 
5
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
6
-
7
- if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] == '' && $account_response) {
8
  ?>
9
 
10
 
11
  <input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
12
  <div id="Psidebar" >
13
  <ul>
14
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
15
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
16
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
17
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
18
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
19
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
20
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
21
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
 
22
  </ul>
23
  </div>
24
  <!-- Content Start -->
25
  <div id="pushassist" class="content clearfix">
26
  <!-- Start Page Header -->
27
  <div class="page-header">
28
- <h1 class="title">Create a New Segment</h1>
29
  </div>
30
  <!-- End Page Header -->
31
 
@@ -38,16 +40,16 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
38
  <form class="form-horizontal" action="<?php echo $this->getUrl('*/*/addsegments'); ?>" method="post" autocomplete="off" id="create_segment_form" name="create_segment_form" enctype="multipart/form-data">
39
  <input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
40
  <div class="form-group">
41
- <label class="col-sm-3 control-label form-label">Segment Name</label>
42
  <div class="col-sm-9">
43
- <input type="text" class="form-control" id="title" name="title" placeholder="Enter Segment Name here" maxlength="40" required="required" />
44
- <span class="pull-right">Segment Name Limit 40 Characters.Example segment name:Google</span>
45
  </div>
46
  </div>
47
 
48
  <div class="form-group">
49
  <div class="col-sm-offset-3 col-sm-1 col-xs-3">
50
- <button type="submit" class="btn btn-default">Send</button>
51
  </div>
52
  </div>
53
  </form>
@@ -57,14 +59,14 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
57
 
58
  <div class="col-md-6 dummy-notification shadow panel panel-default">
59
 
60
- <p class="h5 pb15"><strong>How to Implement Segments for your Push Notification Subscribers</strong></p>
61
 
62
  <div class="widget shadow dummy-notification-inner-wrapper pb15">
63
- <p><strong>Step 1 :</strong> Create a new segment. Go to Create Segments</p>
64
 
65
- <p><strong>Step 2 :</strong> Copy the following JavaScript code and paste it on your site page(s).</p>
66
 
67
- <p class="margin-t-20"><strong>Subscribe for Single Segment</strong></p>
68
  <p>
69
  &lt;script&gt;
70
  <br>
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
5
+ if(isset($account_response['account_name'])){
6
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
7
+ }
8
+ if($check_api_key!='' && $check_secret_key != '' && (!isset($account_response['error'] )) && $account_response) {
9
  ?>
10
 
11
 
12
  <input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
13
  <div id="Psidebar" >
14
  <ul>
15
+ <!--<li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
16
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
17
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
18
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
19
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
20
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
21
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
22
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
23
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
24
  </ul>
25
  </div>
26
  <!-- Content Start -->
27
  <div id="pushassist" class="content clearfix">
28
  <!-- Start Page Header -->
29
  <div class="page-header">
30
+ <h1 class="title"><?php echo $this->__('Create Segment') ?></h1>
31
  </div>
32
  <!-- End Page Header -->
33
 
40
  <form class="form-horizontal" action="<?php echo $this->getUrl('*/*/addsegments'); ?>" method="post" autocomplete="off" id="create_segment_form" name="create_segment_form" enctype="multipart/form-data">
41
  <input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
42
  <div class="form-group">
43
+ <label class="col-sm-3 control-label form-label"><?php echo $this->__('Segment Name') ?></label>
44
  <div class="col-sm-9">
45
+ <input type="text" class="form-control" id="title" name="title" placeholder="Segment Name" maxlength="40" required="required" />
46
+ <span class="pull-right"><?php echo $this->__('Limit 40 Characters. E.g. Google') ?></span>
47
  </div>
48
  </div>
49
 
50
  <div class="form-group">
51
  <div class="col-sm-offset-3 col-sm-1 col-xs-3">
52
+ <button type="submit" class="btn btn-default"><?php echo $this->__('Create Segment') ?></button>
53
  </div>
54
  </div>
55
  </form>
59
 
60
  <div class="col-md-6 dummy-notification shadow panel panel-default">
61
 
62
+ <p class="h5 pb15"><strong><?php echo $this->__('How to Implement Segments for your Push Notification Subscribers') ?></strong></p>
63
 
64
  <div class="widget shadow dummy-notification-inner-wrapper pb15">
65
+ <p><strong><?php echo $this->__('Step 1') ?> :</strong> <?php echo $this->__('Create a new segment. Go to Create Segments') ?></p>
66
 
67
+ <p><strong><?php echo $this->__('Step 2') ?> :</strong> <?php echo $this->__('Copy the following JavaScript code and paste it on your site page(s).') ?></p>
68
 
69
+ <p class="margin-t-20"><strong><?php echo $this->__('Subscribe for Single Segment') ?></strong></p>
70
  <p>
71
  &lt;script&gt;
72
  <br>
app/design/adminhtml/default/default/template/pushassist/dashboard.phtml CHANGED
@@ -3,10 +3,12 @@ $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/api
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $dashboard_response = Mage::helper('pushassist')->get_dashboard();
5
  $account_response = Mage::helper('pushassist')->get_account_details();
 
6
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
 
7
  $get_subscribers = Mage::helper('pushassist')->get_subscribers();
8
 
9
- if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] == '' && $account_response) {
10
 
11
  ?>
12
  <?php if(count($get_subscribers) < 1) { ?>
@@ -17,24 +19,25 @@ Your Account Details have already been emailed to you. Also check under SPAM if
17
  <!-- Content Start -->
18
  <div id="Psidebar" >
19
  <ul>
20
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
21
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
22
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
23
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
24
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
25
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
26
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
27
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
28
- </ul>
 
29
  </div>
30
 
31
  <div id="pushassist" class="content dashboard clearfix">
32
 
33
  <!-- Start Page Header -->
34
  <div class="page-header">
35
- <h1 class="title">Dashboard</h1>
36
- <div class="sub_count"><span><?php echo $account_response['subscribers_remain'];?> subscribers left</span>
37
- <a href="<?php echo $account_url;?>" target="_blank">Upgrade to Premium</a>
38
  </div>
39
  </div>
40
  <!-- End Page Header -->
@@ -45,7 +48,7 @@ Your Account Details have already been emailed to you. Also check under SPAM if
45
  <div class="col-md-12">
46
  <ul class="topstats clearfix">
47
  <li class="col-xs-6 col-lg-2">
48
- <span class="title"><i class="fa fa-send"></i> Total Delivered </span>
49
  <h3><?php echo $dashboard_response['total_delivered']; ?></h3>
50
  <span class="diff">
51
  <?php if ($dashboard_response['delivered_change'] == 'negative') { ?>
@@ -56,11 +59,11 @@ Your Account Details have already been emailed to you. Also check under SPAM if
56
  <?php } ?>%
57
 
58
 
59
- </b> from last week</span>
60
  </li>
61
 
62
  <li class="col-xs-6 col-lg-2">
63
- <span class="title"><i class="fa fa-check-square-o"></i> Total Clicks </span>
64
  <h3 class="color-up"><?php echo $dashboard_response['total_clicks']; ?></h3>
65
  <span class="diff">
66
  <?php if ($dashboard_response['clicks_change'] == 'negative') { ?>
@@ -69,11 +72,11 @@ Your Account Details have already been emailed to you. Also check under SPAM if
69
  <b class="color-up"><i class="fa fa-caret-up"></i> <?php echo $dashboard_response['clicks_percentage']; ?>
70
  <?php } ?>%
71
 
72
- </b> from last week</span>
73
  </li>
74
 
75
  <li class="col-xs-6 col-lg-2">
76
- <span class="title"><i class="fa fa-send"></i> Total Subscribers </span>
77
  <h3><?php echo $dashboard_response['total_subscribers']; ?></h3>
78
  <span class="diff">
79
  <?php if ($dashboard_response['subscribers_change'] == 'negative') { ?>
@@ -82,27 +85,27 @@ Your Account Details have already been emailed to you. Also check under SPAM if
82
  <b class="color-up"><i class="fa fa-caret-up"></i> <?php echo $dashboard_response['subscribers_percentage']; ?>
83
  <?php } ?>%
84
 
85
- </b> from last week</span>
86
  </li>
87
 
88
 
89
 
90
  <li class="col-xs-6 col-lg-2">
91
- <span class="title"><i class="fa fa-cogs"></i> Campaigns </span>
92
  <h3 class="color-up"><?php echo $dashboard_response['campaign_count']; ?></h3>
93
- <span class="diff"><b class="color-down"></b> active this week</span>
94
  </li>
95
 
96
  <li class="col-xs-6 col-lg-2">
97
- <span class="title"><i class="fa fa-users"></i> Segments </span>
98
  <h3 class="color-up"><?php echo $dashboard_response['segment_count']; ?></h3>
99
- <span class="diff"><b class="color-down"></b> created </span>
100
  </li>
101
 
102
  <li class="col-xs-6 col-lg-2">
103
- <span class="title"><i class="fa fa-sitemap"></i> Sites</span>
104
  <h3 class="color-up"><?php echo $dashboard_response['sites_count']; ?></h3>
105
- <span class="diff"><b class="color-down"></b>registered</span>
106
  </li>
107
  </ul>
108
  </div>
@@ -115,10 +118,7 @@ Your Account Details have already been emailed to you. Also check under SPAM if
115
  <div class="col-md-12 col-lg-12">
116
  <div class="panel panel-widget">
117
  <?php if(count($dashboard_response['last_notifications']) > 0){?>
118
- <div class="panel-title">
119
- Last <span class="label label-info">5</span> Notifications
120
-
121
- </div>
122
  <div class="panel-search">
123
  <form>
124
  <input type="text" class="form-control" placeholder="Search...">
@@ -131,20 +131,22 @@ Your Account Details have already been emailed to you. Also check under SPAM if
131
  <thead>
132
  <tr>
133
  <td>#</td>
134
- <td>Site</td>
135
- <td>Message</td>
136
- <td>Sent</td>
137
- <td>Delivered</td>
138
- <td>Failed</td>
139
- <td>Clicked</td>
140
- <td>Campaign</td>
141
- <td>Created Date</td>
142
  </tr>
143
  </thead>
144
  <tbody>
145
  <?php $i=1;
146
  foreach( $dashboard_response['last_notifications'] as $get_notifications_list){
147
- $clicked_percentage=($get_notifications_list['total_clicked']/$get_notifications_list['total_sent'])*100;
 
 
148
  ?>
149
  <tr>
150
  <td><?php echo $i;?></td>
@@ -152,7 +154,7 @@ Your Account Details have already been emailed to you. Also check under SPAM if
152
  <td class="message">
153
  <div class="col-sm-10">
154
  <h5 class="margin-t-0 font-bold">
155
- <a target="_blank" href="<?php echo $get_notifications_list['url'];?>"><?php echo $get_notifications_list['title'];?> </a>
156
  </h5>
157
  <p class="margin-b-5"><?php echo $get_notifications_list['message'];?></p>
158
  <a target="_blank" href="<?php echo $get_notifications_list['url'];?>">
@@ -170,8 +172,8 @@ Your Account Details have already been emailed to you. Also check under SPAM if
170
  ?>
171
  <b class="color-up margin-l-10"> <?php echo (int)$clicked_percentage; } else { ?> <b class="color-up margin-l-10">0 <?php } ?> %</b>
172
  </td>
 
173
  <td><?php if($get_notifications_list['campaign_flag']==0){ echo "No";}else{ echo "Yes";}?></td>
174
- <td><?php echo date("M d, Y H:i:s",strtotime($get_notifications_list['created_at']));?></td>
175
  </tr>
176
  <?php
177
  $i++;
@@ -182,7 +184,7 @@ Your Account Details have already been emailed to you. Also check under SPAM if
182
  </div>
183
 
184
 
185
- <?php }else{ echo "No result Found";} ?>
186
  </div>
187
  </div>
188
  <!-- Project Stats End -->
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $dashboard_response = Mage::helper('pushassist')->get_dashboard();
5
  $account_response = Mage::helper('pushassist')->get_account_details();
6
+ if(isset($account_response['account_name'])){
7
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
8
+ }
9
  $get_subscribers = Mage::helper('pushassist')->get_subscribers();
10
 
11
+ if($check_api_key!='' && $check_secret_key != '' && (!isset($account_response['error'] )) && $account_response) {
12
 
13
  ?>
14
  <?php if(count($get_subscribers) < 1) { ?>
19
  <!-- Content Start -->
20
  <div id="Psidebar" >
21
  <ul>
22
+ <!--<li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
23
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
24
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
25
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
26
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
27
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
28
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
29
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
30
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
31
+ </ul>
32
  </div>
33
 
34
  <div id="pushassist" class="content dashboard clearfix">
35
 
36
  <!-- Start Page Header -->
37
  <div class="page-header">
38
+ <h1 class="title"><?php echo $this->__('Dashboard');?></h1>
39
+ <div class="sub_count"><span><?php echo $account_response['subscribers_remain'];?> <?php echo $this->__('subscribers left');?></span>
40
+ <a href="<?php echo $account_url;?>" target="_blank"><?php echo $this->__('Upgrade to Premium');?></a>
41
  </div>
42
  </div>
43
  <!-- End Page Header -->
48
  <div class="col-md-12">
49
  <ul class="topstats clearfix">
50
  <li class="col-xs-6 col-lg-2">
51
+ <span class="title"><i class="fa fa-send"></i> <?php echo $this->__('Total Delivered');?> </span>
52
  <h3><?php echo $dashboard_response['total_delivered']; ?></h3>
53
  <span class="diff">
54
  <?php if ($dashboard_response['delivered_change'] == 'negative') { ?>
59
  <?php } ?>%
60
 
61
 
62
+ </b> <?php echo $this->__('from last week');?></span>
63
  </li>
64
 
65
  <li class="col-xs-6 col-lg-2">
66
+ <span class="title"><i class="fa fa-check-square-o"></i> <?php echo $this->__('Total Clicks');?> </span>
67
  <h3 class="color-up"><?php echo $dashboard_response['total_clicks']; ?></h3>
68
  <span class="diff">
69
  <?php if ($dashboard_response['clicks_change'] == 'negative') { ?>
72
  <b class="color-up"><i class="fa fa-caret-up"></i> <?php echo $dashboard_response['clicks_percentage']; ?>
73
  <?php } ?>%
74
 
75
+ </b> <?php echo $this->__('from last week');?></span>
76
  </li>
77
 
78
  <li class="col-xs-6 col-lg-2">
79
+ <span class="title"><i class="fa fa-users"></i> <?php echo $this->__('Total Subscribers');?> </span>
80
  <h3><?php echo $dashboard_response['total_subscribers']; ?></h3>
81
  <span class="diff">
82
  <?php if ($dashboard_response['subscribers_change'] == 'negative') { ?>
85
  <b class="color-up"><i class="fa fa-caret-up"></i> <?php echo $dashboard_response['subscribers_percentage']; ?>
86
  <?php } ?>%
87
 
88
+ </b> <?php echo $this->__('from last week');?></span>
89
  </li>
90
 
91
 
92
 
93
  <li class="col-xs-6 col-lg-2">
94
+ <span class="title"><i class="fa fa-cogs"></i> <?php echo $this->__('Campaigns');?> </span>
95
  <h3 class="color-up"><?php echo $dashboard_response['campaign_count']; ?></h3>
96
+ <span class="diff"><b class="color-down"></b> <?php echo $this->__('active this week');?></span>
97
  </li>
98
 
99
  <li class="col-xs-6 col-lg-2">
100
+ <span class="title"><i class="fa fa-send"></i> <?php echo $this->__('Segments');?> </span>
101
  <h3 class="color-up"><?php echo $dashboard_response['segment_count']; ?></h3>
102
+ <span class="diff"><b class="color-down"></b> <?php echo $this->__('created');?> </span>
103
  </li>
104
 
105
  <li class="col-xs-6 col-lg-2">
106
+ <span class="title"><i class="fa fa-sitemap"></i> <?php echo $this->__('Sites');?> </span>
107
  <h3 class="color-up"><?php echo $dashboard_response['sites_count']; ?></h3>
108
+ <span class="diff"><b class="color-down"></b><?php echo $this->__('registered');?></span>
109
  </li>
110
  </ul>
111
  </div>
118
  <div class="col-md-12 col-lg-12">
119
  <div class="panel panel-widget">
120
  <?php if(count($dashboard_response['last_notifications']) > 0){?>
121
+
 
 
 
122
  <div class="panel-search">
123
  <form>
124
  <input type="text" class="form-control" placeholder="Search...">
131
  <thead>
132
  <tr>
133
  <td>#</td>
134
+ <td><?php echo $this->__('Site');?></td>
135
+ <td><?php echo $this->__('Message');?></td>
136
+ <td><?php echo $this->__('Total Sent');?></td>
137
+ <td><?php echo $this->__('Delivered');?></td>
138
+ <td><?php echo $this->__('Failed');?></td>
139
+ <td><?php echo $this->__('Clicked');?></td>
140
+ <td><?php echo $this->__('Created Date');?></td>
141
+ <td><?php echo $this->__('Is Campaign');?></td>
142
  </tr>
143
  </thead>
144
  <tbody>
145
  <?php $i=1;
146
  foreach( $dashboard_response['last_notifications'] as $get_notifications_list){
147
+
148
+ $clicked_percentage=@($get_notifications_list['total_clicked']/$get_notifications_list['total_sent'])*100;
149
+
150
  ?>
151
  <tr>
152
  <td><?php echo $i;?></td>
154
  <td class="message">
155
  <div class="col-sm-10">
156
  <h5 class="margin-t-0 font-bold">
157
+ <?php echo $get_notifications_list['title'];?>
158
  </h5>
159
  <p class="margin-b-5"><?php echo $get_notifications_list['message'];?></p>
160
  <a target="_blank" href="<?php echo $get_notifications_list['url'];?>">
172
  ?>
173
  <b class="color-up margin-l-10"> <?php echo (int)$clicked_percentage; } else { ?> <b class="color-up margin-l-10">0 <?php } ?> %</b>
174
  </td>
175
+ <td><?php echo date("M d, Y H:i:s",strtotime($get_notifications_list['created_at']));?></td>
176
  <td><?php if($get_notifications_list['campaign_flag']==0){ echo "No";}else{ echo "Yes";}?></td>
 
177
  </tr>
178
  <?php
179
  $i++;
184
  </div>
185
 
186
 
187
+ <?php }else{ echo $this->__('No result Found');} ?>
188
  </div>
189
  </div>
190
  <!-- Project Stats End -->
app/design/adminhtml/default/default/template/pushassist/notification.phtml CHANGED
@@ -4,30 +4,33 @@ $get_notifications = Mage::helper('pushassist')->get_notifications();
4
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
5
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
6
  $account_response = Mage::helper('pushassist')->get_account_details();
 
7
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
 
8
 
9
  if($check_api_key!='' && $check_secret_key != '') {
10
 
11
  ?>
12
  <div id="Psidebar" >
13
  <ul>
14
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
15
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
16
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
17
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
18
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
19
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
20
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
21
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
22
- </ul>
 
23
  </div>
24
  <!-- Content Start -->
25
  <div id="pushassist" class="content dashboard clearfix">
26
  <!-- Start Page Header -->
27
  <div class="page-header">
28
- <h1 class="title">Notifications</h1>
29
  <div class="sub_count">
30
- <a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send New Notification</a>
31
  </div>
32
  </div>
33
  <!-- End Page Header -->
@@ -40,29 +43,25 @@ if($check_api_key!='' && $check_secret_key != '') {
40
  <div class="col-md-12 col-lg-12">
41
  <div class="panel panel-widget">
42
  <?php if( count($get_notifications) > 0){ ?>
43
- <div class="panel-title">
44
- Last <span class="label label-info"><?php echo count($get_notifications);?></span> Notifications
45
-
46
- </div>
47
-
48
  <div class="panel-body table-responsive">
49
  <table class="table table-hover">
50
  <thead>
51
  <tr>
52
  <td>#</td>
53
- <td>site url</td>
54
- <td>message</td>
55
- <td>Sent</td>
56
- <td>Delivered</td>
57
- <td>failed</td>
58
- <td>clicked</td>
59
- <td>Created Date</td>
60
  </tr>
61
  </thead>
62
  <tbody>
63
  <?php $i = 1;
64
  foreach($get_notifications as $get_notifications_list){
65
- $clicked_percentage=($get_notifications_list['total_clicked']/$get_notifications_list['total_sent'])*100;
66
  ?>
67
  <tr>
68
 
@@ -75,8 +74,8 @@ if($check_api_key!='' && $check_secret_key != '') {
75
 
76
  <div class="col-sm-8">
77
  <h5 class="margin-t-0 font-bold">
78
- <a href="<?php echo $get_notifications_list['url'];?>" target="_blank">
79
- <?php echo $get_notifications_list['title'];?></a>
80
  </h5>
81
  <p class="margin-b-5"><?php echo $get_notifications_list['message'];?></p>
82
  <a target="_blank" href="<?php echo $get_notifications_list['redirecturl'];?>"><?php echo $get_notifications_list['redirecturl'];?></a>
@@ -101,7 +100,7 @@ if($check_api_key!='' && $check_secret_key != '') {
101
  </tbody>
102
  </table>
103
  </div>
104
- <?php }else{ echo 'No result found';}?>
105
  </div>
106
  </div>
107
  <!-- Project Stats End -->
4
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
5
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
6
  $account_response = Mage::helper('pushassist')->get_account_details();
7
+ if(isset($account_response['account_name'])){
8
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
9
+ }
10
 
11
  if($check_api_key!='' && $check_secret_key != '') {
12
 
13
  ?>
14
  <div id="Psidebar" >
15
  <ul>
16
+ <!--<li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
17
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
18
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
19
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
20
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
21
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
22
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
23
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
24
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
25
+ </ul>
26
  </div>
27
  <!-- Content Start -->
28
  <div id="pushassist" class="content dashboard clearfix">
29
  <!-- Start Page Header -->
30
  <div class="page-header">
31
+ <h1 class="title"><?php echo $this->__('Sent Notifications')?></h1>
32
  <div class="sub_count">
33
+ <a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send New Notification')?></a>
34
  </div>
35
  </div>
36
  <!-- End Page Header -->
43
  <div class="col-md-12 col-lg-12">
44
  <div class="panel panel-widget">
45
  <?php if( count($get_notifications) > 0){ ?>
46
+
 
 
 
 
47
  <div class="panel-body table-responsive">
48
  <table class="table table-hover">
49
  <thead>
50
  <tr>
51
  <td>#</td>
52
+ <td><?php echo $this->__('Site Url')?></td>
53
+ <td><?php echo $this->__('Message')?></td>
54
+ <td><?php echo $this->__('Total Sent')?></td>
55
+ <td><?php echo $this->__('Delivered')?></td>
56
+ <td><?php echo $this->__('Failed')?></td>
57
+ <td><?php echo $this->__('Clicked')?></td>
58
+ <td><?php echo $this->__('Created Date')?></td>
59
  </tr>
60
  </thead>
61
  <tbody>
62
  <?php $i = 1;
63
  foreach($get_notifications as $get_notifications_list){
64
+ $clicked_percentage=@($get_notifications_list['total_clicked']/$get_notifications_list['total_sent'])*100;
65
  ?>
66
  <tr>
67
 
74
 
75
  <div class="col-sm-8">
76
  <h5 class="margin-t-0 font-bold">
77
+
78
+ <?php echo $get_notifications_list['title'];?>
79
  </h5>
80
  <p class="margin-b-5"><?php echo $get_notifications_list['message'];?></p>
81
  <a target="_blank" href="<?php echo $get_notifications_list['redirecturl'];?>"><?php echo $get_notifications_list['redirecturl'];?></a>
100
  </tbody>
101
  </table>
102
  </div>
103
+ <?php }else{ echo $this->__('No result found');}?>
104
  </div>
105
  </div>
106
  <!-- Project Stats End -->
app/design/adminhtml/default/default/template/pushassist/segments.phtml CHANGED
@@ -1,34 +1,35 @@
1
  <?php
2
  $get_segment = Mage::helper('pushassist')->get_segments();
3
-
4
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
5
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
6
  $account_response = Mage::helper('pushassist')->get_account_details();
 
7
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
8
-
9
- if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] == '' && $account_response) {
10
 
11
  //print_r($get_segment);
12
  ?>
13
  <div id="Psidebar" >
14
  <ul>
15
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
16
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
17
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
18
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
19
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
20
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
21
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
22
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
 
23
  </ul>
24
  </div>
25
  <!-- Content Start -->
26
  <div id="pushassist" class="content dashboard clearfix">
27
  <!-- Start Page Header -->
28
  <div class="page-header">
29
- <h1 class="title">Segments</h1>
30
  <div class="sub_count">
31
- <a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Add New</a>
32
  </div>
33
  </div>
34
  <!-- End Page Header -->
@@ -41,10 +42,7 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
41
  <div class="col-md-12 col-lg-12">
42
  <div class="panel panel-widget">
43
  <?php if(count($get_segment) > 0){ ?>
44
- <div class="panel-title">
45
- Total <span class="label label-info"><?php echo count($get_segment);?></span> Segments
46
-
47
- </div>
48
  <div class="panel-search">
49
  <form>
50
  <input type="text" class="form-control" placeholder="Search...">
@@ -56,9 +54,9 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
56
  <thead>
57
  <tr>
58
  <td>#</td>
59
- <td>Segment Name</td>
60
- <td>Subscribers Count</td>
61
- <td>Created Date</td>
62
  </tr>
63
  </thead>
64
  <tbody>
@@ -77,7 +75,7 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
77
  </tbody>
78
  </table>
79
  </div>
80
- <?php }else{ echo "No result Found";}?>
81
  </div>
82
  </div>
83
  <!-- Project Stats End -->
1
  <?php
2
  $get_segment = Mage::helper('pushassist')->get_segments();
 
3
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
4
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
5
  $account_response = Mage::helper('pushassist')->get_account_details();
6
+ if(isset($account_response['account_name'])){
7
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
8
+ }
9
+ if($check_api_key!='' && $check_secret_key != '' && (!isset($account_response['error'] )) && $account_response) {
10
 
11
  //print_r($get_segment);
12
  ?>
13
  <div id="Psidebar" >
14
  <ul>
15
+ <!--<li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
16
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
17
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
18
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
19
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
20
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
21
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
22
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
23
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
24
  </ul>
25
  </div>
26
  <!-- Content Start -->
27
  <div id="pushassist" class="content dashboard clearfix">
28
  <!-- Start Page Header -->
29
  <div class="page-header">
30
+ <h1 class="title"><?php echo $this->__('Segment Details')?></h1>
31
  <div class="sub_count">
32
+ <a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Add New')?></a>
33
  </div>
34
  </div>
35
  <!-- End Page Header -->
42
  <div class="col-md-12 col-lg-12">
43
  <div class="panel panel-widget">
44
  <?php if(count($get_segment) > 0){ ?>
45
+
 
 
 
46
  <div class="panel-search">
47
  <form>
48
  <input type="text" class="form-control" placeholder="Search...">
54
  <thead>
55
  <tr>
56
  <td>#</td>
57
+ <td><?php echo $this->__('Segment Name')?></td>
58
+ <td><?php echo $this->__('Subscribers Count')?></td>
59
+ <td><?php echo $this->__('Created Date')?></td>
60
  </tr>
61
  </thead>
62
  <tbody>
75
  </tbody>
76
  </table>
77
  </div>
78
+ <?php }else{ echo $this->__('No result Found');}?>
79
  </div>
80
  </div>
81
  <!-- Project Stats End -->
app/design/adminhtml/default/default/template/pushassist/sendnotification.phtml CHANGED
@@ -2,29 +2,32 @@
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
 
5
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
 
6
 
7
- if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] == '' && $account_response) {
8
  ?>
9
  <form action="<?php echo $this->getUrl('*/*/sendnotification'); ?>" method="post" name="notification" enctype='multipart/form-data' >
10
  <input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
11
  <div id="Psidebar" >
12
  <ul>
13
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
14
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
15
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
16
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
17
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
18
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
19
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
20
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
 
21
  </ul>
22
  </div>
23
  <!-- Content Start -->
24
  <div id="pushassist" class="content clearfix">
25
  <!-- Start Page Header -->
26
  <div class="page-header">
27
- <h1 class="title">New Notification</h1>
28
 
29
  </div>
30
  <!-- End Page Header -->
@@ -37,24 +40,24 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
37
  <div class="panel-body">
38
 
39
  <div class="">
40
- <input type="hidden" class="form-control" id="sites" name="sites" value="<?php echo $result[0]['id']; ?>" />
41
  </div>
42
  <div class="form-group">
43
- <label class="col-sm-3 control-label form-label">Notification Title</label>
44
  <div class="col-sm-9">
45
  <input type="text" class="form-control" id="title" name="title" placeholder="Notification Title" maxlength="45" required="required" />
46
- <span class="pull-right">Limit 45 Characters</span>
47
  </div>
48
  </div>
49
  <div class="form-group">
50
- <label class="col-sm-3 control-label form-label">Notification Message</label>
51
  <div class="col-sm-9">
52
  <textarea class="form-control" rows="2" name="message" id="message" placeholder="Notification Message" maxlength="73" required="required" style="resize: none"></textarea>
53
- <span class="pull-right">Limit 73 Characters</span>
54
  </div>
55
  </div>
56
  <div class="form-group">
57
- <label class="col-sm-3 control-label form-label">Notification URL</label>
58
  <div class="col-sm-9 margin-b-15">
59
  <input type="url" maxlength="250" placeholder="Enter a URL to push your subscribers to (yoursite.com)" name="url" id="url" class="form-control" >
60
  </div>
@@ -71,13 +74,13 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
71
  <input type="hidden" id="date" name="date" value="" />
72
  </div>-->
73
  <div class="form-group margin-b-0">
74
- <label for="focusedinput" class="col-sm-3 control-label form-label">Notification Logo</label>
75
  <div class="col-sm-9">
76
  <span class="btn btn-success fileinput-button margin-b-10">
77
- <span>Upload Logo...</span>
78
  <input id="fileupload" type="file" name="fileupload" />
79
  </span>
80
-
81
  <!-- The global progress bar -->
82
  <div id="progress" class="progress">
83
  <div class="progress-bar progress-bar-success"></div>
@@ -87,26 +90,26 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
87
  <div class="form-group">
88
  <label class="col-sm-offset-3 control-label form-label">
89
  <input type="checkbox" value="1" name="is_utm_show" id="is_utm_show" />
90
- <label class="form-label checkbox_title margin-l-10">Add UTM Parameters</label>
91
  </label>
92
  </div>
93
  <div class="form-group" id="utm_parameter_div" style="display: none;">
94
- <label class="col-sm-3 control-label form-label">UTM Source</label>
95
  <div class="col-sm-9 margin-b-15">
96
  <input type="text" class="form-control" id="utm_source" name="utm_source" value="pushassist" placeholder="Enter UTM Source" maxlength="45" required="required" />
97
- <span class="pull-right">Limit 45 Characters</span>
98
  </div>
99
 
100
- <label class="col-sm-3 control-label form-label">UTM Medium</label>
101
  <div class="col-sm-9 margin-b-15">
102
  <input type="text" class="form-control" name="utm_medium" id="utm_medium" value="pushassist_notification" placeholder="Enter UTM Medium" maxlength="73" required="required" />
103
- <span class="pull-right">Limit 73 Characters</span>
104
  </div>
105
 
106
- <label class="col-sm-3 control-label form-label">UTM Campaign</label>
107
  <div class="col-sm-9 margin-b-15">
108
  <input type="text" class="form-control" name="utm_campaign" id="utm_campaign" value="pushassist" placeholder="Enter UTM Campaign" maxlength="500" required="required" />
109
- <span class="pull-right">Limit 500 Characters</span>
110
  </div>
111
  <input type="hidden" id="campaign_id" name="campaign_id" value="" />
112
  <input type="hidden" id="status" name="status" value="" />
@@ -116,7 +119,7 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
116
  <input type="hidden" id="is_draft" name="is_draft" value="1" />
117
  </div>
118
  <div class="form-group">
119
- <label class="col-sm-3 control-label form-label">Segment</label>
120
  <div class="col-sm-9 dropdown_padding">
121
  <select class="col-sm-12" id="segment" name="segment[]" multiple>
122
  <?php $get_segment = Mage::helper('pushassist')->get_segments();
@@ -126,7 +129,7 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
126
  <option value="<?php echo $get_segment_list['id'];?>"><?php echo $get_segment_list['name'];?></option>
127
  <?php } } else{
128
  ?>
129
- <option value="">No Segment</option>
130
  <?php } ?>
131
 
132
  </select>
@@ -134,7 +137,7 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
134
  </div>
135
  <div class="form-group">
136
  <div class="col-sm-offset-3 col-sm-1 col-xs-3">
137
- <button type="submit" class="btn btn-default">Send</button>
138
  </div>
139
 
140
  <!--<div class="col-sm-2 margin-l-30 col-xs-7">
@@ -145,38 +148,32 @@ if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] =
145
  </div>
146
  </div>
147
  </div>
148
- <div class="col-md-6 dummy-notification shadow panel panel-default">
149
- <p class="h4 pb15">Preview</p>
150
- <div class="widget shadow dummy-notification-inner-wrapper">
151
- <div class="overflow-hidden">
152
- <div class="notification-demo">
153
- <div class="row">
154
- <div style="width: 20%" class="col-md-3 col-xs-3">
155
- <div class="notification_demo_img_block">
156
- <img style="width: 100%" class="js-custom-notifications-image" name="logo" id="logo" src="<?php echo $account_response['site_image'];?>" />
157
- </div>
158
- </div>
159
- <div style="position:static" class="col-md-9 col-xs-9 notification-demo-wrapper">
160
- <p class="notification-display notification-display-title h4 margin-t-0" name="notification_title" id="notification_title">
161
- Notification Title
162
- </p>
163
-
164
- <p class="notification-display notification-display-message notification-demo-wrapper__message h5 margin-t-0" name="notification_message" id="notification_message">
165
- Notification Body
166
- </p>
167
 
168
- <p class="notification-display notification-display-url notification-demo-wrapper__url h6 margin-t-0">
169
- <?php echo $account_response['account_name'];?>.pushassist.com</p>
170
- </div>
 
 
 
 
 
 
 
 
171
  </div>
172
- </div>
173
- </div>
174
- </div>
175
- <div class="widget">
176
- <p style="padding-left: 20px;" name="redirect_url" id="redirect_url" class="h5">URL to open when user clicks the notification:</p>
177
- </div>
178
- </div>
179
- </div>
 
 
 
 
 
180
  <!-- Container End -->
181
  </div>
182
  <!-- Content End -->
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
5
+ if(isset($account_response['account_name'])){
6
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
7
+ }
8
 
9
+ if($check_api_key!='' && $check_secret_key != '' && (!isset($account_response['error'] )) && $account_response) {
10
  ?>
11
  <form action="<?php echo $this->getUrl('*/*/sendnotification'); ?>" method="post" name="notification" enctype='multipart/form-data' >
12
  <input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
13
  <div id="Psidebar" >
14
  <ul>
15
+ <!--<li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
16
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
17
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
18
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
19
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
20
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
21
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
22
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
23
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
24
  </ul>
25
  </div>
26
  <!-- Content Start -->
27
  <div id="pushassist" class="content clearfix">
28
  <!-- Start Page Header -->
29
  <div class="page-header">
30
+ <h1 class="title"><?php echo $this->__('New Notification')?></h1>
31
 
32
  </div>
33
  <!-- End Page Header -->
40
  <div class="panel-body">
41
 
42
  <div class="">
43
+ <input type="hidden" class="form-control" id="sites" name="sites" value="<?php //echo $result[0]['id']; ?>" />
44
  </div>
45
  <div class="form-group">
46
+ <label class="col-sm-3 control-label form-label"><?php echo $this->__('Notification Title')?></label>
47
  <div class="col-sm-9">
48
  <input type="text" class="form-control" id="title" name="title" placeholder="Notification Title" maxlength="45" required="required" />
49
+ <span class="pull-right"><?php echo $this->__('Limit 45 Characters')?></span>
50
  </div>
51
  </div>
52
  <div class="form-group">
53
+ <label class="col-sm-3 control-label form-label"><?php echo $this->__('Notification Message')?></label>
54
  <div class="col-sm-9">
55
  <textarea class="form-control" rows="2" name="message" id="message" placeholder="Notification Message" maxlength="73" required="required" style="resize: none"></textarea>
56
+ <span class="pull-right"><?php echo $this->__('Limit 73 Characters')?></span>
57
  </div>
58
  </div>
59
  <div class="form-group">
60
+ <label class="col-sm-3 control-label form-label"><?php echo $this->__('Notification URL')?></label>
61
  <div class="col-sm-9 margin-b-15">
62
  <input type="url" maxlength="250" placeholder="Enter a URL to push your subscribers to (yoursite.com)" name="url" id="url" class="form-control" >
63
  </div>
74
  <input type="hidden" id="date" name="date" value="" />
75
  </div>-->
76
  <div class="form-group margin-b-0">
77
+ <label for="focusedinput" class="col-sm-3 control-label form-label"><?php echo $this->__('Notification Logo')?></label>
78
  <div class="col-sm-9">
79
  <span class="btn btn-success fileinput-button margin-b-10">
80
+ <span><?php echo $this->__('Notification Logo')?>...</span>
81
  <input id="fileupload" type="file" name="fileupload" />
82
  </span>
83
+ <span class="clearfix"><?php echo $this->__('Image size must be exactly 250x250px.')?></span>
84
  <!-- The global progress bar -->
85
  <div id="progress" class="progress">
86
  <div class="progress-bar progress-bar-success"></div>
90
  <div class="form-group">
91
  <label class="col-sm-offset-3 control-label form-label">
92
  <input type="checkbox" value="1" name="is_utm_show" id="is_utm_show" />
93
+ <label class="form-label checkbox_title margin-l-10"><?php echo $this->__('Add UTM Parameters')?></label>
94
  </label>
95
  </div>
96
  <div class="form-group" id="utm_parameter_div" style="display: none;">
97
+ <label class="col-sm-3 control-label form-label"><?php echo $this->__('UTM Source')?></label>
98
  <div class="col-sm-9 margin-b-15">
99
  <input type="text" class="form-control" id="utm_source" name="utm_source" value="pushassist" placeholder="Enter UTM Source" maxlength="45" required="required" />
100
+ <span class="pull-right"><?php echo $this->__('Limit 45 Characters')?></span>
101
  </div>
102
 
103
+ <label class="col-sm-3 control-label form-label"><?php echo $this->__('UTM Medium')?></label>
104
  <div class="col-sm-9 margin-b-15">
105
  <input type="text" class="form-control" name="utm_medium" id="utm_medium" value="pushassist_notification" placeholder="Enter UTM Medium" maxlength="73" required="required" />
106
+ <span class="pull-right"><?php echo $this->__('Limit 73 Characters')?></span>
107
  </div>
108
 
109
+ <label class="col-sm-3 control-label form-label"><?php echo $this->__('UTM Campaign')?></label>
110
  <div class="col-sm-9 margin-b-15">
111
  <input type="text" class="form-control" name="utm_campaign" id="utm_campaign" value="pushassist" placeholder="Enter UTM Campaign" maxlength="500" required="required" />
112
+ <span class="pull-right"><?php echo $this->__('Limit 500 Characters')?></span>
113
  </div>
114
  <input type="hidden" id="campaign_id" name="campaign_id" value="" />
115
  <input type="hidden" id="status" name="status" value="" />
119
  <input type="hidden" id="is_draft" name="is_draft" value="1" />
120
  </div>
121
  <div class="form-group">
122
+ <label class="col-sm-3 control-label form-label"><?php echo $this->__('Segment')?></label>
123
  <div class="col-sm-9 dropdown_padding">
124
  <select class="col-sm-12" id="segment" name="segment[]" multiple>
125
  <?php $get_segment = Mage::helper('pushassist')->get_segments();
129
  <option value="<?php echo $get_segment_list['id'];?>"><?php echo $get_segment_list['name'];?></option>
130
  <?php } } else{
131
  ?>
132
+ <option value=""><?php echo $this->__('No Segment')?></option>
133
  <?php } ?>
134
 
135
  </select>
137
  </div>
138
  <div class="form-group">
139
  <div class="col-sm-offset-3 col-sm-1 col-xs-3">
140
+ <button type="submit" class="btn btn-default"><?php echo $this->__('Send')?></button>
141
  </div>
142
 
143
  <!--<div class="col-sm-2 margin-l-30 col-xs-7">
148
  </div>
149
  </div>
150
  </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
151
 
152
+ <div class="col-md-6 dummy-notification shadow panel panel-default">
153
+ <p class="h4 pb15">Preview</p>
154
+ <div class="widget shadow dummy-notification-inner-wrapper">
155
+ <div class="wrapper">
156
+ <div class="img_wrapper pull-left">
157
+ <img class="img-responsive" src="<?php echo $account_response['site_image'];?>" id="pushassist_preview_logo">
158
+ </div>
159
+ <div class="text_wrapper pull-left">
160
+ <div class="title">
161
+ <div id="notification_title" class="title_txt pull-left"><?php echo $this->__('Notification Title')?></div>
162
+ <div class="closer pull-right">x</div>
163
  </div>
164
+ <div id="notification_message" class="message"><?php echo $this->__('Notification Body')?></div>
165
+ <div class="domain">
166
+ <div class="domain"><?php echo $account_response['account_name'];?>.pushassist.com</div>
167
+ </div>
168
+ </div>
169
+ </div>
170
+ </div>
171
+ <div class="redirect_url">
172
+ <p class="h5" id="redirect_url" name="redirect_url"><?php echo $this->__('URL to open when user clicks the notification')?>:</p>
173
+ </div>
174
+ </div>
175
+
176
+ </div>
177
  <!-- Container End -->
178
  </div>
179
  <!-- Content End -->
app/design/adminhtml/default/default/template/pushassist/settings.phtml ADDED
@@ -0,0 +1,366 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
+ $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
+ $account_response = Mage::helper('pushassist')->get_account_details();
5
+ if(isset($account_response['account_name'])){
6
+ $account_url='https://'.$account_response['account_name'].'.pushassist.com/allsites/';
7
+ }
8
+ if($check_api_key!='' && $check_secret_key != '' && (!isset($account_response['error'] )) && $account_response ) {
9
+
10
+ ?>
11
+ <div id="Psidebar" >
12
+ <ul>
13
+ <!-- <li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
14
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
15
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
16
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
17
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
18
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
19
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
20
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
21
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
22
+ </ul>
23
+ </div>
24
+ <!-- Content Start -->
25
+ <div id="pushassist" class="content dashboard clearfix">
26
+ <!-- Start Page Header -->
27
+ <div class="page-header">
28
+ <h1 class="title"><?php echo $this->__('Settings / Account Information')?></h1>
29
+ </div>
30
+ <!-- End Page Header -->
31
+
32
+ <div class="container-widget clearfix">
33
+ <div class="col-md-6">
34
+ <div class="panel panel-default">
35
+
36
+ <div class="panel-body">
37
+
38
+ <form class="form-horizontal" autocomplete="off" id="pushassist_template_setting_form" name="pushassist_template_setting_form" enctype="multipart/form-data" action="<?php echo $this->getUrl('*/*/settings'); ?>" method="post">
39
+ <input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
40
+ <div class="form-group">
41
+ <label class="col-sm-2 control-label form-label margin-r-5 padding-t-10">
42
+ <?php echo $this->__('Ask for permission after')?></label>
43
+
44
+ <input type="number" id="pushassist_timeinterval" name="pushassist_timeinterval" placeholder="Interval" min="0" style="width: 10%" max="30" maxlength="2" value="<?php echo $account_response['notification_interval']; ?>">
45
+ <label class="control-label form-label margin-l-10 padding-t-0">
46
+ <?php echo $this->__('seconds on your website.')?></label>
47
+ </div>
48
+
49
+ <div class="form-group">
50
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Opt-In Box Title')?></label>
51
+ <div class="col-sm-9">
52
+ <input type="text" class="form-control" name="pushassist_opt_in_title" id="pushassist_opt_in_title"
53
+ value="<?php echo stripslashes($account_response['opt_in_title']); ?>" placeholder="Opt-In Box Title" maxlength="80" required="">
54
+ <span class="float-r"><?php echo $this->__('Limit 80 Characters')?></span>
55
+ </div>
56
+ </div>
57
+
58
+ <div class="form-group">
59
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Opt-In Box Subtitle')?></label>
60
+ <div class="col-sm-9">
61
+ <input type="text" class="form-control" name="pushassist_opt_in_subtitle" id="pushassist_opt_in_subtitle"
62
+ value="<?php echo stripslashes($account_response['opt_in_subtitle']); ?>" placeholder="Opt-In Box Subtitle" maxlength="105" required="">
63
+ <span class="float-r"><?php echo $this->__('Limit 105 Characters')?></span>
64
+ </div>
65
+ </div>
66
+
67
+ <div class="form-group">
68
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Allow Button Text')?></label>
69
+ <div class="col-sm-9">
70
+ <input type="text" class="form-control" name="pushassist_allow_button_text" id="pushassist_allow_button_text"
71
+ value="<?php echo stripslashes($account_response['allow_button']); ?>" placeholder="Allow Button Text" maxlength="25" required="">
72
+ </div>
73
+ </div>
74
+
75
+ <div class="form-group">
76
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Don\'t Allow Button')?></label>
77
+ <div class="col-sm-9">
78
+ <input type="text" class="form-control" name="pushassist_disallow_button_text" id="pushassist_disallow_button_text"
79
+ value="<?php echo stripslashes($account_response['disallow_button']); ?>" placeholder="Don't Allow Button" maxlength="25" required="">
80
+ </div>
81
+ </div>
82
+
83
+ <div class="form-group">
84
+ <label class="col-sm-2 control-label form-label padding-l-0"><?php echo $this->__('Notification Template')?></label>
85
+ <div class="col-sm-9">
86
+ <select class="selectpicker col-sm-12" id="template" name="template">
87
+ <?php
88
+
89
+ $template = array('1' => 'Default', '2' => 'Template 1', '3' => 'Template 2', '4' => 'Template 3', '5' => 'Template 4', '6' => 'Template 5', '7' => 'Template 6', '8' => 'Template 7'); //
90
+
91
+ while (list($key, $val) = each($template)) {
92
+
93
+ if ($key == $account_response['template']) {
94
+ ?>
95
+ <option value="<?php echo $key; ?>" data-title="<?php echo $key; ?>"
96
+ selected> <?php echo $val; ?></option>
97
+ <?php } else {
98
+ ?>
99
+ <option data-title="<?php echo $key; ?>" value="<?php echo $key; ?>"> <?php echo $val; ?></option>
100
+ <?php }
101
+ } ?>
102
+ </select>
103
+ </div>
104
+ </div>
105
+
106
+ <div class="form-group">
107
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Location')?></label>
108
+
109
+ <?php
110
+ $location = array('1' => 'Top Left', '2' => 'Top Right', '3' => 'Top Center', '4' => 'Bottom Left', '5' => 'Bottom Right', '6' => 'Bottom Center');
111
+ $location_2 = array('1' => 'Top Left', '2' => 'Top Right', '4' => 'Bottom Left', '5' => 'Bottom Right');
112
+ $location_3 = array('7' => 'Top', '8' => 'Bottom');
113
+ ?>
114
+ <input type="hidden" name="psa_template_location" id="psa_template_location" value="<?php if(isset($account_response['opt_in_location'])){ echo $account_response['opt_in_location']; } else { echo 1; } ?>">
115
+
116
+ <div class="col-sm-9" id="psa_list_1" style="display: <?php if($account_response['template'] < 7 || $account_response['template'] == '1') { echo 'block'; } else { echo 'none'; }?>;">
117
+ <select class="selectpicker col-sm-12" id="location" name="location">
118
+
119
+ <?php
120
+
121
+ while (list($key, $val) = each($location)) {
122
+
123
+ if ($key == $account_response['opt_in_location']) {
124
+ ?>
125
+ <option value="<?php echo $key; ?>"
126
+ selected> <?php echo $val; ?></option>
127
+ <?php } else {
128
+ ?>
129
+ <option value="<?php echo $key; ?>"> <?php echo $val; ?></option>
130
+ <?php }
131
+ } ?>
132
+ </select>
133
+ </div>
134
+
135
+ <div class="col-sm-9" id="psa_list_2" style="display: <?php if($account_response['template'] == 7) { echo 'block'; } else { echo 'none'; }?>;">
136
+ <select class="selectpicker col-sm-12" id="location_1" name="location_1">
137
+
138
+ <?php
139
+
140
+ while (list($key, $val) = each($location_2)) {
141
+
142
+ if ($key == $account_response['opt_in_location']) {
143
+ ?>
144
+ <option value="<?php echo $key; ?>"
145
+ selected> <?php echo $val; ?></option>
146
+ <?php } else {
147
+ ?>
148
+ <option value="<?php echo $key; ?>"> <?php echo $val; ?></option>
149
+ <?php }
150
+ } ?>
151
+ </select>
152
+ </div>
153
+
154
+ <div class="col-sm-9" id="psa_list_3" style="display: <?php if($account_response['template'] == 8) { echo 'block'; } else { echo 'none'; }?>;">
155
+ <select class="selectpicker col-sm-12" id="location_2" name="location_2">
156
+
157
+ <?php
158
+
159
+ while (list($key, $val) = each($location_3)) {
160
+
161
+ if ($key == $account_response['opt_in_location']) {
162
+ ?>
163
+ <option value="<?php echo $key; ?>"
164
+ selected> <?php echo $val; ?></option>
165
+ <?php } else {
166
+ ?>
167
+ <option value="<?php echo $key; ?>"> <?php echo $val; ?></option>
168
+ <?php }
169
+ } ?>
170
+ </select>
171
+ </div>
172
+
173
+ </div>
174
+
175
+ <div class="form-group margin-b-0">
176
+ <label for="focusedinput" class="col-sm-2 control-label form-label"><?php echo $this->__('Site Logo')?></label>
177
+ <div class="col-sm-9" style="padding-bottom:6px;">
178
+ <span class="btn btn-success fileinput-button margin-b-10">
179
+ <span><?php echo $this->__('Site Logo')?></span>
180
+ <input id="fileupload" type="file" name="fileupload">
181
+ </span>
182
+ <br>
183
+ <span><?php echo $this->__('Image size must be exactly 250x250px.')?></span>
184
+ </div>
185
+ </div>
186
+
187
+ <hr>
188
+
189
+ <h5 class="col-sm-offset-2 title margin-t-0 margin-b-20" style="padding-top:8px;">
190
+ <?php echo $this->__('Notification Subscription Setting')?></h5>
191
+
192
+ <div class="form-group">
193
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Opt-In Title')?></label>
194
+ <div class="col-sm-9">
195
+ <input type="text" class="form-control" name="pushassist_child_window_title" id="pushassist_child_window_title"
196
+ value="<?php echo stripslashes($account_response['child_title']); ?>" placeholder="Opt-In Title" maxlength="45" required="">
197
+ <span class="float-r">Limit 45 Characters</span>
198
+ </div>
199
+ </div>
200
+
201
+ <div class="form-group">
202
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Opt-In Message')?></label>
203
+ <div class="col-sm-9">
204
+ <input type="text" class="form-control" name="pushassist_child_window_message" id="pushassist_child_window_message"
205
+ value="<?php echo stripslashes($account_response['child_message']); ?>" placeholder="Opt-In Message" maxlength="73" required="">
206
+ <span class="float-r">Limit 73 Characters</span>
207
+ </div>
208
+ </div>
209
+
210
+ <hr>
211
+
212
+ <h5 class="col-sm-offset-2 title margin-t-0 margin-b-20" style="padding-top:8px;"><?php echo $this->__('Welcome Message for first time subscribers')?></h5>
213
+
214
+ <div class="form-group">
215
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Notification Title')?></label>
216
+ <div class="col-sm-9">
217
+ <input type="text" class="form-control" name="pushassist_setting_title" id="pushassist_setting_title"
218
+ value="<?php echo stripslashes($account_response['title']); ?>" placeholder="Notification Title" maxlength="36">
219
+ </div>
220
+ </div>
221
+
222
+ <div class="form-group">
223
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Notification Message')?></label>
224
+ <div class="col-sm-9">
225
+ <input type="text" class="form-control" name="pushassist_setting_message" id="pushassist_setting_message"
226
+ value="<?php echo stripslashes($account_response['message']); ?>" placeholder="Notification Message" maxlength="99">
227
+ </div>
228
+ </div>
229
+
230
+ <div class="form-group">
231
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('Redirect URL')?></label>
232
+ <div class="col-sm-9">
233
+ <input type="text" class="form-control" name="pushassist_redirect_url" id="pushassist_redirect_url"
234
+ value="<?php echo stripslashes($account_response['redirect_url']); ?>" placeholder="Redirect URL" maxlength="250">
235
+ </div>
236
+ </div>
237
+
238
+ <div class="form-group">
239
+ <div class="col-sm-2"></div>
240
+ <div class="col-sm-8">
241
+ <button type="submit" class="btn btn-default" value="Save Settings" name="psa-advance-settings"><?php echo $this->__('Save Settings')?></button>
242
+ </div>
243
+ </div>
244
+
245
+ </form>
246
+
247
+ </div>
248
+ </div>
249
+ </div>
250
+
251
+ <div class="col-md-6">
252
+ <div class="panel panel-default">
253
+ <div class="panel-body">
254
+
255
+ <p><strong>What is a GCM Key? How do I get export my subscribers, What if I want to switch to other vendor.</strong></p>
256
+ <p class="margin-b-15 margin-t-15">At the time of installation, you have to provide your GCM (Google Cloud Messaging) API Key for Chrome and Certificate Details for Safari that is used.</p>
257
+ <p>We need this information to export your subscriber’s ID’s. Please note that only premium accounts can export the subscribers.</p>
258
+ <p class="margin-b-15 margin-t-15"> Please read <a href="https://pushassist.com/adding-your-own-gcm-key-project-id-in-pushassist/" style="color: #0000ff;" target="_blank"> GCM registration</a> guidelines here. </p>
259
+
260
+ <form class="form-horizontal margin-t-40" autocomplete="off" id="pushassist_gcm_setting_form" name="pushassist_gcm_setting_form" enctype="multipart/form-data" action="<?php echo $this->getUrl('*/*/gsmsetting'); ?>" method="post">
261
+ <input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
262
+ <div class="form-group">
263
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('GCM Project No.')?></label>
264
+ <div class="col-sm-9">
265
+ <input type="text" class="form-control" name="pushassist_gcm_project_no" id="pushassist_gcm_project_no"
266
+ value="<?php echo stripslashes($account_response['gcm_project_number']); ?>" placeholder="GCM Project No." maxlength="20" required="">
267
+ </div>
268
+ </div>
269
+
270
+ <div class="form-group">
271
+ <label class="col-sm-2 control-label form-label"><?php echo $this->__('GCM API Key')?></label>
272
+ <div class="col-sm-9">
273
+ <input type="text" class="form-control" name="pushassist_gcm_api_key" id="pushassist_gcm_api_key"
274
+ value="<?php echo stripslashes($account_response['gcm_api_key']); ?>" placeholder="GCM API Key" maxlength="250" required="">
275
+ </div>
276
+ </div>
277
+
278
+ <div class="form-group">
279
+ <div class="col-sm-2"></div>
280
+ <div class="col-sm-8">
281
+ <button type="submit" class="btn btn-default" value="Save Settings" name="psa-gcm-settings"><?php echo $this->__('Save Settings')?></button>
282
+ </div>
283
+ </div>
284
+
285
+ </form>
286
+
287
+ <hr>
288
+
289
+ <p style="padding-top:10px;"><?php echo $this->__('Screenshot of advance configurations that are possible with your PushAssist account.')?>&nbsp;&nbsp;&nbsp;
290
+ <a href="<?php echo $account_url;?>" class="btn btn-default margin-t-0" target="_blank">Customize Now</a>
291
+ </p>
292
+
293
+ <div class="margin-t-15 image_wrapper">
294
+ <img src="<?php echo $this->getSkinUrl('pushassist/pushassist_opt_in_box_setting.png') ?>" alt="Notification Opt-in Box Setting">
295
+ </div>
296
+ </div>
297
+ </div>
298
+ </div>
299
+
300
+ </div>
301
+ <script language="javascript">
302
+ jQuery.noConflict();
303
+
304
+
305
+ jQuery("#template").on("change", function () {
306
+
307
+ if(jQuery(this).val() == 8){
308
+
309
+ jQuery('#psa_list_3').show();
310
+ jQuery('#psa_list_2').hide();
311
+ jQuery('#psa_list_1').hide();
312
+
313
+ jQuery('#psa_template_location').val(jQuery('#location_2').val());
314
+
315
+ }
316
+
317
+ if(jQuery(this).val() == 7){
318
+
319
+ jQuery('#psa_list_3').hide();
320
+ jQuery('#psa_list_2').show();
321
+ jQuery('#psa_list_1').hide();
322
+
323
+ jQuery('#psa_template_location').val(jQuery('#location_1').val());
324
+
325
+ }
326
+
327
+ if(jQuery(this).val() < 7){
328
+
329
+ jQuery('#psa_list_3').hide();
330
+ jQuery('#psa_list_2').hide();
331
+ jQuery('#psa_list_1').show();
332
+
333
+ jQuery('#psa_template_location').val(jQuery('#location').val());
334
+ }
335
+ });
336
+
337
+ jQuery("#location").on("change", function () {
338
+
339
+ var template_location = jQuery(this).val();
340
+
341
+ jQuery('#psa_template_location').val(template_location);
342
+ });
343
+
344
+ jQuery("#location_1").on("change", function () {
345
+
346
+ var template_location = jQuery(this).val();
347
+
348
+ jQuery('#psa_template_location').val(template_location);
349
+ });
350
+
351
+ jQuery("#location_2").on("change", function () {
352
+
353
+ var template_location = jQuery(this).val();
354
+
355
+ jQuery('#psa_template_location').val(template_location);
356
+ });
357
+
358
+ </script>
359
+
360
+
361
+ </div>
362
+ <!-- Content End -->
363
+ <?php
364
+ }else{
365
+ Mage::app()->getResponse()->setRedirect(Mage::helper("adminhtml")->getUrl("adminhtml/pushassist_createaccount/index/"));
366
+ } ?>
app/design/adminhtml/default/default/template/pushassist/subscribers.phtml CHANGED
@@ -2,29 +2,31 @@
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
 
5
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
6
-
7
- if($check_api_key!='' && $check_secret_key != '' && $account_response['error'] == '' && $account_response ) {
8
  if( count($get_subscribers) > 0){
9
  //print_r($get_segement);
10
  ?>
11
  <div id="Psidebar" >
12
  <ul>
13
- <li><a href="<?php echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>
14
- <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>">Dashboard</a></li>
15
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>">Notifications</a></li>
16
- <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>">Send Notification</a></li>
17
- <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>">Segments</a></li>
18
- <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>">Create Segment</a></li>
19
- <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>">Subscribers</a></li>
20
- <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>">Campaigns</a></li>
21
- </ul>
 
22
  </div>
23
  <!-- Content Start -->
24
  <div id="pushassist" class="content dashboard clearfix">
25
  <!-- Start Page Header -->
26
  <div class="page-header">
27
- <h1 class="title">Subscribers</h1>
28
  </div>
29
  <!-- End Page Header -->
30
 
@@ -50,10 +52,10 @@ if( count($get_subscribers) > 0){
50
  <thead>
51
  <tr>
52
  <td>#</td>
53
- <td>site url</td>
54
- <td>Chrome</td>
55
- <td>Firefox</td>
56
- <td>Safari</td>
57
  </tr>
58
  </thead>
59
  <tbody>
@@ -82,7 +84,7 @@ if( count($get_subscribers) > 0){
82
  </div>
83
  <!-- Content End -->
84
  <?php }else{
85
- echo "No result found.";
86
  }
87
  }else{
88
  Mage::app()->getResponse()->setRedirect(Mage::helper("adminhtml")->getUrl("adminhtml/pushassist_createaccount/index/"));
2
  $check_api_key=Mage::app()->getStore()->getConfig('pushassistsection/general/apikey');
3
  $check_secret_key=Mage::app()->getStore()->getConfig('pushassistsection/general/secretkey');
4
  $account_response = Mage::helper('pushassist')->get_account_details();
5
+ if(isset($account_response['account_name'])){
6
  $account_url='https://'.$account_response['account_name'].'.pushassist.com/dashboard/';
7
+ }
8
+ if($check_api_key!='' && $check_secret_key != '' && (!isset($account_response['error'] )) && $account_response ) {
9
  if( count($get_subscribers) > 0){
10
  //print_r($get_segement);
11
  ?>
12
  <div id="Psidebar" >
13
  <ul>
14
+ <!--<li><a href="<?php //echo $this->getUrl('*/pushassist_createaccount'); ?>">Create an Account</a></li>-->
15
+ <li><a href="<?php echo $this->getUrl('*/pushassist_dashboard'); ?>"><?php echo $this->__('Dashboard')?></a></li>
16
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationmain'); ?>"><?php echo $this->__('Notifications')?></a></li>
17
+ <li><a href="<?php echo $this->getUrl('*/pushassist_notificationsend'); ?>"><?php echo $this->__('Send Notification')?></a></li>
18
+ <li><a href="<?php echo $this->getUrl('*/pushassist_segments'); ?>"><?php echo $this->__('Segments')?></a></li>
19
+ <li><a href="<?php echo $this->getUrl('*/pushassist_createsegments'); ?>"><?php echo $this->__('Create Segments')?></a></li>
20
+ <li><a href="<?php echo $this->getUrl('*/pushassist_subscribers'); ?>"><?php echo $this->__('Subscribers')?></a></li>
21
+ <li><a href="<?php echo $this->getUrl('*/pushassist_settings'); ?>"><?php echo $this->__('Settings')?></a></li>
22
+ <li><a href="<?php echo $this->getUrl('*/pushassist_campaign'); ?>"><?php echo $this->__('Campaigns')?></a></li>
23
+ </ul>
24
  </div>
25
  <!-- Content Start -->
26
  <div id="pushassist" class="content dashboard clearfix">
27
  <!-- Start Page Header -->
28
  <div class="page-header">
29
+ <h1 class="title"><?php echo $this->__('Subscribers Details')?></h1>
30
  </div>
31
  <!-- End Page Header -->
32
 
52
  <thead>
53
  <tr>
54
  <td>#</td>
55
+ <td><?php echo $this->__('Site Url')?></td>
56
+ <td><?php echo $this->__('Chrome')?></td>
57
+ <td><?php echo $this->__('Firefox')?></td>
58
+ <td><?php echo $this->__('Safari')?></td>
59
  </tr>
60
  </thead>
61
  <tbody>
84
  </div>
85
  <!-- Content End -->
86
  <?php }else{
87
+ echo $this->__('No result found');
88
  }
89
  }else{
90
  Mage::app()->getResponse()->setRedirect(Mage::helper("adminhtml")->getUrl("adminhtml/pushassist_createaccount/index/"));
app/locale/en_US/Webpushnotification_Pushassist.csv ADDED
@@ -0,0 +1 @@
 
1
+ "Dashboard","Dashboard"
app/locale/fr_FR/Webpushnotification_Pushassist.csv ADDED
@@ -0,0 +1 @@
 
1
+ "Dashboard","Tableau de bord"
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Webpushnotification_Pushassist</name>
4
- <version>1.0.3</version>
5
- <stability>devel</stability>
6
  <license uri="https://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Push Notification Delivery &amp; Analytics for Websites and Mobile. Send Push Notifications to your customers and store visitors.</summary>
10
  <description>Quickly Send push notifications from desktop or mobile websites to your site users. Powerful APIs and tools that allow you to send, receive and track push messages. Set up trigger marketing campaigns, schedule push notification and much more. Quick 5 minutes setup to implement push notifications for ANY website.</description>
11
- <notes>Built a stable version 1.0.3</notes>
12
  <authors><author><name>PushAssist Team</name><user>PushAssist</user><email>support@pushassist.com</email></author></authors>
13
- <date>2016-06-14</date>
14
- <time>13:25:59</time>
15
- <contents><target name="magecommunity"><dir name="Webpushnotification"><dir name="Pushassist"><dir name="Block"><dir name="Adminhtml"><file name="Campaign.php" hash="df4a8dc02241f6b486ec539bc2e71370"/><file name="Createaccount.php" hash="2775e933f8b780e022fa3ff0b88b076e"/><file name="Createcampaign.php" hash="318eb9deab2bfc9a8c4cad81449aaf0f"/><file name="Createsegments.php" hash="94ef9183a9c9a56bfb3dece4c4e97fce"/><file name="Dashboard.php" hash="56e56097a9ec2421218ef8d54e8a5e36"/><file name="Notificationmain.php" hash="c5407e7f33659982ce1e12287e96b541"/><file name="Notificationsend.php" hash="c82ebd53ae7efb4c24cb168e75e8ed44"/><file name="Segments.php" hash="2b4bb8731d1ffc0509210e4b0526e247"/><file name="Subscribers.php" hash="7698cd83f156fac6ddea9219716508a5"/></dir><file name="Script.php" hash="75921c5e715595bd5c0eba1695338fab"/></dir><dir name="Helper"><file name="Data.php" hash="03864fd3c190f35a69b9cc63b4328900"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pushassist"><file name="CampaignController.php" hash="e559d83bcebede0ddb1402ef694fea1f"/><file name="CampaignlistController.php" hash="693d94b5c087f2f1339ea192df4c10ab"/><file name="CreateaccountController.php" hash="2d2ade7317c1bbb9f5a70c9556f708cf"/><file name="CreatecampaignController.php" hash="50f14a68cc26ba3fcbc55207f9612aa6"/><file name="CreatesegmentsController.php" hash="b2e45413a9bdb163d35a84896f8a2173"/><file name="DashboardController.php" hash="cbd8c12f1d2ca2072944bb80b1cd2d88"/><file name="NotificationmainController.php" hash="319b0b896ce243f64ccb7aa12f130ef0"/><file name="NotificationsendController.php" hash="8b912d9c2cfd224bd05657eb36b7b360"/><file name="SegmentsController.php" hash="8d366c16f7e8817413e0492a919ce61d"/><file name="SubscribersController.php" hash="7c941c29948e69b6aabd90b44e4a63fa"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="605763139b7fdbcdd1722ecec3ed32eb"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Webpushnotification_Pushassist.xml" hash="d32b8e99774c18aa5aab352cfdd06e96"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pushassist.xml" hash="908faa1ccc71566b48ae90bfe7fe1698"/></dir><dir name="template"><dir name="pushassist"><file name="campaign.phtml" hash="92cfdc7b4fa573c48301cb78a155434d"/><file name="create_account.phtml" hash="4b64e8014eabd75e3f42887b5e2c6175"/><file name="createcampaign.phtml" hash="b154baf3b6e9deb7b210041924091b11"/><file name="createsegments.phtml" hash="1d1b46f22008d391beff7b5535a87561"/><file name="dashboard.phtml" hash="b87a98822180471666e4d455835f1d08"/><file name="notification.phtml" hash="dfc090e8f23aba03a08fb8f1114032a6"/><file name="segments.phtml" hash="3f2ca2282c12028085eeabc4863eee78"/><file name="sendnotification.phtml" hash="f311bc6b71f317f522f37a756fc6afba"/><file name="subscribers.phtml" hash="aaeaba23554e3baaae56ef152876542f"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="pushassist"><file name="5122pushassist_default.png" hash="052f22a579eff08d9b203c7c905c2ea8"/><file name="7991logo.png" hash="da2f3a6c26048c151dd8d06f709e801e"/><file name="campaign.png" hash="fb1f5604466870a9f35dcd62eb6c562f"/><file name="content_base.css" hash="740a7345d330d036ededc2ced7ac9a08"/><dir name="images"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/></dir><file name="notification_setting.png" hash="8bf9fbc3ef19ab67e1da8f3849d53a9f"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="pushassist"><file name="bootstrap-datetimepicker.js" hash="3476fc7070ebef66f2c3a6c1c7f3a408"/><file name="bootstrap-select.js" hash="1b4396af90dda85e5e06782133aaa443"/><file name="bootstrap.min.js" hash="8c237312864d2e4c4f03544cd4f9b195"/><file name="jquery.min.js" hash="8101d596b2b8fa35fe3a634ea342d7c3"/><file name="plugins.js" hash="d671d70560ecac1b27b328f643f76fc2"/></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Webpushnotification_Pushassist</name>
4
+ <version>1.0.4</version>
5
+ <stability>stable</stability>
6
  <license uri="https://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>Push Notification Delivery &amp;amp;amp;amp;amp;amp; Analytics for Websites and Mobile. Send Push Notifications to your customers and store visitors.</summary>
10
  <description>Quickly Send push notifications from desktop or mobile websites to your site users. Powerful APIs and tools that allow you to send, receive and track push messages. Set up trigger marketing campaigns, schedule push notification and much more. Quick 5 minutes setup to implement push notifications for ANY website.</description>
11
+ <notes>Built a stable version 1.0.4</notes>
12
  <authors><author><name>PushAssist Team</name><user>PushAssist</user><email>support@pushassist.com</email></author></authors>
13
+ <date>2016-07-29</date>
14
+ <time>11:32:28</time>
15
+ <contents><target name="magecommunity"><dir name="Webpushnotification"><dir name="Pushassist"><dir name="Block"><dir name="Adminhtml"><file name="Campaign.php" hash="df4a8dc02241f6b486ec539bc2e71370"/><file name="Createaccount.php" hash="2775e933f8b780e022fa3ff0b88b076e"/><file name="Createcampaign.php" hash="318eb9deab2bfc9a8c4cad81449aaf0f"/><file name="Createsegments.php" hash="94ef9183a9c9a56bfb3dece4c4e97fce"/><file name="Dashboard.php" hash="56e56097a9ec2421218ef8d54e8a5e36"/><file name="Notificationmain.php" hash="c5407e7f33659982ce1e12287e96b541"/><file name="Notificationsend.php" hash="c82ebd53ae7efb4c24cb168e75e8ed44"/><file name="Segments.php" hash="2b4bb8731d1ffc0509210e4b0526e247"/><file name="Settings.php" hash="4f9df0d6b916eaaf9bdaec67284740f0"/><file name="Subscribers.php" hash="7698cd83f156fac6ddea9219716508a5"/></dir><file name="Script.php" hash="75921c5e715595bd5c0eba1695338fab"/></dir><dir name="Helper"><file name="Data.php" hash="a114f5d60cb62bcd29d265c392956891"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pushassist"><file name="CampaignController.php" hash="e559d83bcebede0ddb1402ef694fea1f"/><file name="CampaignlistController.php" hash="693d94b5c087f2f1339ea192df4c10ab"/><file name="CreateaccountController.php" hash="800903fddaf89755ee99714fb0f7eaa3"/><file name="CreatecampaignController.php" hash="50f14a68cc26ba3fcbc55207f9612aa6"/><file name="CreatesegmentsController.php" hash="b2e45413a9bdb163d35a84896f8a2173"/><file name="DashboardController.php" hash="cbd8c12f1d2ca2072944bb80b1cd2d88"/><file name="NotificationmainController.php" hash="319b0b896ce243f64ccb7aa12f130ef0"/><file name="NotificationsendController.php" hash="87355127ebe81cf582d4122323571a34"/><file name="SegmentsController.php" hash="8d366c16f7e8817413e0492a919ce61d"/><file name="SettingsController.php" hash="2cdca98b42f4718ec4f13b25b056f5c7"/><file name="SubscribersController.php" hash="7c941c29948e69b6aabd90b44e4a63fa"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="656da11ec1ac8a23a83271b5e4426fa9"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pushassist.xml" hash="96ae4097220ded547ef84af3e65b2790"/></dir><dir name="template"><dir name="pushassist"><file name="campaign.phtml" hash="727d836f47fe25948f253e2a839381d1"/><file name="create_account.phtml" hash="0766edd72d6ac30be3d364d94178fa49"/><file name="createcampaign.phtml" hash="bb9e7c5fd204edfca29221a8de1a7eac"/><file name="createsegments.phtml" hash="3453f8244da0929e0a64123a775ce2ca"/><file name="dashboard.phtml" hash="6d4132988cd2c1f826d4dbab2ddd24b9"/><file name="notification.phtml" hash="db8c2ec25f032d542c14c139018d47aa"/><file name="segments.phtml" hash="2e29052154bd79c4b3e26e6f33121099"/><file name="sendnotification.phtml" hash="6fdafcba0e0cc1952ad171aa0dba03c3"/><file name="settings.phtml" hash="3d3e547e1acb638ecc2978caf67ebc13"/><file name="subscribers.phtml" hash="dfe5e762b09c7cdb72ca55c9a0585ed4"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Webpushnotification_Pushassist.xml" hash="d32b8e99774c18aa5aab352cfdd06e96"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="pushassist"><file name="campaign.png" hash="fb1f5604466870a9f35dcd62eb6c562f"/><file name="content_base.css" hash="f9f106e0c8f55a97a34de8e69552e657"/><dir name="images"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/></dir><file name="notification_setting.png" hash="8bf9fbc3ef19ab67e1da8f3849d53a9f"/><file name="pushassist_opt_in_box_setting.png" hash="79feadfc5795b25fc2cb3092272c3e95"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="pushassist"><file name="bootstrap-datetimepicker.js" hash="3476fc7070ebef66f2c3a6c1c7f3a408"/><file name="bootstrap-select.js" hash="1b4396af90dda85e5e06782133aaa443"/><file name="bootstrap.min.js" hash="8c237312864d2e4c4f03544cd4f9b195"/><file name="jquery.min.js" hash="8101d596b2b8fa35fe3a634ea342d7c3"/><file name="plugins.js" hash="d671d70560ecac1b27b328f643f76fc2"/></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Webpushnotification_Pushassist.csv" hash="4cee55524c735f91e1313afd6e09c0a2"/></dir><dir name="fr_FR"><file name="Webpushnotification_Pushassist.csv" hash="f333463a98bdb3daa77102db1de6a2b8"/></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
skin/adminhtml/default/default/pushassist/5122pushassist_default.png DELETED
Binary file
skin/adminhtml/default/default/pushassist/7991logo.png DELETED
Binary file
skin/adminhtml/default/default/pushassist/content_base.css CHANGED
@@ -17,10 +17,7 @@
17
  line-height: 1.6;
18
  }
19
  #pushassist h3, #pushassist .h3 {
20
- font-size: 1.75em;
21
- }
22
- #pushassist h3, #pushassist .h3 {
23
- font-size: 1.75em;
24
  }
25
  #pushassist h4, #pushassist .h4, #pushassist h5, #pushassist .h5, #pushassist h6, #pushassist .h6 {
26
  margin-bottom: 10px;
@@ -171,20 +168,14 @@
171
  margin-left: 10px;
172
  width:15%;
173
  float: left;
174
-
175
-
176
-
177
  }
178
 
179
  #Psidebar ul li {
180
-
181
-
182
  width:93%;
183
  float: left;
184
  border-bottom: 1px #ccc solid;
185
  padding:10px;
186
-
187
-
188
  }
189
 
190
 
@@ -192,7 +183,7 @@
192
 
193
  color: #fff !important;
194
  font-size:15px;
195
- text-decoration:none;
196
  }
197
 
198
  #Psidebar a:hover{
@@ -252,6 +243,7 @@ font-size:15px;
252
  line-height: normal;
253
  margin: 0;
254
  padding: 0 0 6px;
 
255
  }
256
  #pushassist h1, #pushassist .h1, #pushassist h2, #pushassist .h2, #pushassist h3, #pushassist .h3 {
257
  letter-spacing: -0.02em;
@@ -343,6 +335,16 @@ font-size:15px;
343
  padding-bottom:8px;
344
  float: left;
345
  width: 80%;}
 
 
 
 
 
 
 
 
 
 
346
  @media (min-width: 768px) {
347
  #pushassist .col-sm-1, #pushassist .col-sm-2, #pushassist .col-sm-3, #pushassist .col-sm-4, #pushassist .col-sm-5, #pushassist .col-sm-6, #pushassist .col-sm-7, #pushassist .col-sm-8, #pushassist .col-sm-9, #pushassist .col-sm-10, #pushassist .col-sm-11, #pushassist .col-sm-12 {
348
  float: left;
@@ -410,7 +412,7 @@ font-size:15px;
410
  width: 58.33333333%;
411
  }
412
  #pushassist .col-md-6 {
413
- width: 49%;
414
  }
415
  #pushassist .col-md-5 {
416
  width: 41.66666667%;
@@ -515,9 +517,16 @@ font-size:15px;
515
  color: inherit;
516
  padding: 0;
517
  }
 
 
 
 
 
 
518
  #pushassist .form-group {
519
  margin-bottom: 18px;
520
  }
 
521
  #pushassist label {
522
  display: inline-block;
523
  font-weight: 700;
@@ -554,7 +563,7 @@ font-size:15px;
554
  transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
555
  width: 100%;
556
  }
557
- #pushassist input, #pushassist select {
558
  background: #ffffff none repeat scroll 0 0;
559
  border: 1px solid #bdc4c9;
560
  border-radius: 3px;
@@ -562,7 +571,7 @@ font-size:15px;
562
  font-size: 14px;
563
  height: 110px;
564
  padding-left: 10px;
565
- }
566
 
567
  #pushassist .form-control:focus {
568
  border-color: #66afe9;
@@ -678,7 +687,7 @@ font-size:15px;
678
  }
679
  #pushassist input[type="checkbox"], #pushassist input[type="radio"] {
680
  line-height: normal;
681
- margin: 4px 0 0;
682
  }
683
  #pushassist .btn-light:hover, #pushassist .btn-light:focus, #pushassist .btn-light.focus, #pushassist .btn-light:active, #pushassist .btn-light.active, #pushassist .open > .dropdown-toggle.btn-light {
684
  background-color: #f9f9f9;
@@ -838,24 +847,102 @@ font-size:15px;
838
  box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
839
  padding: 0;
840
  }
841
- #pushassist .pb15 {padding: 15px;}
842
- #pushassist p.h4 {font-size: 1.5em; margin: 15px 0px 10px; color: #37363e;}
843
- #pushassist p.h5 {font-size: 14px;}
844
- #pushassist .dummy-notification .widget {
845
- border-radius: 1px;
846
- display: table;
847
- margin-bottom: 17px;
848
- padding: 15px;
849
- position: relative;
850
- }
851
- #pushassist .dummy-notification-inner-wrapper {
852
- background: #ffffff none repeat scroll 0 0 !important;
853
- left: 5%;
854
- width: 90%;
855
- }
856
- #pushassist .notification_demo_img_block {width: 100px; height: 100px; float: left; display: block; position: relative;}
857
- #pushassist .notification_demo_img_block img {width: 100px; height: 100px; position: relative;}
858
- #pushassist .panel-body .table .message {width: 45% !important;}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
859
 
860
  /* =================================================================================
861
  smaller than 1280
17
  line-height: 1.6;
18
  }
19
  #pushassist h3, #pushassist .h3 {
20
+ font-size: 16px;
 
 
 
21
  }
22
  #pushassist h4, #pushassist .h4, #pushassist h5, #pushassist .h5, #pushassist h6, #pushassist .h6 {
23
  margin-bottom: 10px;
168
  margin-left: 10px;
169
  width:15%;
170
  float: left;
 
 
 
171
  }
172
 
173
  #Psidebar ul li {
174
+
 
175
  width:93%;
176
  float: left;
177
  border-bottom: 1px #ccc solid;
178
  padding:10px;
 
 
179
  }
180
 
181
 
183
 
184
  color: #fff !important;
185
  font-size:15px;
186
+ text-decoration:none !important;
187
  }
188
 
189
  #Psidebar a:hover{
243
  line-height: normal;
244
  margin: 0;
245
  padding: 0 0 6px;
246
+ display: inline-block !important;
247
  }
248
  #pushassist h1, #pushassist .h1, #pushassist h2, #pushassist .h2, #pushassist h3, #pushassist .h3 {
249
  letter-spacing: -0.02em;
335
  padding-bottom:8px;
336
  float: left;
337
  width: 80%;}
338
+ #pushassist .align-center{text-align:center !important;}
339
+ #pushassist input{
340
+ background: #ffffff none repeat scroll 0 0;
341
+ border: 1px solid #bdc4c9;
342
+ border-radius: 3px;
343
+ box-shadow: 0 1px 0 #f1f0f1 inset;
344
+ height: 36px;
345
+ padding-left: 10px;
346
+ }
347
+ #pushassist .float-r { float:right;}
348
  @media (min-width: 768px) {
349
  #pushassist .col-sm-1, #pushassist .col-sm-2, #pushassist .col-sm-3, #pushassist .col-sm-4, #pushassist .col-sm-5, #pushassist .col-sm-6, #pushassist .col-sm-7, #pushassist .col-sm-8, #pushassist .col-sm-9, #pushassist .col-sm-10, #pushassist .col-sm-11, #pushassist .col-sm-12 {
350
  float: left;
412
  width: 58.33333333%;
413
  }
414
  #pushassist .col-md-6 {
415
+ width: 49.70%;
416
  }
417
  #pushassist .col-md-5 {
418
  width: 41.66666667%;
517
  color: inherit;
518
  padding: 0;
519
  }
520
+ #pushassist .form-group:after {
521
+ clear: both;
522
+ content: " ";
523
+ display: table;
524
+ }
525
+
526
  #pushassist .form-group {
527
  margin-bottom: 18px;
528
  }
529
+
530
  #pushassist label {
531
  display: inline-block;
532
  font-weight: 700;
563
  transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
564
  width: 100%;
565
  }
566
+ /*#pushassist input, #pushassist select {
567
  background: #ffffff none repeat scroll 0 0;
568
  border: 1px solid #bdc4c9;
569
  border-radius: 3px;
571
  font-size: 14px;
572
  height: 110px;
573
  padding-left: 10px;
574
+ }*/
575
 
576
  #pushassist .form-control:focus {
577
  border-color: #66afe9;
687
  }
688
  #pushassist input[type="checkbox"], #pushassist input[type="radio"] {
689
  line-height: normal;
690
+ margin: -2px 0 0;
691
  }
692
  #pushassist .btn-light:hover, #pushassist .btn-light:focus, #pushassist .btn-light.focus, #pushassist .btn-light:active, #pushassist .btn-light.active, #pushassist .open > .dropdown-toggle.btn-light {
693
  background-color: #f9f9f9;
847
  box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
848
  padding: 0;
849
  }
850
+
851
+
852
+ #pushassist .pb15 {padding: 15px;}
853
+ #pushassist .pb15 p {margin-bottom: 10px;}
854
+ #pushassist p.h4 {font-size: 1.5em; margin: 15px 0px 10px; color: #37363e;}
855
+ #pushassist p.h5 {font-size: 14px;}
856
+ #pushassist .dummy-notification .widget {
857
+ border-radius: 1px !important;
858
+ display: table !important;
859
+ margin-bottom: 17px !important;
860
+ position: relative !important;
861
+ }
862
+ #pushassist .dummy-notification-inner-wrapper {
863
+ background: #ffffff none repeat scroll 0 0 !important;
864
+ left: 5% !important;
865
+ }
866
+
867
+ #pushassist .dummy-notification .h5 strong{
868
+ font-weight: 600 !important;
869
+ font-size: 14px !important;
870
+ }
871
+
872
+ #pushassist img{
873
+ width: 100%;
874
+ }
875
+
876
+ #pushassist strong{
877
+ font-weight: 600 !important;
878
+ color: #616161 !important;
879
+ }
880
+
881
+ #pushassist .dummy-notification-inner-wrapper .pb15{
882
+ padding: 15px;
883
+ }
884
+
885
+ #pushassist .notification-preview .widget {
886
+ padding: 0px !important;
887
+ }
888
+
889
+ #pushassist .wrapper { background-color: #ffffff; display: block; line-height: 1.1; min-width: 269px !important;}
890
+
891
+ #pushassist .wrapper .img_wrapper, #pushassist .wrapper img {
892
+ height: 82px !important;
893
+ margin: 0 13px 0 0;
894
+ width: 80px !important;
895
+ }
896
+
897
+ #pushassist .wrapper .text_wrapper {
898
+ padding: 5px 13px 10px 0;
899
+ width: 269px !important;
900
+ }
901
+
902
+ #pushassist .wrapper .text_wrapper .message {
903
+ font-size: 12px;
904
+ font-weight: 100;
905
+ line-height: 15px;
906
+ margin: 8px 0;
907
+ max-height: 30px;
908
+ min-height: 30px;
909
+ overflow: hidden;
910
+ }
911
+
912
+ #pushassist .wrapper .text_wrapper .domain {
913
+ color: #7f7f7f;
914
+ font-size: 11px;
915
+ letter-spacing: 0.5px;
916
+ }
917
+
918
+ #pushassist .title_txt {
919
+ width: 96%;
920
+ }
921
+
922
+ #pushassist .wrapper .text_wrapper .title .closer {
923
+ position: relative;
924
+ top: -6px;
925
+ }
926
+
927
+ #pushassist .wrapper .text_wrapper .title {
928
+ font-size: 13.5px !important;
929
+ letter-spacing: 0.5px;
930
+ line-height: 18px;
931
+ margin: 4px 0 8px;
932
+ max-height: 36px;
933
+ overflow: hidden;
934
+ }
935
+
936
+ #pushassist .dummy-notification .redirect_url {
937
+ font-size: 12px;
938
+ margin: 30px 0;
939
+ padding: 0 50px;
940
+ }
941
+
942
+ #pushassist .panel-body .table .message {width: 45% !important;}
943
+ #pushassist .panel-body .table .message h5, #pushassist .panel-body .table .message h5 a {color: #37363e !important}
944
+
945
+ #pushassist .panel-body .table .message a {text-decoration: none !important; color: #616161 !important;}
946
 
947
  /* =================================================================================
948
  smaller than 1280
skin/adminhtml/default/default/pushassist/pushassist_opt_in_box_setting.png ADDED
Binary file