Version Notes
Fixed:
- Access Control List
- Icons in grid of devices
Download this release
Release Info
Developer | eMagicOne |
Extension | mobile_assistant_connector |
Version | 1.4.3 |
Comparing to | |
See all releases |
Code changes from version 1.4.2 to 1.4.3
- app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit.php +2 -1
- app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Device/NewCustomer.php +2 -4
- app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Device/NewOrder.php +2 -4
- app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Device/Store.php +2 -3
- app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Tab/Main.php +2 -2
- app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Tab/Permissions.php +2 -2
- app/code/community/Emagicone/Mobassistantconnector/Helper/UserPermissions.php +30 -1
- app/code/community/Emagicone/Mobassistantconnector/Model/Observer.php +2 -4
- app/code/community/Emagicone/Mobassistantconnector/controllers/Adminhtml/UserController.php +1 -14
- app/code/community/Emagicone/Mobassistantconnector/controllers/IndexController.php +18 -15
- app/code/community/Emagicone/Mobassistantconnector/etc/config.xml +18 -8
- package.xml +6 -5
app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit.php
CHANGED
@@ -72,7 +72,8 @@ class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit extends Mage_Adm
|
|
72 |
*/
|
73 |
protected function _isAllowedAction($action)
|
74 |
{
|
75 |
-
return Mage::getSingleton('admin/session')->isAllowed('
|
|
|
76 |
}
|
77 |
|
78 |
/**
|
72 |
*/
|
73 |
protected function _isAllowedAction($action)
|
74 |
{
|
75 |
+
// return Mage::getSingleton('admin/session')->isAllowed('mobassistantconnector/mobassistantconnector_users/' . $action);
|
76 |
+
return Mage::helper('mobassistantconnector/userPermissions')->isAllowedAction($action);
|
77 |
}
|
78 |
|
79 |
/**
|
app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Device/NewCustomer.php
CHANGED
@@ -18,14 +18,12 @@
|
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Device_NewCustomer extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Text
|
20 |
{
|
21 |
-
|
22 |
public function render(Varien_Object $row)
|
23 |
{
|
24 |
$img = (int)$row->getData($this->getColumn()->getIndex()) == 1 ? 'yes.png' : 'no.png';
|
25 |
-
$out = "<div style='text-align: center; display: flex'><img style='margin: auto' src='"
|
26 |
-
. "images/emagicone/mobassistantconnector/$img'></div>";
|
27 |
|
28 |
return $out;
|
29 |
}
|
30 |
-
|
31 |
}
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Device_NewCustomer extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Text
|
20 |
{
|
|
|
21 |
public function render(Varien_Object $row)
|
22 |
{
|
23 |
$img = (int)$row->getData($this->getColumn()->getIndex()) == 1 ? 'yes.png' : 'no.png';
|
24 |
+
$out = "<div style='text-align: center; display: flex'><img style='margin: auto' src='"
|
25 |
+
. $this->getSkinUrl("images/emagicone/mobassistantconnector/$img") . "'></div>";
|
26 |
|
27 |
return $out;
|
28 |
}
|
|
|
29 |
}
|
app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Device/NewOrder.php
CHANGED
@@ -18,14 +18,12 @@
|
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Device_NewOrder extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Text
|
20 |
{
|
21 |
-
|
22 |
public function render(Varien_Object $row)
|
23 |
{
|
24 |
$img = (int)$row->getData($this->getColumn()->getIndex()) == 1 ? 'yes.png' : 'no.png';
|
25 |
-
$out = "<div style='text-align: center; display: flex'><img style='margin: auto' src='"
|
26 |
-
. "images/emagicone/mobassistantconnector/$img'></div>";
|
27 |
|
28 |
return $out;
|
29 |
}
|
30 |
-
|
31 |
}
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Device_NewOrder extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Text
|
20 |
{
|
|
|
21 |
public function render(Varien_Object $row)
|
22 |
{
|
23 |
$img = (int)$row->getData($this->getColumn()->getIndex()) == 1 ? 'yes.png' : 'no.png';
|
24 |
+
$out = "<div style='text-align: center; display: flex'><img style='margin: auto' src='"
|
25 |
+
. $this->getSkinUrl("images/emagicone/mobassistantconnector/$img") . "'></div>";
|
26 |
|
27 |
return $out;
|
28 |
}
|
|
|
29 |
}
|
app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Device/Store.php
CHANGED
@@ -18,7 +18,6 @@
|
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Device_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Store
|
20 |
{
|
21 |
-
|
22 |
public function render(Varien_Object $row)
|
23 |
{
|
24 |
$storeGroup = (int)$row->getData($this->getColumn()->getIndex());
|
@@ -30,10 +29,11 @@ class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Device_Store ext
|
|
30 |
}
|
31 |
|
32 |
$out = '';
|
33 |
-
$data = $this->_getStoreModel()->getStoresStructure(false,
|
34 |
|
35 |
foreach ($data as $website) {
|
36 |
$out .= $website['label'] . '<br/>';
|
|
|
37 |
foreach ($website['children'] as $group) {
|
38 |
$out .= str_repeat(' ', 3) . $group['label'] . '<br/>';
|
39 |
}
|
@@ -41,5 +41,4 @@ class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Device_Store ext
|
|
41 |
|
42 |
return $out;
|
43 |
}
|
44 |
-
|
45 |
}
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Device_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Store
|
20 |
{
|
|
|
21 |
public function render(Varien_Object $row)
|
22 |
{
|
23 |
$storeGroup = (int)$row->getData($this->getColumn()->getIndex());
|
29 |
}
|
30 |
|
31 |
$out = '';
|
32 |
+
$data = $this->_getStoreModel()->getStoresStructure(false, array(), array($storeGroup));
|
33 |
|
34 |
foreach ($data as $website) {
|
35 |
$out .= $website['label'] . '<br/>';
|
36 |
+
|
37 |
foreach ($website['children'] as $group) {
|
38 |
$out .= str_repeat(' ', 3) . $group['label'] . '<br/>';
|
39 |
}
|
41 |
|
42 |
return $out;
|
43 |
}
|
|
|
44 |
}
|
app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Tab/Main.php
CHANGED
@@ -184,7 +184,7 @@ class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Tab_Main extends
|
|
184 |
*/
|
185 |
protected function _isAllowedAction($action)
|
186 |
{
|
187 |
-
return Mage::getSingleton('admin/session')->isAllowed('
|
|
|
188 |
}
|
189 |
-
|
190 |
}
|
184 |
*/
|
185 |
protected function _isAllowedAction($action)
|
186 |
{
|
187 |
+
// return Mage::getSingleton('admin/session')->isAllowed('mobassistantconnector/mobassistantconnector_users/' . $action);
|
188 |
+
return Mage::helper('mobassistantconnector/userPermissions')->isAllowedAction($action);
|
189 |
}
|
|
|
190 |
}
|
app/code/community/Emagicone/Mobassistantconnector/Block/Adminhtml/User/Edit/Tab/Permissions.php
CHANGED
@@ -32,7 +32,7 @@ class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Tab_Permissions
|
|
32 |
/*
|
33 |
* Checking if user have permissions to save information
|
34 |
*/
|
35 |
-
$isElementDisabled =
|
36 |
|
37 |
$form = new Varien_Data_Form();
|
38 |
|
@@ -141,7 +141,7 @@ class Emagicone_Mobassistantconnector_Block_Adminhtml_User_Edit_Tab_Permissions
|
|
141 |
*/
|
142 |
protected function _isAllowedAction($action)
|
143 |
{
|
144 |
-
return Mage::
|
145 |
}
|
146 |
|
147 |
}
|
32 |
/*
|
33 |
* Checking if user have permissions to save information
|
34 |
*/
|
35 |
+
$isElementDisabled = !$this->_isAllowedAction('save') ? true : false;
|
36 |
|
37 |
$form = new Varien_Data_Form();
|
38 |
|
141 |
*/
|
142 |
protected function _isAllowedAction($action)
|
143 |
{
|
144 |
+
return Mage::helper('mobassistantconnector/userPermissions')->isAllowedAction($action);
|
145 |
}
|
146 |
|
147 |
}
|
app/code/community/Emagicone/Mobassistantconnector/Helper/UserPermissions.php
CHANGED
@@ -291,4 +291,33 @@ class Emagicone_Mobassistantconnector_Helper_UserPermissions extends Mage_Core_H
|
|
291 |
return $result;
|
292 |
}
|
293 |
|
294 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
291 |
return $result;
|
292 |
}
|
293 |
|
294 |
+
public static function isAllowedAction($action)
|
295 |
+
{
|
296 |
+
switch ($action) {
|
297 |
+
case 'index':
|
298 |
+
case 'edit':
|
299 |
+
case 'devices':
|
300 |
+
$result = Mage::getSingleton('admin/session')
|
301 |
+
->isAllowed('mobassistantconnector/mobassistantconnector_users/view');
|
302 |
+
break;
|
303 |
+
case 'new':
|
304 |
+
case 'save':
|
305 |
+
case 'delete':
|
306 |
+
case 'massdisable':
|
307 |
+
case 'massenable':
|
308 |
+
case 'massdelete':
|
309 |
+
case 'changestatusaccount':
|
310 |
+
case 'deletedevice':
|
311 |
+
case 'masschangestatusaccount':
|
312 |
+
case 'massDeleteDevice':
|
313 |
+
$result = Mage::getSingleton('admin/session')
|
314 |
+
->isAllowed('mobassistantconnector/mobassistantconnector_users/edit');
|
315 |
+
break;
|
316 |
+
default:
|
317 |
+
$result = false;
|
318 |
+
break;
|
319 |
+
}
|
320 |
+
|
321 |
+
return $result;
|
322 |
+
}
|
323 |
+
}
|
app/code/community/Emagicone/Mobassistantconnector/Model/Observer.php
CHANGED
@@ -18,7 +18,6 @@
|
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Model_Observer
|
20 |
{
|
21 |
-
|
22 |
private static function getActiveDevices()
|
23 |
{
|
24 |
$pushesCollection = Mage::getModel('emagicone_mobassistantconnector/push')->getCollection();
|
@@ -38,7 +37,7 @@ class Emagicone_Mobassistantconnector_Model_Observer
|
|
38 |
'u.`user_id` = main_table.`user_id`',
|
39 |
array()
|
40 |
)
|
41 |
-
->where('a.`status` = 1 AND u.`status` = 1 OR main_table.`user_id` IS NULL');
|
42 |
|
43 |
return $pushesCollection;
|
44 |
}
|
@@ -299,5 +298,4 @@ class Emagicone_Mobassistantconnector_Model_Observer
|
|
299 |
}
|
300 |
}
|
301 |
}
|
302 |
-
|
303 |
-
}
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Model_Observer
|
20 |
{
|
|
|
21 |
private static function getActiveDevices()
|
22 |
{
|
23 |
$pushesCollection = Mage::getModel('emagicone_mobassistantconnector/push')->getCollection();
|
37 |
'u.`user_id` = main_table.`user_id`',
|
38 |
array()
|
39 |
)
|
40 |
+
->where('a.`status` = 1 AND u.`status` = 1 OR main_table.`user_id` IS NULL OR d.`account_id` IS NULL');
|
41 |
|
42 |
return $pushesCollection;
|
43 |
}
|
298 |
}
|
299 |
}
|
300 |
}
|
301 |
+
}
|
|
app/code/community/Emagicone/Mobassistantconnector/controllers/Adminhtml/UserController.php
CHANGED
@@ -18,7 +18,6 @@
|
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Adminhtml_UserController extends Mage_Adminhtml_Controller_Action
|
20 |
{
|
21 |
-
|
22 |
private function changeUserStatus($status)
|
23 |
{
|
24 |
$userIds = $this->getRequest()->getPost('user_ids', array());
|
@@ -419,18 +418,6 @@ class Emagicone_Mobassistantconnector_Adminhtml_UserController extends Mage_Admi
|
|
419 |
{
|
420 |
$action = strtolower($this->getRequest()->getActionName());
|
421 |
|
422 |
-
|
423 |
-
case 'new':
|
424 |
-
case 'save':
|
425 |
-
return Mage::getSingleton('admin/session')->isAllowed('user/save');
|
426 |
-
break;
|
427 |
-
case 'delete':
|
428 |
-
return Mage::getSingleton('admin/session')->isAllowed('user/delete');
|
429 |
-
break;
|
430 |
-
default:
|
431 |
-
return Mage::getSingleton('admin/session')->isAllowed('user');
|
432 |
-
break;
|
433 |
-
}
|
434 |
}
|
435 |
-
|
436 |
}
|
18 |
|
19 |
class Emagicone_Mobassistantconnector_Adminhtml_UserController extends Mage_Adminhtml_Controller_Action
|
20 |
{
|
|
|
21 |
private function changeUserStatus($status)
|
22 |
{
|
23 |
$userIds = $this->getRequest()->getPost('user_ids', array());
|
418 |
{
|
419 |
$action = strtolower($this->getRequest()->getActionName());
|
420 |
|
421 |
+
return Mage::helper('mobassistantconnector/userPermissions')->isAllowedAction($action);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
422 |
}
|
|
|
423 |
}
|
app/code/community/Emagicone/Mobassistantconnector/controllers/IndexController.php
CHANGED
@@ -16,6 +16,7 @@
|
|
16 |
* You should have received a copy of the GNU General Public License
|
17 |
* along with Mobile Assistant Connector. If not, see <http://www.gnu.org/licenses/>.
|
18 |
*/
|
|
|
19 |
class Emagicone_Mobassistantconnector_IndexController extends Mage_Core_Controller_Front_Action
|
20 |
{
|
21 |
// public $CartClass = "";
|
@@ -42,7 +43,7 @@ class Emagicone_Mobassistantconnector_IndexController extends Mage_Core_Controll
|
|
42 |
private $group_id;
|
43 |
|
44 |
// const GSM_URL = 'https://android.googleapis.com/gcm/send';
|
45 |
-
const MB_VERSION = '
|
46 |
|
47 |
public function indexAction()
|
48 |
{
|
@@ -2351,22 +2352,21 @@ class Emagicone_Mobassistantconnector_IndexController extends Mage_Core_Controll
|
|
2351 |
$productFinal['product_id'] = $product->getEntityId();
|
2352 |
$productFinal['name'] = $product->getName();
|
2353 |
$productFinal['type_id'] = ucfirst($product->getTypeId());
|
2354 |
-
|
2355 |
-
// $thumbnail = $product->getThumbnail();
|
2356 |
-
|
2357 |
-
$thumbnail = (string)Mage::helper('catalog/image')
|
2358 |
-
->init($product, 'image')
|
2359 |
-
->constrainOnly(TRUE)
|
2360 |
-
->keepAspectRatio(TRUE)
|
2361 |
-
->resize(150, null);
|
2362 |
-
|
2363 |
-
// $productFinal['thumbnail'] = $product->getMediaConfig()->getMediaUrl($thumbnail);
|
2364 |
-
$productFinal['thumbnail'] = $thumbnail;
|
2365 |
|
2366 |
-
if (
|
2367 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2368 |
}
|
2369 |
|
|
|
2370 |
$productFinal['sku'] = $product->getSku();
|
2371 |
$productFinal['quantity'] = intval($product->getQty());
|
2372 |
$pArr['price'] = $product->getPrice();
|
@@ -2386,7 +2386,10 @@ class Emagicone_Mobassistantconnector_IndexController extends Mage_Core_Controll
|
|
2386 |
$productFinal['status_title'] = $statusOptions[$status];
|
2387 |
|
2388 |
$productFinal['stock_code'] = $isInStock;
|
2389 |
-
|
|
|
|
|
|
|
2390 |
|
2391 |
$productFinal['price'] = $this->_price_format($this->def_currency, 1, $pArr['price'], $this->currency_code);
|
2392 |
|
16 |
* You should have received a copy of the GNU General Public License
|
17 |
* along with Mobile Assistant Connector. If not, see <http://www.gnu.org/licenses/>.
|
18 |
*/
|
19 |
+
|
20 |
class Emagicone_Mobassistantconnector_IndexController extends Mage_Core_Controller_Front_Action
|
21 |
{
|
22 |
// public $CartClass = "";
|
43 |
private $group_id;
|
44 |
|
45 |
// const GSM_URL = 'https://android.googleapis.com/gcm/send';
|
46 |
+
const MB_VERSION = '101';
|
47 |
|
48 |
public function indexAction()
|
49 |
{
|
2352 |
$productFinal['product_id'] = $product->getEntityId();
|
2353 |
$productFinal['name'] = $product->getName();
|
2354 |
$productFinal['type_id'] = ucfirst($product->getTypeId());
|
2355 |
+
$productImage = $product->getImage();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2356 |
|
2357 |
+
if ($productImage && $productImage != 'no_selection') {
|
2358 |
+
try {
|
2359 |
+
$thumbnail = (string)Mage::helper('catalog/image')
|
2360 |
+
->init($product, 'image')
|
2361 |
+
->constrainOnly(TRUE)
|
2362 |
+
->keepAspectRatio(TRUE)
|
2363 |
+
->resize(150, null);
|
2364 |
+
} catch (Exception $e) {
|
2365 |
+
$thumbnail = '';
|
2366 |
+
}
|
2367 |
}
|
2368 |
|
2369 |
+
$productFinal['thumbnail'] = $thumbnail;
|
2370 |
$productFinal['sku'] = $product->getSku();
|
2371 |
$productFinal['quantity'] = intval($product->getQty());
|
2372 |
$pArr['price'] = $product->getPrice();
|
2386 |
$productFinal['status_title'] = $statusOptions[$status];
|
2387 |
|
2388 |
$productFinal['stock_code'] = $isInStock;
|
2389 |
+
|
2390 |
+
if (isset($stockOptions[$isInStock])) {
|
2391 |
+
$productFinal['stock_title'] = $stockOptions[$isInStock];
|
2392 |
+
}
|
2393 |
|
2394 |
$productFinal['price'] = $this->_price_format($this->def_currency, 1, $pArr['price'], $this->currency_code);
|
2395 |
|
app/code/community/Emagicone/Mobassistantconnector/etc/config.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<config>
|
3 |
<default>
|
4 |
-
|
5 |
<emogeneral>
|
6 |
<status>0</status>
|
7 |
</emogeneral>
|
@@ -9,12 +9,12 @@
|
|
9 |
<login>1</login>
|
10 |
<password>c4ca4238a0b923820dcc509a6f75849b</password>
|
11 |
</emoaccess>
|
12 |
-
</mobassistantconnectorinfosec
|
13 |
</default>
|
14 |
|
15 |
<modules>
|
16 |
<Emagicone_Mobassistantconnector>
|
17 |
-
<version>1.4.
|
18 |
</Emagicone_Mobassistantconnector>
|
19 |
</modules>
|
20 |
|
@@ -207,17 +207,27 @@
|
|
207 |
</config>
|
208 |
</children>
|
209 |
</system>
|
|
|
210 |
<mobassistantconnector translate="title" module="mobassistantconnector">
|
211 |
<title>Mobile Assistant Connector</title>
|
212 |
<sort_order>110</sort_order>
|
|
|
213 |
<children>
|
214 |
-
<settings>
|
215 |
-
<title>Settings</title>
|
216 |
-
<sort_order>0</sort_order>
|
217 |
-
</settings>
|
218 |
<mobassistantconnector_users>
|
219 |
<title>Users</title>
|
220 |
<sort_order>1</sort_order>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
221 |
</mobassistantconnector_users>
|
222 |
</children>
|
223 |
</mobassistantconnector>
|
@@ -226,4 +236,4 @@
|
|
226 |
</resources>
|
227 |
</acl>
|
228 |
</adminhtml>
|
229 |
-
</config>
|
1 |
<?xml version="1.0"?>
|
2 |
<config>
|
3 |
<default>
|
4 |
+
<!--<mobassistantconnectorinfosec>
|
5 |
<emogeneral>
|
6 |
<status>0</status>
|
7 |
</emogeneral>
|
9 |
<login>1</login>
|
10 |
<password>c4ca4238a0b923820dcc509a6f75849b</password>
|
11 |
</emoaccess>
|
12 |
+
</mobassistantconnectorinfosec>-->
|
13 |
</default>
|
14 |
|
15 |
<modules>
|
16 |
<Emagicone_Mobassistantconnector>
|
17 |
+
<version>1.4.3</version>
|
18 |
</Emagicone_Mobassistantconnector>
|
19 |
</modules>
|
20 |
|
207 |
</config>
|
208 |
</children>
|
209 |
</system>
|
210 |
+
|
211 |
<mobassistantconnector translate="title" module="mobassistantconnector">
|
212 |
<title>Mobile Assistant Connector</title>
|
213 |
<sort_order>110</sort_order>
|
214 |
+
|
215 |
<children>
|
|
|
|
|
|
|
|
|
216 |
<mobassistantconnector_users>
|
217 |
<title>Users</title>
|
218 |
<sort_order>1</sort_order>
|
219 |
+
|
220 |
+
<children>
|
221 |
+
<view translate="title" module="mobassistantconnector">
|
222 |
+
<title>View</title>
|
223 |
+
<sort_order>1</sort_order>
|
224 |
+
</view>
|
225 |
+
|
226 |
+
<edit translate="title" module="mobassistantconnector">
|
227 |
+
<title>Edit</title>
|
228 |
+
<sort_order>2</sort_order>
|
229 |
+
</edit>
|
230 |
+
</children>
|
231 |
</mobassistantconnector_users>
|
232 |
</children>
|
233 |
</mobassistantconnector>
|
236 |
</resources>
|
237 |
</acl>
|
238 |
</adminhtml>
|
239 |
+
</config>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>mobile_assistant_connector</name>
|
4 |
-
<version>1.4.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl.html">GNU</license>
|
7 |
<channel>community</channel>
|
@@ -9,11 +9,12 @@
|
|
9 |
<summary>Mobile Assistant Connector</summary>
|
10 |
<description>Mobile Assistant Connector</description>
|
11 |
<notes>Fixed:
|
12 |
-
-
|
|
|
13 |
<authors><author><name>eMagicOne</name><user>mobile</user><email>mobile@emagicone.com</email></author></authors>
|
14 |
-
<date>2016-
|
15 |
-
<time>
|
16 |
-
<contents><target name="magecommunity"><dir name="Emagicone"><dir name="Mobassistantconnector"><dir name="Block"><dir name="Adminhtml"><dir name="User"><dir name="Edit"><dir name="Device"><file name="Action.php" hash="748ccfc5bfb27839fbbe5b7599403881"/><file name="Currency.php" hash="7ea09a23a1ea316deeed6c9c9ac80ea1"/><file name="Date.php" hash="346726345f8890bf67744c4f226908ff"/><file name="Grid.php" hash="2724427ef8a4fde14c65082d3cf28a4f"/><file name="MassAction.php" hash="d122d28a33235e0830d563edddd0e91f"/><file name="NewCustomer.php" hash="
|
17 |
<compatible/>
|
18 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><extension><name>curl</name><min>1.0</min><max>3.0</max></extension><extension><name>json</name><min>1.0</min><max>3.0</max></extension><extension><name>date</name><min>1.0</min><max>3.0</max></extension></required></dependencies>
|
19 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>mobile_assistant_connector</name>
|
4 |
+
<version>1.4.3</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl.html">GNU</license>
|
7 |
<channel>community</channel>
|
9 |
<summary>Mobile Assistant Connector</summary>
|
10 |
<description>Mobile Assistant Connector</description>
|
11 |
<notes>Fixed:
|
12 |
+
- Access Control List
|
13 |
+
- Icons in grid of devices</notes>
|
14 |
<authors><author><name>eMagicOne</name><user>mobile</user><email>mobile@emagicone.com</email></author></authors>
|
15 |
+
<date>2016-11-01</date>
|
16 |
+
<time>14:13:29</time>
|
17 |
+
<contents><target name="magecommunity"><dir name="Emagicone"><dir name="Mobassistantconnector"><dir name="Block"><dir name="Adminhtml"><dir name="User"><dir name="Edit"><dir name="Device"><file name="Action.php" hash="748ccfc5bfb27839fbbe5b7599403881"/><file name="Currency.php" hash="7ea09a23a1ea316deeed6c9c9ac80ea1"/><file name="Date.php" hash="346726345f8890bf67744c4f226908ff"/><file name="Grid.php" hash="2724427ef8a4fde14c65082d3cf28a4f"/><file name="MassAction.php" hash="d122d28a33235e0830d563edddd0e91f"/><file name="NewCustomer.php" hash="da848fedc76736fa1d0bf5b4535c179d"/><file name="NewOrder.php" hash="4c294c6e5761b5c5fae94e672b3b8abd"/><file name="OrdStatuses.php" hash="2bb02f497afcc92a94f926eab60e4123"/><file name="Store.php" hash="0e5fc11bc2ffbfdac4f2932ad25ac9db"/></dir><file name="Form.php" hash="cd6ff48abc2dd12f8ac891caf914bc19"/><dir name="Tab"><file name="Devices.php" hash="3d8d69c1365f6a9aed31a08e16d3483a"/><file name="Main.php" hash="dd564e792991dc63d616be45b7b7eba6"/><file name="Permissions.php" hash="b3f0d9841b0a70c351a590aa19510429"/></dir><file name="Tabs.php" hash="acc0ef49c44ca68a0104543d47594600"/></dir><file name="Edit.php" hash="4ba8daecce2767097c30b464bc8e712c"/><file name="Grid.php" hash="c135641a83eb3d53060724390d73242a"/><dir name="Renderer"><file name="Permissions.php" hash="05400fc0d8eee0789894a5ba7b2617eb"/></dir></dir><file name="User.php" hash="3c85641c28ca4f0b06f82f891d0dd5d9"/></dir></dir><dir name="Helper"><file name="Access.php" hash="a2817c796ef727bf4b454c38c53ff489"/><file name="Data.php" hash="b58c0457a0724d522472a25a769d4697"/><file name="DeviceAndPushNotification.php" hash="bae57bdc5f9be6bf999950404561a52d"/><file name="TableCheck.php" hash="5794c6de2b12b06fa5406d4ec910761a"/><file name="UserPermissions.php" hash="352c3beb1767c88cee0f2684d08c0e51"/></dir><dir name="Model"><file name="Account.php" hash="f77aaf7f0353b955a3fd329eadb9c442"/><file name="Device.php" hash="83de38ede2946fd212f9830c4986ac1b"/><file name="Failed.php" hash="7da654c3cf1e9a3f5a55da7f36192117"/><file name="Observer.php" hash="4f19709b716f74fbe31effeb1fefd56d"/><file name="Order.php" hash="f3d5529e0504ea0265cb661e03f41109"/><file name="Push.php" hash="6ea51508c9c0f286e823b3114ecc1574"/><dir name="Resource"><dir name="Account"><file name="Collection.php" hash="f2cca57921b1e4166adba6ec696019b2"/></dir><file name="Account.php" hash="7173f12167679683fd0d988486ac3194"/><dir name="Device"><file name="Collection.php" hash="ca73c4991e75291ae22e3da2001c2135"/></dir><file name="Device.php" hash="af556dc7a9219c8c2410644ebc0aa091"/><dir name="Failed"><file name="Collection.php" hash="18980688d80660f6a663a2c4dce20f54"/></dir><file name="Failed.php" hash="a69ca1239d3400097fabc415ee02751b"/><dir name="Push"><file name="Collection.php" hash="e6c30e6242b49968163445599376e1fb"/></dir><file name="Push.php" hash="f703f63c3e286dd8d130465f1496b421"/><dir name="Sessions"><file name="Collection.php" hash="f3d9c493b3b6a3ddfe518e583c7e5cdd"/></dir><file name="Sessions.php" hash="1b711092c3754a78968fc588b17a5b27"/><dir name="User"><file name="Collection.php" hash="571520e1040d4e02b7561a84cfdbd2d0"/></dir><file name="User.php" hash="6cc54e4e5d8e2a5e79d16fee72d0747c"/></dir><file name="Sessions.php" hash="5235ab4ee8c85e65b6a7acd3822a1f8e"/><file name="User.php" hash="88d00bbf3beba3e7f74f6856c3f6dcef"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="UserController.php" hash="5d6f8867eba5d86cefab341818ea33ef"/></dir><file name="IndexController.php" hash="e619e114c255df31c9015bea819dd1a7"/></dir><dir name="data"><dir name="em1_mob_setup"><file name="data-install-1.4.0.php" hash="965122cdb3c3588b12b3183def522865"/></dir></dir><dir name="etc"><file name="config.xml" hash="9f762cdb81274dd9a3c1a4edf19ae28c"/></dir><dir name="sql"><dir name="em1_mob_setup"><file name="install-1.2.1.php" hash="47e6e1768eebf16f550bff703d07d6ed"/><file name="install-1.4.0.php" hash="b73da05de23bf5440a027f5848a6c537"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Emagicone_Mobassistantconnector.xml" hash="e2640b07fbf521ed2b46a7babc32c961"/></dir></target><target name="magelocale"><dir><dir name="en_GB"><file name="Emagicone_Mobassistantconnector.csv" hash="eaf733f81ff47627c4389d487c93709f"/></dir><dir name="en_US"><file name="Emagicone_Mobassistantconnector.csv" hash="510d79a25c0bfb7a096aab57d8c5b458"/></dir><dir name="es_ES"><file name="Emagicone_Mobassistantconnector.csv" hash="acc37c432dd8b4134844291931b70fbf"/></dir><dir name="fr_FR"><file name="Emagicone_Mobassistantconnector.csv" hash="76c48723a6bbd59534781fd3c7f6d86e"/></dir><dir name="ru_RU"><file name="Emagicone_Mobassistantconnector.csv" hash="2346397cbe029dcc724717b953a3f38c"/></dir><dir name="uk_UA"><file name="Emagicone_Mobassistantconnector.csv" hash="cad0e0c3ec7603e6b886d815357d1766"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="mobassistantconnector.xml" hash="99255762545013b6e08e129507643a4c"/></dir><dir name="template"><dir name="mobassistantconnector"><file name="permissions.phtml" hash="4a5bec0a952e42b8217009c25d13e517"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="emagicone"><dir name="mobassistantconnector"><file name="qr_code.phtml" hash="ef2214ea50bcb16437f442560685fd5e"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="emagicone"><dir name="mobassistantconnector"><file name="style.css" hash="999f613ef0c69cdf66983287863d12c9"/></dir></dir><dir name="images"><dir name="emagicone"><dir name="mobassistantconnector"><file name="no.png" hash="75414819e41cc1416c0d822542000ade"/><file name="yes.png" hash="1f5f13694de74c249ab49f5f3d6594e5"/></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="emagicone"><dir name="mobassistantconnector"><file name="jquery-2.2.2.min.js" hash="1d35678c5edbb639ab7aa5cce0856f57"/><file name="qrcode.min.js" hash="faf8005e4fd1a9ea39d4b6feb930bf09"/><file name="qrcode_app_user_edit.js" hash="360885156fbb459a3cef3f5ce2ff1e97"/><file name="qrcode_app_user_index.js" hash="5bb7797825387d3f7144315008218afc"/><file name="user_edit.js" hash="9e2dde14fb29bd9324c94fa0491a525d"/></dir></dir></dir></target></contents>
|
18 |
<compatible/>
|
19 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><extension><name>curl</name><min>1.0</min><max>3.0</max></extension><extension><name>json</name><min>1.0</min><max>3.0</max></extension><extension><name>date</name><min>1.0</min><max>3.0</max></extension></required></dependencies>
|
20 |
</package>
|