addwish - Version 0.20.2

Version Notes

New multisite module

Download this release

Release Info

Developer addwish
Extension addwish
Version 0.20.2
Comparing to
See all releases


Code changes from version 0.20.1 to 0.20.2

Files changed (3) hide show
  1. app/code/local/Addwish/Awext/Helper/Data.php +13 -11
  2. app/code/local/Addwish/Awext/etc/config.xml +1 -1
  3. package.xml +1 -1
app/code/local/Addwish/Awext/Helper/Data.php CHANGED
@@ -123,8 +123,8 @@ class Addwish_Awext_Helper_Data extends Mage_Core_Helper_Abstract
123
  private static $_categoryData = null;
124
  private function getCategoryData() {
125
 
126
- if($this->_categoryData != null) {
127
- return $this->_categoryData;
128
  }
129
  $root = Mage::app()->getStore()->getRootCategoryId();
130
 
@@ -160,18 +160,25 @@ class Addwish_Awext_Helper_Data extends Mage_Core_Helper_Abstract
160
  }
161
  }
162
 
163
- $this->_categoryData = array(
164
  'parentCategories' => $parentList,
165
  'parentForCategory' => $parentForCategory,
166
  'categoryName' => $categoryName
167
  );
168
- return $this->_categoryData;
169
  }
170
 
171
  public function getProductStockInfo($product) {
172
-
173
- if($product->isConfigurable()) {
 
 
 
 
 
174
  $allProducts = $product->getTypeInstance(true)->getUsedProducts(null, $product);
 
 
175
  $inStock = false;
176
  foreach ($allProducts as $p) {
177
  $stock = Mage::getModel('cataloginventory/stock_item')->loadByProduct($p);
@@ -182,11 +189,6 @@ class Addwish_Awext_Helper_Data extends Mage_Core_Helper_Abstract
182
  }
183
  return array('inStock' => $inStock, 'qty' => $stock ? $stock->getQty() : 0);
184
  } else {
185
- $inStock = false;
186
- $stock = Mage::getModel('cataloginventory/stock_item')->loadByProduct($product);
187
- if ($product->isSaleable() && $stock->getIsInStock() != 0) {
188
- $inStock = true;
189
- }
190
  return array('inStock' => $inStock, 'qty' => $stock->getQty());
191
  }
192
  }
123
  private static $_categoryData = null;
124
  private function getCategoryData() {
125
 
126
+ if(self::$_categoryData != null) {
127
+ return self::$_categoryData;
128
  }
129
  $root = Mage::app()->getStore()->getRootCategoryId();
130
 
160
  }
161
  }
162
 
163
+ self::$_categoryData = array(
164
  'parentCategories' => $parentList,
165
  'parentForCategory' => $parentForCategory,
166
  'categoryName' => $categoryName
167
  );
168
+ return self::$_categoryData;
169
  }
170
 
171
  public function getProductStockInfo($product) {
172
+
173
+ $inStock = false;
174
+ $stock = Mage::getModel('cataloginventory/stock_item')->loadByProduct($product);
175
+ if ($product->isSaleable() && $stock->getIsInStock() != 0) {
176
+ $inStock = true;
177
+ }
178
+ if($inStock && $product->isConfigurable()) {
179
  $allProducts = $product->getTypeInstance(true)->getUsedProducts(null, $product);
180
+ $ids = Mage::getResourceSingleton('catalog/product_type_configurable')->getChildrenIds($product->getId());
181
+ $allProducts = Mage::getModel('catalog/product')->getCollection()->addIdFilter($ids);
182
  $inStock = false;
183
  foreach ($allProducts as $p) {
184
  $stock = Mage::getModel('cataloginventory/stock_item')->loadByProduct($p);
189
  }
190
  return array('inStock' => $inStock, 'qty' => $stock ? $stock->getQty() : 0);
191
  } else {
 
 
 
 
 
192
  return array('inStock' => $inStock, 'qty' => $stock->getQty());
193
  }
194
  }
