Version Notes
fixed bug with parent items in salestracking
Download this release
Release Info
Developer | Magento Core Team |
Extension | Channelpilotsolutions_Channelpilot |
Version | 1.0.2 |
Comparing to | |
See all releases |
Code changes from version 1.0.1 to 1.0.2
app/design/frontend/base/default/template/Channelpilotsolutions/salestracking.phtml
CHANGED
@@ -72,20 +72,34 @@
|
|
72 |
}
|
73 |
// Retrieve ordered products
|
74 |
$query = "
|
75 |
-
SELECT
|
76 |
-
|
77 |
-
|
|
|
78 |
$query = str_replace('ChannelPilotSolutions_ChannelPilot_', $tablePrefix, $query);
|
79 |
$orderedProducts = $dbConnection->fetchAll($query);
|
80 |
|
|
|
81 |
// Loop through each product in order
|
82 |
foreach ($orderedProducts as $orderedProduct) {
|
83 |
-
$
|
84 |
-
|
85 |
-
|
|
|
86 |
?>
|
87 |
-
|
88 |
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
89 |
}
|
90 |
?>
|
91 |
</script>
|
72 |
}
|
73 |
// Retrieve ordered products
|
74 |
$query = "
|
75 |
+
SELECT item_id, sku, product_id, price, qty_ordered, parent_item_id AS parent,
|
76 |
+
IF(parent_item_id IS NOT NULL, (SELECT price FROM ChannelPilotSolutions_ChannelPilot_sales_flat_order_item WHERE item_id = parent), NULL) AS parent_price
|
77 |
+
FROM ChannelPilotSolutions_ChannelPilot_sales_flat_order_item
|
78 |
+
WHERE order_id = ".$ORDER['entity_id']." ORDER BY parent_item_id DESC";
|
79 |
$query = str_replace('ChannelPilotSolutions_ChannelPilot_', $tablePrefix, $query);
|
80 |
$orderedProducts = $dbConnection->fetchAll($query);
|
81 |
|
82 |
+
$parents = array();
|
83 |
// Loop through each product in order
|
84 |
foreach ($orderedProducts as $orderedProduct) {
|
85 |
+
IF(isset($orderedProduct['parent'])){
|
86 |
+
$productId = $orderedProduct[Mage::getStoreConfig('channelpilot_section/channelpilot_salestracking/channelpilot_articlenumber')];
|
87 |
+
$price = $orderedProduct['parent_price'];
|
88 |
+
$quantity = (int) $orderedProduct['qty_ordered'];
|
89 |
?>
|
90 |
+
cpSale.shoppingCart.push({id: "<?php echo $productId;?>", price: <?php echo $price;?>, amount: <?php echo $quantity;?>});
|
91 |
<?php
|
92 |
+
$parents[] = $orderedProduct['parent'];
|
93 |
+
} ELSE {
|
94 |
+
IF(!in_array($orderedProduct['item_id'],$parents)){
|
95 |
+
$productId = $orderedProduct[Mage::getStoreConfig('channelpilot_section/channelpilot_salestracking/channelpilot_articlenumber')];
|
96 |
+
$price = $orderedProduct['price'];
|
97 |
+
$quantity = (int) $orderedProduct['qty_ordered'];
|
98 |
+
?>
|
99 |
+
cpSale.shoppingCart.push({id: "<?php echo $productId;?>", price: <?php echo $price;?>, amount: <?php echo $quantity;?>});
|
100 |
+
<?php
|
101 |
+
}
|
102 |
+
}
|
103 |
}
|
104 |
?>
|
105 |
</script>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Channelpilotsolutions_Channelpilot</name>
|
4 |
-
<version>1.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/gpl-license.php">GPL</license>
|
7 |
<channel>community</channel>
|
@@ -21,11 +21,11 @@
|
|
21 |
<li><b>BEST QUALITY:</b> ChannelPilot is "made in Germany" and is exclusively developed in-house by experienced software-engineers.</li>
|
22 |
</ul>
|
23 |
Just get more information about ChannelPilot : <a href="http://www.channelpilot.com">www.channelpilot.com</a></description>
|
24 |
-
<notes>
|
25 |
<authors><author><name>ChannelPilot Solutions GmbH</name><user>auto-converted</user><email>info@channelpilot.com</email></author></authors>
|
26 |
-
<date>2013-
|
27 |
-
<time>
|
28 |
-
<contents><target name="magecommunity"><dir name="Channelpilotsolutions"><dir name="Channelpilot"><dir name="Adminhtml"><dir name="Model"><dir name="Articlenumber"><file name="Values.php" hash="4a920f99cf9443aaa2f8841d853cebec"/></dir><dir name="Cookiemode"><file name="Values.php" hash="ff8d69f41d7df21707d749305c20e935"/></dir></dir></dir><dir name="Block"><dir name="Adminhtml"><dir name="Field"><file name="Exportfields.php" hash="c3a73f607cc6fe8f249d8fef7d49cfeb"/><file name="Replacefields.php" hash="03403b9cbdad48fa8ca2b28d7440143c"/><file name="Specialfields.php" hash="33842132f2ff85227efcaff836dd4c1c"/><file name="Trackingkeys.php" hash="94c7d54b134a71f0080b3bbd52dac475"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="a50cceaf7f52911c35979cf4b5beec22"/><file name="ExportData.php" hash="8b5088f7ffa12b5c5eca38c286861460"/></dir><dir name="controllers"><file name="IndexController.php" hash="6c691bd30403c6340248e6f9b2cedea8"/></dir><dir name="etc"><file name="adminhtml.xml" hash="ee4e49b9b64d99fce70b618ac7349a9d"/><file name="config.xml" hash="c2217ae3c7f5575d8eeed0dac4d3c5d4"/><file name="system.xml" hash="d3ffb78c9469d44b61dc85be2480abc6"/></dir></dir><dir name="Clicktracking"><dir name="etc"><file name="config.xml" hash="1ee288f21630d1873a4f6ebe37c24f10"/></dir></dir><dir name="Salestracking"><dir name="etc"><file name="config.xml" hash="92b7c6e930b2d241d8b095635a10519e"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Channelpilotsolutions_Channelpilot.xml" hash="a64f082fbb324d006d05566a4eb63d3f"/><file name="Channelpilotsolutions_Clicktracking.xml" hash="0e9a283fcb2b0bbc40ed3f3ad960624d"/><file name="Channelpilotsolutions_Salestracking.xml" hash="226c8a5105db455556e450a6b49d8eb2"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="Channelpilotsolutions"><file name="clicktracking.xml" hash="8e97b079e03fd90750ee52b76e3eae08"/><file name="salestracking.xml" hash="2f356111cb7f06f2a7dd39157cfc3a6b"/></dir></dir><dir name="template"><dir name="Channelpilotsolutions"><file name="clicktracking.phtml" hash="54b5c464b923057e4cfd6ed1e27c6597"/><file name="salestracking.phtml" hash="
|
29 |
<compatible/>
|
30 |
<dependencies/>
|
31 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Channelpilotsolutions_Channelpilot</name>
|
4 |
+
<version>1.0.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/gpl-license.php">GPL</license>
|
7 |
<channel>community</channel>
|
21 |
<li><b>BEST QUALITY:</b> ChannelPilot is "made in Germany" and is exclusively developed in-house by experienced software-engineers.</li>
|
22 |
</ul>
|
23 |
Just get more information about ChannelPilot : <a href="http://www.channelpilot.com">www.channelpilot.com</a></description>
|
24 |
+
<notes>fixed bug with parent items in salestracking</notes>
|
25 |
<authors><author><name>ChannelPilot Solutions GmbH</name><user>auto-converted</user><email>info@channelpilot.com</email></author></authors>
|
26 |
+
<date>2013-09-23</date>
|
27 |
+
<time>14:01:18</time>
|
28 |
+
<contents><target name="magecommunity"><dir name="Channelpilotsolutions"><dir name="Channelpilot"><dir name="Adminhtml"><dir name="Model"><dir name="Articlenumber"><file name="Values.php" hash="4a920f99cf9443aaa2f8841d853cebec"/></dir><dir name="Cookiemode"><file name="Values.php" hash="ff8d69f41d7df21707d749305c20e935"/></dir></dir></dir><dir name="Block"><dir name="Adminhtml"><dir name="Field"><file name="Exportfields.php" hash="c3a73f607cc6fe8f249d8fef7d49cfeb"/><file name="Replacefields.php" hash="03403b9cbdad48fa8ca2b28d7440143c"/><file name="Specialfields.php" hash="33842132f2ff85227efcaff836dd4c1c"/><file name="Trackingkeys.php" hash="94c7d54b134a71f0080b3bbd52dac475"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="a50cceaf7f52911c35979cf4b5beec22"/><file name="ExportData.php" hash="8b5088f7ffa12b5c5eca38c286861460"/></dir><dir name="controllers"><file name="IndexController.php" hash="6c691bd30403c6340248e6f9b2cedea8"/></dir><dir name="etc"><file name="adminhtml.xml" hash="ee4e49b9b64d99fce70b618ac7349a9d"/><file name="config.xml" hash="c2217ae3c7f5575d8eeed0dac4d3c5d4"/><file name="system.xml" hash="d3ffb78c9469d44b61dc85be2480abc6"/></dir></dir><dir name="Clicktracking"><dir name="etc"><file name="config.xml" hash="1ee288f21630d1873a4f6ebe37c24f10"/></dir></dir><dir name="Salestracking"><dir name="etc"><file name="config.xml" hash="92b7c6e930b2d241d8b095635a10519e"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Channelpilotsolutions_Channelpilot.xml" hash="a64f082fbb324d006d05566a4eb63d3f"/><file name="Channelpilotsolutions_Clicktracking.xml" hash="0e9a283fcb2b0bbc40ed3f3ad960624d"/><file name="Channelpilotsolutions_Salestracking.xml" hash="226c8a5105db455556e450a6b49d8eb2"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="Channelpilotsolutions"><file name="clicktracking.xml" hash="8e97b079e03fd90750ee52b76e3eae08"/><file name="salestracking.xml" hash="2f356111cb7f06f2a7dd39157cfc3a6b"/></dir></dir><dir name="template"><dir name="Channelpilotsolutions"><file name="clicktracking.phtml" hash="54b5c464b923057e4cfd6ed1e27c6597"/><file name="salestracking.phtml" hash="f0fc32d24823f7dd0815f520c6bcf0d4"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="template"><dir name="Channelpilotsolutions"><file name="array_dropdown.phtml" hash="cb1230cd8a92ce0a0961f71b396736ec"/></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><dir name="Channelpilotsolutions"><file name="channelpilot.xml" hash="ee23fe0af5078ab653c5341116c21ddb"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="Channelpilotsolutions"><dir name="Channelpilot"><file name="icon.css" hash="ee075d8ba7c5c45dcb8c87ba1205eaa0"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Channelpilotsolutions_Channelpilot.csv" hash="9bae5f67a38ac2aba098dfc1ed7e4b21"/></dir><dir name="de_CH"><file name="Channelpilotsolutions_Channelpilot.csv" hash="1838fd9365f73bc40ada833d0948b2e4"/></dir><dir name="de_AT"><file name="Channelpilotsolutions_Channelpilot.csv" hash="1838fd9365f73bc40ada833d0948b2e4"/></dir></target></contents>
|
29 |
<compatible/>
|
30 |
<dependencies/>
|
31 |
</package>
|