magento_mobile_assistant_manager - Version 0.2.6

Version Notes

- Enhancement

Download this release

Release Info

Developer Biztech
Extension magento_mobile_assistant_manager
Version 0.2.6
Comparing to
See all releases


Code changes from version 0.2.5 to 0.2.6

Files changed (7) hide show
  1. app/code/local/Biztech/Authentication/controllers/IndexController.php +1 -1
  2. app/code/local/Biztech/Mobileassistant/Block/Config/.LCKBaseurl.php~ +0 -1
  3. app/code/local/Biztech/Mobileassistant/Block/Config/Baseurl.php +39 -11
  4. app/code/local/Biztech/Mobileassistant/etc/system.xml +2 -2
  5. app/design/adminhtml/default/default/template/mobileassistant/system/config/barcode.phtml +33 -5
  6. app/design/adminhtml/default/default/template/mobileassistant/system/config/barcode_21-7-2016.phtml +6 -0
  7. package.xml +4 -4
app/code/local/Biztech/Authentication/controllers/IndexController.php CHANGED
@@ -162,7 +162,7 @@ class Biztech_Authentication_IndexController extends Mage_Core_Controller_Front_
162
  $currency_code = Mage::getModel('core/store')->load($storeId)->getCurrentCurrencyCode();
163
 
164
  $isPos = 0;
165
- $resultArr = array('logo' => $logo, 'currency_symbol' => Mage::app()->getLocale()->currency($currency_code)->getSymbol(), 'is_pos' => $isPos);
166
  $result = Mage::helper('core')->jsonEncode($resultArr);
167
  return Mage::app()->getResponse()->setBody($result);
168
  }
162
  $currency_code = Mage::getModel('core/store')->load($storeId)->getCurrentCurrencyCode();
163
 
164
  $isPos = 0;
165
+ $resultArr = array('logo' => $logo, 'currency_symbol' => Mage::app()->getLocale()->currency($currency_code)->getSymbol(), 'is_pos' => $isPos, 'is_Mobileassistantpro' => 1);
166
  $result = Mage::helper('core')->jsonEncode($resultArr);
167
  return Mage::app()->getResponse()->setBody($result);
168
  }
app/code/local/Biztech/Mobileassistant/Block/Config/.LCKBaseurl.php~ DELETED
@@ -1 +0,0 @@
1
- /var/www/html/magento1923/app/code/local/Biztech/Mobileassistant/Block/Config/Baseurl.php
 
app/code/local/Biztech/Mobileassistant/Block/Config/Baseurl.php CHANGED
@@ -1,14 +1,42 @@
1
  <?php
2
- class Biztech_Mobileassistant_Block_Config_Baseurl extends Mage_Adminhtml_Block_System_Config_Form_Field
3
- {
4
-
5
- protected function _construct()
6
- {
7
- parent::_construct();
8
- }
9
- protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
10
- {
11
- return '<span style="color:blue;">'.Mage::getBaseUrl().'</span>';
12
- }
13
 
 
 
 
 
14
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <?php
 
 
 
 
 
 
 
 
 
 
 
2
 
3
+ class Biztech_Mobileassistant_Block_Config_Baseurl extends Mage_Adminhtml_Block_System_Config_Form_Field {
4
+
5
+ protected function _construct() {
6
+ parent::_construct();
7
  }
8
+
9
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) {
10
+ $html = '';
11
+ if (strlen($code = Mage::getSingleton('adminhtml/config_data')->getStore())) { // store level
12
+ $storeId = Mage::getModel('core/store')->load($code)->getId();
13
+ $url = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
14
+ $html = '<span style="color:blue;">' . $url . '</span>';
15
+ } elseif (strlen($code = Mage::getSingleton('adminhtml/config_data')->getWebsite())) { // website level
16
+ $website_id = Mage::getModel('core/website')->load($code)->getId();
17
+ $storeId = Mage::app()->getWebsite($website_id)->getDefaultStore()->getId();
18
+ $url = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
19
+ $html = '<span style="color:blue;">' . $url . '</span>';
20
+ } else { // default level
21
+ $defaultId = array();
22
+ $websites = Mage::app()->getWebsites();
23
+ if (count($websites) > 1) {
24
+ foreach ($websites as $website) {
25
+ $defaultId[] = $website->getDefaultGroup(true)->getDefaultStoreId();
26
+ }
27
+ $i = 1;
28
+ foreach ($defaultId as $storeId) {
29
+ $url = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
30
+ $html = $html . 'Website ' . $i . ': <span style="color:blue;">' . $url . '</span> </br>';
31
+ $i++;
32
+ }
33
+ } else {
34
+ $storeId = Mage::app()->getWebsite(true)->getDefaultGroup()->getDefaultStoreId();
35
+ $url = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
36
+ $html = '<span style="color:blue;">' . $url . '</span>';
37
+ }
38
+ }
39
+ return $html;
40
+ }
41
+
42
+ }
app/code/local/Biztech/Mobileassistant/etc/system.xml CHANGED
@@ -72,7 +72,7 @@
72
  <show_in_default>1</show_in_default>
