Beecoder_Beeshopy - Version 2.8.0

Version Notes

Enabling cart discount rules on prices

Download this release

Release Info

Developer Magento Core Team
Extension Beecoder_Beeshopy
Version 2.8.0
Comparing to
See all releases


Code changes from version 2.7.7 to 2.8.0

Files changed (5) hide show
  1. app/code/community/Beecoder/Beeshopy/.changelog.txt.swp +0 -0
  2. app/code/community/Beecoder/Beeshopy/Model/.Api.php.swo +0 -0
  3. app/code/community/Beecoder/Beeshopy/Model/Api.php +7 -3
  4. app/code/community/Beecoder/Beeshopy/changelog.txt +3 -0
  5. package.xml +5 -5
app/code/community/Beecoder/Beeshopy/.changelog.txt.swp ADDED
Binary file
app/code/community/Beecoder/Beeshopy/Model/.Api.php.swo ADDED
Binary file
app/code/community/Beecoder/Beeshopy/Model/Api.php CHANGED
@@ -110,7 +110,7 @@ class Beecoder_Beeshopy_Model_Api extends Mage_Catalog_Model_Api_Resource
110
  /* Used to know if module is installed*/
111
  public function checkModule()
112
  {
113
- return array("api_version" => '2.7.7', "magento_version" => Mage::getVersion());
114
  }
115
 
116
  /*Auxiliar functions*/
@@ -159,6 +159,10 @@ class Beecoder_Beeshopy_Model_Api extends Mage_Catalog_Model_Api_Resource
159
  $options = $this->getCustomOptions($product);
160
  $links = $this->getDownloadableLinks($product);
161
 
 
 
 
 
162
  /* Prepare results */