app/code/local/Addwish/Awext/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Addwish_Awext>
5
- <version>0.20.1</version>
6
  </Addwish_Awext>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <Addwish_Awext>
5
+ <version>0.20.2</version>
6
  </Addwish_Awext>
7
  </modules>
8
  <frontend>
package.xml CHANGED
@@ -1,2 +1,2 @@
1
  <?xml version="1.0"?>
2
- <package><name>addwish</name><version>0.20.1</version><stability>stable</stability><license>GNU General Public License (GPL)</license><channel>community</channel><extends></extends><summary>New multisite module</summary><description>New multisite module</description><notes>New multisite module</notes><authors><author><name>addwish</name><user>addwish</user><email>krj@addwish.com</email></author></authors><date>2017-05-15</date><time>1:28:34</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>8.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="code"><dir name="local"><dir name="Addwish"><dir name="Awext"><dir name="Block"><dir name="Adminhtml"><dir name="Awext"><file name="View.php" hash="a5a5aa835bdbaf1102b50e90dec526a8"/><dir name="View"><file name="Tabs.php" hash="b68e152475528d168d92ca6e8ad6eafc"/><dir name="Tab"><file name="Details.php" hash="eff51a28eacafbe07577af60237ad9c4"/><file name="Recommend.php" hash="02d71705312a1de1da6445027bb0926d"/><file name="Search.php" hash="c94f0146c7529f0542100a871446c4f0"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="c777dfcbb9c8af630f0a9202b2463f47"/><dir name="Adminhtml"><file name="AwextController.php" hash="abf8b0b390b17add398d3af44e394d91"/></dir></dir><dir name="etc"><file name="config.xml" hash="3929badc527c1b08dd21f466584ae478"/></dir><dir name="Helper"><file name="Data.php" hash="5e87f59f899042deb77c00e67555cf5b"/></dir><dir name="Model"><file name="Awext.php" hash="1925cb6fd94cc7cd6baecda71964a424"/><file name="Observer.php" hash="510c80ff97a3d611f1f6bb9b54d486bb"/><dir name="Mysql4"><file name="Awext.php" hash="acd112233e367ebe80caf114f5dfe653"/><dir name="Awext"><file name="Collection.php" hash="12afe62372c67a5bd9154695c8d095f3"/></dir></dir></dir><dir name="sql"><dir name="addwish_setup"><file name="mysql4-install-0.0.4.php" hash="77a5d3d50380396c9bd2a9dfdfea8905"/></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="awext.xml" hash="b632bf4a38cfb992303f97cd7a449a15"/></dir><dir name="template"><dir name="awext"><file name="list.phtml" hash="5eedadcd2400f296b7ff3a77823cc4e4"/><file name="recommendations.phtml" hash="f8e63393c235903babd5a27a68b4a054"/><file name="search.phtml" hash="82d7130e256b0689d3b1682bf097fa55"/><file name="store-selector.phtml" hash="275b91522d136265f22de6550c7ca6dc"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="awext.xml" hash="b3b9b636bb472bae79628db04bb0dc84"/></dir><dir name="template"><dir name="addwish"><file name="addwish-head.phtml" hash="c5b6fa2cae55ad1ddd4a5c64f8d532f6"/><file name="basket-span.phtml" hash="3a99f0325a848b3c3e3e250269e4e84a"/><file name="conversion-span.phtml" hash="a2b47bc7cae4d983810f5d2efce04958"/><file name="integrator.phtml" hash="0a41e4e5c3f63f05dfce43040e52dd53"/><file name="product-span.phtml" hash="690c67739d6d4ad49c48a21939c1ab4f"/><file name="search-result-page.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="upsells-page.phtml" hash="ac41002da8c7bb57233599a00053ef77"/></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Addwish_Awext.xml" hash="fea2883f86536f249670eea31980f72c"/></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><file name="addwish.css" hash="df6e33a58cf2381ceaba72253a29796d"/></dir><dir name="images"><dir name="addwish"><file name="addwish.png" hash="a588d24d1919d9206eff40a886b88ef1"/></dir></dir></dir></dir></dir></dir></target></contents></package>
1
  <?xml version="1.0"?>