73
  <show_in_website>1</show_in_website>
74
  <show_in_store>1</show_in_store>
75
- <comment>Configure this URL on your device.</comment>
76
  </base_url>
77
  <notification translate="label">
78
  <label>Send Notification For</label>
@@ -139,7 +139,7 @@
139
  <show_in_default>1</show_in_default>
140
  <show_in_website>1</show_in_website>
141
  <show_in_store>1</show_in_store>
142
- <comment>Displays QR code for store base url.</comment>
143
  </barcode_for_url>
144
  </fields>
145
  </mobileassistant_general>
72
  <show_in_default>1</show_in_default>
73
  <show_in_website>1</show_in_website>
74
  <show_in_store>1</show_in_store>
75
+ <comment>Configure this URL on your device.If there are multiple website, Base Url will display according that.</comment>
76
  </base_url>
77
  <notification translate="label">
78
  <label>Send Notification For</label>
139
  <show_in_default>1</show_in_default>
140
  <show_in_website>1</show_in_website>
141
  <show_in_store>1</show_in_store>
142
+ <comment>Displays QR code for store base url. If there are multiple website, QR code will display according that.</comment>
143
  </barcode_for_url>
144
  </fields>
145
  </mobileassistant_general>
app/design/adminhtml/default/default/template/mobileassistant/system/config/barcode.phtml CHANGED
@@ -1,6 +1,34 @@
1
- <?php
2
- $storeId = Mage::app()->getStore()->getStoreId();
3
- $url = Mage::app()->getStore($storeId)->getUrl();
4
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
5
  ?>
6
- <img src="https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=<?php echo urlencode($url); ?>&choe=UTF-8" title="<?php echo $url; ?>" />
 
 
 
 
 
 
 
 
1
+ <?php
2
+ if (strlen($code = Mage::getSingleton('adminhtml/config_data')->getStore())) { // store level
3
+ $storeId = Mage::getModel('core/store')->load($code)->getId();
4
+ $url = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
5
+ } elseif (strlen($code = Mage::getSingleton('adminhtml/config_data')->getWebsite())) { // website level
6
+ $website_id = Mage::getModel('core/website')->load($code)->getId();
7
+ $storeId = Mage::app()->getWebsite($website_id)->getDefaultStore()->getId();
8
+ $url = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
9
+ } else { // default level
10
+ $defaultId = array();
11
+ $websites = Mage::app()->getWebsites();
12
+ if (count($websites) > 0) {
13
+ $url = array();
14
+ foreach ($websites as $website) {
15
+ $defaultId[] = $website->getDefaultGroup(true)->getDefaultStoreId();
16
+ }
17
+ foreach ($defaultId as $storeId) {
18
+ $url[] = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
19
+ }
20
+ } else {
21
+ $storeId = Mage::app()->getWebsite(true)->getDefaultGroup()->getDefaultStoreId();
22
+ $url = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
23
+ }
24
+ }
25
  ?>
26
+ <?php if (is_array($url)) { ?>
27
+ <div style="width: 615px ! important;">
28
+ <?php for ($i = 0; $i < count($url); $i++) { ?>
29
+ <img src="https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=<?php echo urlencode($url[$i]); ?>&choe=UTF-8" title="<?php echo $url[$i]; ?>" style="margin-left: 5px;"/>
30
+ <?php } ?>
31
+ </div>
32
+ <?php } else { ?>
33
+ <img src="https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=<?php echo urlencode($url); ?>&choe=UTF-8" title="<?php echo $url; ?>" />
34
+ <?php } ?>
app/design/adminhtml/default/default/template/mobileassistant/system/config/barcode_21-7-2016.phtml ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
1
+ <?php
2
+ $storeId = Mage::app()->getStore()->getStoreId();
3
+ $url = Mage::app()->getStore($storeId)->getUrl();
4
+
5
+ ?>
6
+ <img src="https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=<?php echo urlencode($url); ?>&choe=UTF-8" title="<?php echo $url; ?>" />
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>magento_mobile_assistant_manager</name>
4
- <version>0.2.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -27,9 +27,9 @@ https://itunes.apple.com/us/app/magentomobilemanager/id695074519?mt=8&amp;ign-mp
27
  </description>
