addwish - Version 0.20.1

Version Notes

New multisite module

Download this release

Release Info

Developer addwish
Extension addwish
Version 0.20.1
Comparing to
See all releases


Code changes from version 0.20.0 to 0.20.1

app/code/local/Addwish/Awext/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Addwish_Awext>
5
- <version>0.20.0</version>
6
  </Addwish_Awext>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <Addwish_Awext>
5
+ <version>0.20.1</version>
6
  </Addwish_Awext>
7
  </modules>
8
  <frontend>
app/design/frontend/base/default/layout/awext.xml CHANGED
@@ -13,6 +13,7 @@
13
  <reference name="before_body_end">
14
  <block type="core/template" name="addwish-tracking" template="addwish/integrator.phtml" />
15
  <block type="core/template" name="addwish-conversion" template="addwish/conversion-span.phtml"/>
 
16
  </reference>
17
  </default>
18
  <catalog_product_view>
@@ -20,11 +21,6 @@
20
  <block type="core/template" name="addwish-cart" template="addwish/product-span.phtml" after="-" />
21
  </reference>
22
  </catalog_product_view>
23
- <checkout_cart_index>
24
- <reference name="before_body_end">
25
- <block type="core/template" name="addwish-basket" template="addwish/basket-span.phtml" after="-" />
26
- </reference>
27
- </checkout_cart_index>
28
  <awext_index_search>
29
  <reference name="content">
30
  <block type="core/template" name="addwish-search-page" template="addwish/search-result-page.phtml" />
13
  <reference name="before_body_end">
14
  <block type="core/template" name="addwish-tracking" template="addwish/integrator.phtml" />
15
  <block type="core/template" name="addwish-conversion" template="addwish/conversion-span.phtml"/>
16
+ <block type="core/template" name="addwish-basket" template="addwish/basket-span.phtml"/>
17
  </reference>
18
  </default>
19
  <catalog_product_view>
21
  <block type="core/template" name="addwish-cart" template="addwish/product-span.phtml" after="-" />
22
  </reference>
23
  </catalog_product_view>
 
 
 
 
 
24
  <awext_index_search>
25
  <reference name="content">
26
  <block type="core/template" name="addwish-search-page" template="addwish/search-result-page.phtml" />
app/design/frontend/base/default/template/addwish/basket-span.phtml CHANGED
@@ -1,28 +1,19 @@
1
- <?php
2
- $quote = Mage::getSingleton('checkout/session')->getQuote();
3
- ?><span class="addwish-basket" style="display:none"
4
- data-total="<?php echo number_format($quote->getData('subtotal'), 2, '.', '');?>"
5
- data-tax="<?php echo number_format($quote->getData('grand_total')-$quote->getData('subtotal'), 2, '.', '');?>"
6
- data-noshipping="">
7
- <?php
8
  $cartItems = Mage::getModel('checkout/cart')->getItems();
9
  if(count($cartItems)>0){
10
- foreach($cartItems->getData() as $cartProduct){
11
- $product=Mage::getModel('catalog/product')->load($cartProduct['product_id']);
12
- if($product->isVisibleInSiteVisibility()){
13
- ?>
14
  <span class="addwish-product"
15
- data-unit-price="<?php echo number_format(Mage::getModel('directory/currency')->formatTxt($cartProduct['price'], array('display' => Zend_Currency::NO_SYMBOL)), 2, '.', '');?>"
16
- data-url="<?php echo $product->getProductUrl();?>"
17
- data-id="<?php echo $product->getId();?>"
18
- data-productnumber="<?php echo $product->getSku();?>"
19
- data-quantity="<?php echo (int)$cartProduct['qty'];?>"
20
- data-unit-tax="<?php echo number_format($cartProduct['tax_amount'], 2, '.', '');?>">
21
- </span>
22
- <?php
23
- }
24
- }
25
  }
26
  ?>
27
-
28
  </span>
1
+ <?php $quote = Mage::getSingleton('checkout/session')->getQuote(); ?><span class="addwish-basket" style="display:none"
2
+ data-total="<?php echo number_format($quote->getData('grand_total'), 2, '.', '');?>">
3
+ <?php
 
 
 
 
4
  $cartItems = Mage::getModel('checkout/cart')->getItems();
