magento_mobile_assistant_manager - Version 0.2.9

Version Notes

- Minor Bug Fixing

Download this release

Release Info

Developer Biztech
Extension magento_mobile_assistant_manager
Version 0.2.9
Comparing to
See all releases


Code changes from version 0.2.8 to 0.2.9

MageMobAdmin.pdf ADDED
Binary file
app/code/local/Biztech/Mobileassistant/Helper/Data.php CHANGED
@@ -65,7 +65,7 @@ class Biztech_Mobileassistant_Helper_Data extends Mage_Core_Helper_Abstract {
65
  $price = $store->roundPrice($store->convertPrice($price));
66
  $currencyCode = Mage::app()->getStore($storeId)->getCurrentCurrencyCode();
67
  }
68
- $price = strip_tags(Mage::app()->getLocale()->currency($currencyCode)->toCurrency($this->getPriceFormat($price)));
69
  return $price;
70
  }
71
 
65
  $price = $store->roundPrice($store->convertPrice($price));
66
  $currencyCode = Mage::app()->getStore($storeId)->getCurrentCurrencyCode();
67
  }
68
+ $price = strip_tags($this->getPriceFormat($price));
69
  return $price;
70
  }
71
 
app/code/local/Biztech/Mobileassistant/Model/System/Config/Notification.php CHANGED
@@ -15,7 +15,7 @@ class Biztech_Mobileassistant_Model_System_Config_Notification {
15
  array(
16
  'value' => 'customer_notification',
17
  'label' => 'Customer Notification',
18
- ));
19
 
20
  return $optionArray;
21
  }
15
  array(
16
  'value' => 'customer_notification',
17
  'label' => 'Customer Notification',
18
+ ));
19
 
20
  return $optionArray;
21
  }
app/code/local/Biztech/Mobileassistant/Model/System/Config/Notification_30-1-2016.php DELETED
@@ -1,23 +0,0 @@
1
- <?php
2
-
3
- class Biztech_Mobileassistant_Model_System_Config_Notification {
4
-
5
- public function toOptionArray() {
6
- $optionArray = array(
7
- array(
8
- 'value' => 'order_notification',
9
- 'label' => 'Order Notification',
10
- ),
11
- array(
12
- 'value' => 'product_notification',
13
- 'label' => 'Product Notification',
14
- ),
15
- array(
16
- 'value' => 'customer_notification',
17
- 'label' => 'Customer Notification',
18
- ));
19
-
20
- return $optionArray;
21
- }
22
-
23
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Biztech/Mobileassistant/controllers/CustomerController.php CHANGED
@@ -209,7 +209,6 @@ class Biztech_Mobileassistant_CustomerController extends Mage_Core_Controller_Fr
209
  ));
210
  }
211
 
212
-
213
  foreach ($customers as $customer) {
214
  $billing_address = Mage::getModel('customer/address')->load($customer->getDefaultBilling());
215
  $shipping_address = Mage::getModel('customer/address')->load($customer->getDefaultShipping());
209
  ));
210
  }