28
  <notes>- Enhancement</notes>
29
  <authors><author><name>Biztech</name><user>biztechcon</user><email>sales@biztechconsultancy.com</email></author></authors>
30
- <date>2016-07-19</date>
31
- <time>04:52:31</time>
32
- <contents><target name="mageetc"><dir name="modules"><file name="Biztech_Mobileassistant.xml" hash="18d9cf7b8e516db899336adfd8210621"/><file name="Biztech_Authentication.xml" hash="149998e1599f43939f13cbc059123c8f"/></dir></target><target name="mage"><dir name="lib"><dir name="mobileassistant"><file name="pushcert.pem" hash="ae01f2353e11081071f5fa7e06bef9c1"/></dir></dir><dir name="."><file name="MageMobAdmin.pdf" hash=""/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="mobileassistant"><dir name="system"><dir name="config"><file name="barcode.phtml" hash="4316de57ba76dc0f3d581fd149830920"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Biztech"><dir name="Authentication"><dir name="controllers"><file name="IndexController.php" hash="c2ed951c28b0ca4a2009b64c9cf28a40"/></dir><dir name="etc"><file name="config.xml" hash="d12ebc10e7781ff82323e54ff7713dae"/></dir></dir><dir name="Mobileassistant"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Renderer"><file name="Website.php" hash="0c1e8edeea8f34380803f2ee8caaf0e8"/></dir></dir></dir><file name="Enabledisable.php" hash="3b2fcf73b42be06f35b8661d14c11293"/></dir><dir name="Config"><file name="Barcodeurl.php" hash="6dc63c4a9f259cb5fb854d39c9057eaa"/><file name="Baseurl.php" hash="afc86dd6d73b665f610613933d8a9d5f"/><file name=".LCKBaseurl.php~" hash="3a2b712196fc12ed484916becec79e61"/></dir></dir><dir name="Helper"><file name="Data.php" hash="951e2c003267660cf66a5110f7c1f0df"/></dir><dir name="Model"><dir name="Mobileassistant"><file name="Api.php" hash="4e8e1f556fc8f1d9e6c2f520a3a84e52"/></dir><file name="Mobileassistant.php" hash="68e160bf752ec8c1facc514389c00849"/><dir name="Mysql4"><dir name="Mobileassistant"><file name="Collection.php" hash="e9319365535ec2c42429ea1d9dbdc097"/></dir><file name="Mobileassistant.php" hash="62dc51f43aa6dff1dc762646b71cd600"/></dir><file name="Observer.php" hash="b40ccaabbc9d2fb2312097dba1f93389"/><dir name="System"><dir name="Config"><file name="Notification.php" hash="fdaacb629e9b200fc4d778ab4173f55a"/><file name="Notification_30-1-2016.php" hash="e534c166867436b3ab6c5d3a9c0e5d45"/></dir></dir></dir><dir name="controllers"><file name="CustomerController.php" hash="43619f8ab81eb651a34e7fab791af613"/><file name="DashboardController.php" hash="74ab167f27cb2a2fb1e5f7a636896668"/><file name="IndexController.php" hash="a3f18e83cd9fd2887ce82e3305c27b28"/><file name="OrderController.php" hash="14e4ef67dc8b5cd4aa0e4a4e4235a966"/><file name="ProductController.php" hash="cbeea2ed1c12baada5b2fb2ba593e78c"/></dir><dir name="etc"><file name="api.xml" hash="7860c9fe0f121148eb2a3a498d1879b1"/><file name="config.xml" hash="728d352e24878516ce118759978b7054"/><file name="system.xml" hash="0e2f664f7a4849ba06b40618d866d493"/></dir><dir name="sql"><dir name="mobileassistant_setup"><file name="mysql4-install-0.1.0.php" hash="4f06ae1c3c5362b88fae1b1951a6b02a"/><file name="mysql4-upgrade-0.1.0-0.1.4.php" hash="172e9ecba3b5b385cef1c257b2af4bfa"/><file name="mysql4-upgrade-0.1.10-0.2.0.php" hash="dcb5288e356d3c36838446bbcadf6a2e"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="bd4adba7146d89fed6c548dd46a30a81"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="88ea6198ef876da921faebb1aa067485"/><file name="mysql4-upgrade-0.1.6-0.1.10.php" hash="88ea6198ef876da921faebb1aa067485"/></dir></dir></dir></dir></target></contents>
33
  <compatible/>
34
  <dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