5
  if(count($cartItems)>0){
6
+ foreach($cartItems->getData() as $cartProduct){
7
+ $product=Mage::getModel('catalog/product')->load($cartProduct['product_id']);
8
+ if($product->isVisibleInSiteVisibility()){ ?>
 
9
  <span class="addwish-product"
10
+ data-url="<?php echo $product->getProductUrl();?>"
11
+ data-id="<?php echo $product->getId();?>"
12
+ data-productnumber="<?php echo $product->getSku();?>"
13
+ data-quantity="<?php echo (int)$cartProduct['qty'];?>">
14
+ </span><?php
15
+ }
16
+ }
 
 
 
17
  }
18
  ?>
 
19
  </span>
app/design/frontend/base/default/template/addwish/conversion-span.phtml CHANGED
@@ -5,20 +5,17 @@ if($orderIds && count($orderIds)) {
5
  $order = Mage::getModel('sales/order')->load($orderId);
6
  if($order && $order->getId()):?>
7
  <span class="addwish-conversion" style="display:none;"
8
- data-tax="<?php echo number_format(Mage::helper('checkout')->getQuote()->getShippingAddress()->getData('tax_amount'), 2, '.', '');?>"
9
  data-ordernumber="<?php echo $order->getIncrementId();?>"
10
- data-total="<?php echo number_format($order->getSubtotal(), 2, '.', '');?>">
11
  <?php $cartItems= $order->getAllItems();
12
  foreach($cartItems as $cartProduct):
13
  $product=Mage::getModel('catalog/product')->load($cartProduct->getData('product_id'));
14
  if($product->isVisibleInSiteVisibility()):?>
15
  <span class="addwish-product"
16
- data-unit-price="<?php echo number_format(Mage::getModel('directory/currency')->formatTxt($cartProduct->getData('price'), array('display' => Zend_Currency::NO_SYMBOL)), 2, '.', '');?>"
17
  data-url="<?php echo $product->getProductUrl();?>"
18
  data-id="<?php echo $product->getId();?>"
19
  data-productnumber="<?php echo $product->getSku();?>"
20
- data-quantity="<?php echo (int)$cartProduct->getData('qty_ordered');?>"
21
- data-unit-tax="<?php echo number_format($cartProduct->getData('tax_amount'), 2, '.', '');?>">
22
  </span>
23
  <?php endif; ?>
24
  <?php endforeach; ?>
5
  $order = Mage::getModel('sales/order')->load($orderId);
6
  if($order && $order->getId()):?>
7
  <span class="addwish-conversion" style="display:none;"
 
8
  data-ordernumber="<?php echo $order->getIncrementId();?>"
9
+ data-total="<?php echo number_format($order->getGrandTotal(), 2, '.', '');?>">
10
  <?php $cartItems= $order->getAllItems();
11
  foreach($cartItems as $cartProduct):
12
  $product=Mage::getModel('catalog/product')->load($cartProduct->getData('product_id'));
13
  if($product->isVisibleInSiteVisibility()):?>
14
  <span class="addwish-product"
 
15
  data-url="<?php echo $product->getProductUrl();?>"
16
  data-id="<?php echo $product->getId();?>"
17
  data-productnumber="<?php echo $product->getSku();?>"
18
+ data-quantity="<?php echo (int)$cartProduct->getData('qty_ordered');?>">
 
19
  </span>
20
  <?php endif; ?>
21
  <?php endforeach; ?>
package.xml CHANGED
@@ -1,2 +1,2 @@
1
  <?xml version="1.0"?>
2
- <package><name>addwish</name><version>0.20.0</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-04-06</date><time>5:48:31</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="22a2e7698784513966dbe970827441f0"/></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="d9e749008e9d97afd7b75855857a18b3"/></dir><dir name="template"><dir name="addwish"><file name="addwish-head.phtml" hash="c5b6fa2cae55ad1ddd4a5c64f8d532f6"/><file name="basket-span.phtml" hash="e94f8c7f460ab66e3906fcc0e3fdf76b"/><file name="conversion-span.phtml" hash="0d9368e73977b4e9c1c0fb00d34cb01c"/><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.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>