211
 
 
212
  foreach ($customers as $customer) {
213
  $billing_address = Mage::getModel('customer/address')->load($customer->getDefaultBilling());
214
  $shipping_address = Mage::getModel('customer/address')->load($customer->getDefaultShipping());
app/code/local/Biztech/Mobileassistant/controllers/DashboardController.php CHANGED
@@ -148,9 +148,9 @@ class Biztech_Mobileassistant_DashboardController extends Mage_Core_Controller_F
148
 
149
  $baseCurrencyCode = Mage::app()->getStore()->getBaseCurrencyCode();
150
 
151
- $orderGrandTotal = strip_tags(Mage::app()->getLocale()->currency($baseCurrencyCode)->toCurrency(array_sum($orderTotalByDate)));
152
- $lifeTimeSales = strip_tags(Mage::app()->getLocale()->currency($baseCurrencyCode)->toCurrency(round(Mage::getResourceModel('reports/order_collection')->addFieldToFilter('store_id', $storeId)->calculateSales()->load()->getFirstItem()->getLifetime(), 2)));
153
- $averageOrder = strip_tags(Mage::app()->getLocale()->currency($baseCurrencyCode)->toCurrency(round(Mage::getResourceModel('reports/order_collection')->addFieldToFilter('store_id', $storeId)->calculateSales()->load()->getFirstItem()->getAverage(), 2)));
154
 
155
  if ($type_id == 7) {
156
  $avg_order_count = $total_count / 7;
@@ -173,7 +173,7 @@ class Biztech_Mobileassistant_DashboardController extends Mage_Core_Controller_F
173
  }
174
 
175
  $avg_order_count = number_format($avg_order_count, 2, '.', ',');
176
- $avg_ordergrandtotal = strip_tags(Mage::app()->getLocale()->currency($baseCurrencyCode)->toCurrency($avg_ordergrandtotal));
177
 
178
 
179
  $orderTotalResultArr = array('dashboard_result' => array('ordertotalbydate' => $orderTotalByDate, 'ordergrandtotal' => $orderGrandTotal, 'totalordercount' => $total_count, 'lifetimesales' => $lifeTimeSales, 'averageorder' => $averageOrder, 'avg_order_count' => $avg_order_count, 'avg_order_grandtotal' => $avg_ordergrandtotal));
@@ -228,8 +228,8 @@ class Biztech_Mobileassistant_DashboardController extends Mage_Core_Controller_F
228
  'name' => $_collection->getName(),
229
  'email' => $_collection->getEmail(),
230
  'orders_count' => $_collection->getOrdersCount(),
231
- 'average_order_amount' => Mage::app()->getLocale()->currency($baseCurrencyCode)->toCurrency(Mage::helper('mobileassistant')->getPriceFormat($_collection->getOrdersAvgAmount())),
232
- 'total_order_amount' => Mage::app()->getLocale()->currency($baseCurrencyCode)->toCurrency(Mage::helper('mobileassistant')->getPriceFormat($_collection->getOrdersSumAmount()))
233
  );
234
  }
235
 
@@ -603,7 +603,7 @@ class Biztech_Mobileassistant_DashboardController extends Mage_Core_Controller_F
603
  /* order detail */
604
  $orderDetails = $this->getorderetails($storeId, $type_id, $tab, $source, $limit);
605
  $orderTotalByDate = $orderDetails['ordertotalbydate'];
606
- $orderGrandTotal = strip_tags(Mage::app()->getLocale()->currency($baseCurrencyCode)->toCurrency(array_sum($orderTotalByDate)));
607
 
608
 
609
  $widgetResultArr['widget_order'] = array('ordergrandtotal' => $orderGrandTotal, 'totalordercount' => $orderDetails['ordertotalcount'], 'ordercollection' => $orderDetails['ordercollection']);
148
 
149
  $baseCurrencyCode = Mage::app()->getStore()->getBaseCurrencyCode();
150
 
151
+ $orderGrandTotal = strip_tags(round(array_sum($orderTotalByDate), 2));
152
+ $lifeTimeSales = strip_tags(round(Mage::getResourceModel('reports/order_collection')->addFieldToFilter('store_id', $storeId)->calculateSales()->load()->getFirstItem()->getLifetime(), 2));
153
+ $averageOrder = strip_tags(round(Mage::getResourceModel('reports/order_collection')->addFieldToFilter('store_id', $storeId)->calculateSales()->load()->getFirstItem()->getAverage(), 2));
154
 
155
  if ($type_id == 7) {
156
  $avg_order_count = $total_count / 7;
173
  }
174
 
175
  $avg_order_count = number_format($avg_order_count, 2, '.', ',');
176
+ $avg_ordergrandtotal = strip_tags(round($avg_ordergrandtotal, 2));
177
 
178
 
179
  $orderTotalResultArr = array('dashboard_result' => array('ordertotalbydate' => $orderTotalByDate, 'ordergrandtotal' => $orderGrandTotal, 'totalordercount' => $total_count, 'lifetimesales' => $lifeTimeSales, 'averageorder' => $averageOrder, 'avg_order_count' => $avg_order_count, 'avg_order_grandtotal' => $avg_ordergrandtotal));
228
  'name' => $_collection->getName(),
229
  'email' => $_collection->getEmail(),
230
  'orders_count' => $_collection->getOrdersCount(),