2
+ <package><name>addwish</name><version>0.20.2</version><stability>stable</stability><license>GNU General Public License (GPL)</license><channel>community</channel><extends></extends><summary>New multisite module</summary><description>New multisite module</description><notes>New multisite module</notes><authors><author><name>addwish</name><user>addwish</user><email>krj@addwish.com</email></author></authors><date>2017-06-22</date><time>1:48:06</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>8.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="code"><dir name="local"><dir name="Addwish"><dir name="Awext"><dir name="Block"><dir name="Adminhtml"><dir name="Awext"><file name="View.php" hash="a5a5aa835bdbaf1102b50e90dec526a8"/><dir name="View"><file name="Tabs.php" hash="b68e152475528d168d92ca6e8ad6eafc"/><dir name="Tab"><file name="Details.php" hash="eff51a28eacafbe07577af60237ad9c4"/><file name="Recommend.php" hash="02d71705312a1de1da6445027bb0926d"/><file name="Search.php" hash="c94f0146c7529f0542100a871446c4f0"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="c777dfcbb9c8af630f0a9202b2463f47"/><dir name="Adminhtml"><file name="AwextController.php" hash="abf8b0b390b17add398d3af44e394d91"/></dir></dir><dir name="etc"><file name="config.xml" hash="aaf521206e6d0bf179eef8418c555f81"/></dir><dir name="Helper"><file name="Data.php" hash="8cebb04f255d5b4edcd38f3c271a989c"/></dir><dir name="Model"><file name="Awext.php" hash="1925cb6fd94cc7cd6baecda71964a424"/><file name="Observer.php" hash="510c80ff97a3d611f1f6bb9b54d486bb"/><dir name="Mysql4"><file name="Awext.php" hash="acd112233e367ebe80caf114f5dfe653"/><dir name="Awext"><file name="Collection.php" hash="12afe62372c67a5bd9154695c8d095f3"/></dir></dir></dir><dir name="sql"><dir name="addwish_setup"><file name="mysql4-install-0.0.4.php" hash="77a5d3d50380396c9bd2a9dfdfea8905"/></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="awext.xml" hash="b632bf4a38cfb992303f97cd7a449a15"/></dir><dir name="template"><dir name="awext"><file name="list.phtml" hash="5eedadcd2400f296b7ff3a77823cc4e4"/><file name="recommendations.phtml" hash="f8e63393c235903babd5a27a68b4a054"/><file name="search.phtml" hash="82d7130e256b0689d3b1682bf097fa55"/><file name="store-selector.phtml" hash="275b91522d136265f22de6550c7ca6dc"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="awext.xml" hash="b3b9b636bb472bae79628db04bb0dc84"/></dir><dir name="template"><dir name="addwish"><file name="addwish-head.phtml" hash="c5b6fa2cae55ad1ddd4a5c64f8d532f6"/><file name="basket-span.phtml" hash="3a99f0325a848b3c3e3e250269e4e84a"/><file name="conversion-span.phtml" hash="a2b47bc7cae4d983810f5d2efce04958"/><file name="integrator.phtml" hash="0a41e4e5c3f63f05dfce43040e52dd53"/><file name="product-span.phtml" hash="690c67739d6d4ad49c48a21939c1ab4f"/><file name="search-result-page.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="upsells-page.phtml" hash="ac41002da8c7bb57233599a00053ef77"/></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Addwish_Awext.xml" hash="fea2883f86536f249670eea31980f72c"/></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><file name="addwish.css" hash="df6e33a58cf2381ceaba72253a29796d"/></dir><dir name="images"><dir name="addwish"><file name="addwish.png" hash="a588d24d1919d9206eff40a886b88ef1"/></dir></dir></dir></dir></dir></dir></target></contents></package>