35
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>magento_mobile_assistant_manager</name>
4
+ <version>0.2.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
27
  </description>
28
  <notes>- Enhancement</notes>
29
  <authors><author><name>Biztech</name><user>biztechcon</user><email>sales@biztechconsultancy.com</email></author></authors>
30
+ <date>2016-07-22</date>
31
+ <time>04:32:20</time>
32
+ <contents><target name="mageetc"><dir name="modules"><file name="Biztech_Mobileassistant.xml" hash="18d9cf7b8e516db899336adfd8210621"/><file name="Biztech_Authentication.xml" hash="149998e1599f43939f13cbc059123c8f"/></dir></target><target name="mage"><dir name="lib"><dir name="mobileassistant"><file name="pushcert.pem" hash="ae01f2353e11081071f5fa7e06bef9c1"/></dir></dir><dir name="."><file name="MageMobAdmin.pdf" hash=""/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="mobileassistant"><dir name="system"><dir name="config"><file name="barcode.phtml" hash="94f6f78607e6d376b53b12f349d691b8"/><file name="barcode_21-7-2016.phtml" hash="4316de57ba76dc0f3d581fd149830920"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Biztech"><dir name="Authentication"><dir name="controllers"><file name="IndexController.php" hash="bfc01d24d03410e2d467139ff75ba9ce"/></dir><dir name="etc"><file name="config.xml" hash="d12ebc10e7781ff82323e54ff7713dae"/></dir></dir><dir name="Mobileassistant"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Renderer"><file name="Website.php" hash="0c1e8edeea8f34380803f2ee8caaf0e8"/></dir></dir></dir><file name="Enabledisable.php" hash="3b2fcf73b42be06f35b8661d14c11293"/></dir><dir name="Config"><file name="Barcodeurl.php" hash="6dc63c4a9f259cb5fb854d39c9057eaa"/><file name="Baseurl.php" hash="5ca3d2fc995b3da5e155fd55e87b1eed"/></dir></dir><dir name="Helper"><file name="Data.php" hash="951e2c003267660cf66a5110f7c1f0df"/></dir><dir name="Model"><dir name="Mobileassistant"><file name="Api.php" hash="4e8e1f556fc8f1d9e6c2f520a3a84e52"/></dir><file name="Mobileassistant.php" hash="68e160bf752ec8c1facc514389c00849"/><dir name="Mysql4"><dir name="Mobileassistant"><file name="Collection.php" hash="e9319365535ec2c42429ea1d9dbdc097"/></dir><file name="Mobileassistant.php" hash="62dc51f43aa6dff1dc762646b71cd600"/></dir><file name="Observer.php" hash="b40ccaabbc9d2fb2312097dba1f93389"/><dir name="System"><dir name="Config"><file name="Notification.php" hash="fdaacb629e9b200fc4d778ab4173f55a"/><file name="Notification_30-1-2016.php" hash="e534c166867436b3ab6c5d3a9c0e5d45"/></dir></dir></dir><dir name="controllers"><file name="CustomerController.php" hash="43619f8ab81eb651a34e7fab791af613"/><file name="DashboardController.php" hash="74ab167f27cb2a2fb1e5f7a636896668"/><file name="IndexController.php" hash="a3f18e83cd9fd2887ce82e3305c27b28"/><file name="OrderController.php" hash="14e4ef67dc8b5cd4aa0e4a4e4235a966"/><file name="ProductController.php" hash="cbeea2ed1c12baada5b2fb2ba593e78c"/></dir><dir name="etc"><file name="api.xml" hash="7860c9fe0f121148eb2a3a498d1879b1"/><file name="config.xml" hash="728d352e24878516ce118759978b7054"/><file name="system.xml" hash="359566ac64e3bb32e78b4ad247d21b31"/></dir><dir name="sql"><dir name="mobileassistant_setup"><file name="mysql4-install-0.1.0.php" hash="4f06ae1c3c5362b88fae1b1951a6b02a"/><file name="mysql4-upgrade-0.1.0-0.1.4.php" hash="172e9ecba3b5b385cef1c257b2af4bfa"/><file name="mysql4-upgrade-0.1.10-0.2.0.php" hash="dcb5288e356d3c36838446bbcadf6a2e"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="bd4adba7146d89fed6c548dd46a30a81"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="88ea6198ef876da921faebb1aa067485"/><file name="mysql4-upgrade-0.1.6-0.1.10.php" hash="88ea6198ef876da921faebb1aa067485"/></dir></dir></dir></dir></target></contents>
33
  <compatible/>
34
  <dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
35
  </package>