231
+ 'average_order_amount' => Mage::helper('mobileassistant')->getPriceFormat($_collection->getOrdersAvgAmount()),
232
+ 'total_order_amount' => Mage::helper('mobileassistant')->getPriceFormat($_collection->getOrdersSumAmount())
233
  );
234
  }
235
 
603
  /* order detail */
604
  $orderDetails = $this->getorderetails($storeId, $type_id, $tab, $source, $limit);
605
  $orderTotalByDate = $orderDetails['ordertotalbydate'];
606
+ $orderGrandTotal = strip_tags(array_sum($orderTotalByDate));
607
 
608
 
609
  $widgetResultArr['widget_order'] = array('ordergrandtotal' => $orderGrandTotal, 'totalordercount' => $orderDetails['ordertotalcount'], 'ordercollection' => $orderDetails['ordercollection']);
app/code/local/Biztech/Mobileassistant/controllers/ProductController.php CHANGED
@@ -124,21 +124,21 @@ class Biztech_Mobileassistant_ProductController extends Mage_Core_Controller_Fro
124
  $productSku = $post_data['sku'];
125
  }
126
  if (isset($productSku) && $productSku != null) {
127
- $product = Mage::getModel('catalog/product')->loadByAttribute('sku', $productSku);
128
  if ($product) {
129
- $product_data = Mage::getModel('catalog/product')->load($product->getId());
130
  } else {
131
  $result = Mage::helper('core')->jsonEncode(array('mesage' => 'No product found.'));
132
  return Mage::app()->getResponse()->setBody($result);
133
  }
134
  } else {
135
- $product_data = Mage::getModel('catalog/product')->load($productId);
136
  }
137
 
138
 
139
  $pro_status = $product_data->getStatus();
140
  $pro_qty = Mage::getModel('cataloginventory/stock_item')->loadByProduct($product_data)->getQty();
141
-
142
  $_images = $product_data->getMediaGalleryImages();