163
  $result = array(
164
  'idx' => $product->getId(),
@@ -170,12 +174,12 @@ class Beecoder_Beeshopy_Model_Api extends Mage_Catalog_Model_Api_Resource
170
  'title' => $product->getName(),
171
  'in_stock' => $product->getStockItem()->getIsInStock(),
172
  'qty' => $product->getStockItem()->getQty(),
173
- 'price' => $product->getPrice(),
174
  'permalink' => $product->getUrlPath(),
175
  'url_in_store' => $product->getProductUrl(),
176
  'images' => $images,
177
  'visibility' => $product->getVisibility(),
178
- 'special_price' => $product->getSpecialPrice(),
179
  'special_from_date' => $product->getSpecialFromDate(),
180
  'special_to_date' => $product->getSpecialToDate(),
181
  'custom_options' => $options,
110
  /* Used to know if module is installed*/
111
  public function checkModule()
112
  {
113
+ return array("api_version" => '2.8.0', "magento_version" => Mage::getVersion());
114
  }
115
 
116
  /*Auxiliar functions*/
159
  $options = $this->getCustomOptions($product);
160
  $links = $this->getDownloadableLinks($product);
161
 
162
+ /* Regular price, or special price or cart rule discount */
163
+ $final_price = $product->getFinalPrice();
164
+ $regular_price = $product->getPrice();
165
+
166
  /* Prepare results */
167
  $result = array(
168
  'idx' => $product->getId(),
174
  'title' => $product->getName(),
175
  'in_stock' => $product->getStockItem()->getIsInStock(),
176
  'qty' => $product->getStockItem()->getQty(),
177
+ 'price' => $regular_price,
178
  'permalink' => $product->getUrlPath(),
179
  'url_in_store' => $product->getProductUrl(),
180
  'images' => $images,
181
  'visibility' => $product->getVisibility(),
182
+ 'special_price' => ($final_price != $regular_price ? $final_price : NULL),
183
  'special_from_date' => $product->getSpecialFromDate(),
184
  'special_to_date' => $product->getSpecialToDate(),
185
  'custom_options' => $options,
app/code/community/Beecoder/Beeshopy/changelog.txt CHANGED
@@ -1,4 +1,7 @@
1
  == Module changelog ==
 
 
 
2
 
3
  === 2.7.7 (07-05-12) ===
4
 
1
  == Module changelog ==
2
+ === 2.8.0 (08-16-12) ===
3
+
4
+ * Enabling cart discount rules on prices
5
 
6
  === 2.7.7 (07-05-12) ===
7
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Beecoder_Beeshopy</name>
4
- <version>2.7.7</version>
5
  <stability>stable</stability>
6
  <license>OSL v3.0</license>
7
  <channel>community</channel>
@@ -11,11 +11,11 @@ Beeshopy extension for Magento, it allows you to integrates your magento store w
11
  <description>Custom Module that allows you to connect with beeshopy service and integrates your magento store with Facebook. &#xD;
12
  &#xD;
13
  It contains a custom API and cart processing.</description>
14
- <notes>Fixed undefined index system.log entry</notes>
15
  <authors><author><name>Miguel &#xC1;ngel Mart&#xED;nez Trivi&#xF1;o</name><user>auto-converted</user><email>migmartri@gmail.com</email></author></authors>
16
- <date>2012-07-05</date>
17
- <time>09:30:49</time>
18
- <contents><target name="magecommunity"><dir name="Beecoder"><dir name="Beeshopy"><dir name="Block"><file name="Track.php" hash="a40d400b02f73d5b4dea35c348ffee00"/></dir><dir name="Helper"><file name="Data.php" hash="ead88c0b629856526d39e7fb6f3a4ca5"/></dir><dir name="Model"><file name="Api.php" hash="21f6534ad78bdd9be42030d8b898c615"/></dir><dir name="controllers"><file name="AdminController.php" hash="1b343fe1ef8ae5fafc5d355844e3f508"/><file name="IndexController.php" hash="bad3391bb742a55a2ee62895cb723e87"/></dir><dir name="etc"><file name="api.xml" hash="507ae656ea724a77def33efd8429d674"/><file name="config.xml" hash="2fcfaeccb838771505e12715c9618c3d"/></dir><file name="changelog.txt" hash="61bb2cb99729e2c7c1d3d3cdd343f621"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Beecoder_Beeshopy.xml" hash="55666ef45f08dab44b138e49532ca3b8"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="beeshopy.xml" hash="e4e7f6be0be0ff27b98d8011f3772f56"/></dir><dir name="template"><dir name="beeshopy"><file name="track.phtml" hash="47c95001bb55042c5ae7d8ee4b03cccf"/></dir></dir></dir></dir></dir></target></contents>
19
  <compatible/>
20
  <dependencies/>
21
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Beecoder_Beeshopy</name>
4
+ <version>2.8.0</version>
5
  <stability>stable</stability>
6
  <license>OSL v3.0</license>
7
  <channel>community</channel>
11
  <description>Custom Module that allows you to connect with beeshopy service and integrates your magento store with Facebook. &#xD;
12
  &#xD;
13
  It contains a custom API and cart processing.</description>
14
+ <notes>Enabling cart discount rules on prices</notes>
15
  <authors><author><name>Miguel &#xC1;ngel Mart&#xED;nez Trivi&#xF1;o</name><user>auto-converted</user><email>migmartri@gmail.com</email></author></authors>
16
+ <date>2012-08-16</date>
17
+ <time>17:13:51</time>
18
+ <contents><target name="magecommunity"><dir name="Beecoder"><dir name="Beeshopy"><dir name="Block"><file name="Track.php" hash="a40d400b02f73d5b4dea35c348ffee00"/></dir><dir name="Helper"><file name="Data.php" hash="ead88c0b629856526d39e7fb6f3a4ca5"/></dir><dir name="Model"><file name="Api.php" hash="46568d4ab40bdc3622a1d94f1efff2ea"/><file name=".Api.php.swo" hash="4a70269c8c9d87bb7fe2603c0ae50793"/></dir><dir name="controllers"><file name="AdminController.php" hash="1b343fe1ef8ae5fafc5d355844e3f508"/><file name="IndexController.php" hash="bad3391bb742a55a2ee62895cb723e87"/></dir><dir name="etc"><file name="api.xml" hash="507ae656ea724a77def33efd8429d674"/><file name="config.xml" hash="2fcfaeccb838771505e12715c9618c3d"/></dir><file name="changelog.txt" hash="6280ba9158658dd8802a1adc92a311a8"/><file name=".changelog.txt.swp" hash="0029e0aa492ca029d6836bbcddfde24f"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Beecoder_Beeshopy.xml" hash="55666ef45f08dab44b138e49532ca3b8"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="beeshopy.xml" hash="e4e7f6be0be0ff27b98d8011f3772f56"/></dir><dir name="template"><dir name="beeshopy"><file name="track.phtml" hash="47c95001bb55042c5ae7d8ee4b03cccf"/></dir></dir></dir></dir></dir></target></contents>
19
  <compatible/>
20
  <dependencies/>
21
  </package>