143
  if ($_images) {
144
  foreach ($_images as $_image) {
@@ -166,7 +166,7 @@ class Biztech_Mobileassistant_ProductController extends Mage_Core_Controller_Fro
166
  } else {
167
  $status = 'Disabled';
168
  }
169
-
170
  $associated_products_details[] = array(
171
  'id' => $associated_product->getId(),
172
  'sku' => $associated_product->getSku()
@@ -191,7 +191,7 @@ class Biztech_Mobileassistant_ProductController extends Mage_Core_Controller_Fro
191
  'qty' => $pro_qty,
192
  'is_in_stock' => $product_data->getIsInStock(),
193
  'price' => Mage::helper('mobileassistant')->getPrice($product_data->getPrice(), $storeId, Mage::app()->getStore()->getCurrentCurrencyCode()),
194
- 'desc' => $product_data->getShortDescription(),
195
  'type' => $product_data->getTypeId(),
196
  'special_price' => Mage::helper('mobileassistant')->getPrice($product_data->getSpecialPrice(), $storeId, Mage::app()->getStore()->getCurrentCurrencyCode()),
197
  'image' => ($product_data->getImage()) ? Mage::helper('catalog/image')->init($product_data, 'image', $product_data->getImage())->resize(300, 330)->keepAspectRatio(true)->constrainOnly(true)->__toString() : 'N/A',
124
  $productSku = $post_data['sku'];
125
  }
126
  if (isset($productSku) && $productSku != null) {
127
+ $product = Mage::getModel('catalog/product')->setStoreId($storeId)->loadByAttribute('sku', $productSku);
128
  if ($product) {
129
+ $product_data = Mage::getModel('catalog/product')->setStoreId($storeId)->load($product->getId());
130
  } else {
131
  $result = Mage::helper('core')->jsonEncode(array('mesage' => 'No product found.'));
132
  return Mage::app()->getResponse()->setBody($result);
133
  }
134
  } else {
135
+ $product_data = Mage::getModel('catalog/product')->setStoreId($storeId)->load($productId);
136
  }
137
 
138
 
139
  $pro_status = $product_data->getStatus();
140
  $pro_qty = Mage::getModel('cataloginventory/stock_item')->loadByProduct($product_data)->getQty();
141
+
142
  $_images = $product_data->getMediaGalleryImages();
143
  if ($_images) {
144
  foreach ($_images as $_image) {
166
  } else {
167
  $status = 'Disabled';
168
  }
169
+
170
  $associated_products_details[] = array(
171
  'id' => $associated_product->getId(),
172
  'sku' => $associated_product->getSku()
191
  'qty' => $pro_qty,
192
  'is_in_stock' => $product_data->getIsInStock(),
193
  'price' => Mage::helper('mobileassistant')->getPrice($product_data->getPrice(), $storeId, Mage::app()->getStore()->getCurrentCurrencyCode()),
194
+ 'desc' => $product_data->getDescription(),
195
  'type' => $product_data->getTypeId(),
196
  'special_price' => Mage::helper('mobileassistant')->getPrice($product_data->getSpecialPrice(), $storeId, Mage::app()->getStore()->getCurrentCurrencyCode()),
197
  'image' => ($product_data->getImage()) ? Mage::helper('catalog/image')->init($product_data, 'image', $product_data->getImage())->resize(300, 330)->keepAspectRatio(true)->constrainOnly(true)->__toString() : 'N/A',
app/code/local/Biztech/Mobileassistant/etc/config.xml CHANGED
@@ -10,7 +10,7 @@
10
  <config>
11
  <modules>
12
  <Biztech_Mobileassistant>
13
- <version>0.2.8</version>
14
  </Biztech_Mobileassistant>
15
  </modules>
16
  <frontend>
10
  <config>
11
  <modules>
12
  <Biztech_Mobileassistant>
13
+ <version>0.2.9</version>
14
  </Biztech_Mobileassistant>
15
  </modules>
16
  <frontend>
app/design/adminhtml/default/default/template/mobileassistant/system/config/barcode_21-7-2016.phtml DELETED
@@ -1,6 +0,0 @@
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.8</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>- Minor Bug Fixing</notes>
29
  <authors><author><name>Biztech</name><user>biztechcon</user><email>sales@biztechconsultancy.com</email></author></authors>
30
- <date>2016-08-06</date>
31
- <time>07:57:24</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="ad82c0c1e7438e13bd7d0cd2d2451e2a"/></dir><dir name="etc"><file name="config.xml" hash="d12ebc10e7781ff82323e54ff7713dae"/></dir></dir><dir name="Mobileassistant"><dir name="Block"><dir name="Adminhtml"><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="c83469e981e6aa9fe1bcc4ad7a60239c"/></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="b622f324dc7ff26737b7a699befd0f28"/><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="6b70b8980f563190ac1d99416f0cad2d"/><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="3c770889914f69843bf62df41b3ff5eb"/><file name="system.xml" hash="23a051a72f852f546e20f22170d280f9"/></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.9</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>- Minor Bug Fixing</notes>
29
  <authors><author><name>Biztech</name><user>biztechcon</user><email>sales@biztechconsultancy.com</email></author></authors>
30
+ <date>2016-08-11</date>
31
+ <time>05:36:01</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="2da7440fd78fcef07b56e317c8f73af9"/></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"/></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="ad82c0c1e7438e13bd7d0cd2d2451e2a"/></dir><dir name="etc"><file name="config.xml" hash="d12ebc10e7781ff82323e54ff7713dae"/></dir></dir><dir name="Mobileassistant"><dir name="Block"><dir name="Adminhtml"><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="23bbb44f39b2fcf0eec493d06c2bd786"/></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="e534c166867436b3ab6c5d3a9c0e5d45"/></dir></dir></dir><dir name="controllers"><file name="CustomerController.php" hash="010299fe9f731202cb6a23f8c96a51c9"/><file name="DashboardController.php" hash="43a50a36554da6e754a8520fbe7041dc"/><file name="IndexController.php" hash="6b70b8980f563190ac1d99416f0cad2d"/><file name="OrderController.php" hash="14e4ef67dc8b5cd4aa0e4a4e4235a966"/><file name="ProductController.php" hash="61d42a96cde73e517db06859fe9b01a7"/></dir><dir name="etc"><file name="api.xml" hash="7860c9fe0f121148eb2a3a498d1879b1"/><file name="config.xml" hash="a4d37aa5aa8ea7e954f69d6f31cb42a1"/><file name="system.xml" hash="23a051a72f852f546e20f22170d280f9"/></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>