editionguard_drm - Version 1.0.0.2

Version Notes

Added Order ID to download link Transaction ID for easier matching.

Download this release

Release Info

Developer EditionGuard
Extension editionguard_drm
Version 1.0.0.2
Comparing to
See all releases


Code changes from version 1.0.0.1 to 1.0.0.2

Files changed (5) hide show
  1. app/code/community/Editionguard/Editionguard/Block/Downloadable/Customer/Products/List.php +1 -0
  2. app/code/community/Editionguard/Editionguard/Helper/Data.php +3 -1
  3. app/code/community/Editionguard/Editionguard/etc/config.xml +1 -1
  4. app/code/community/Editionguard/Editionguard/etc/system.xml +8 -0
  5. package.xml +5 -5
app/code/community/Editionguard/Editionguard/Block/Downloadable/Customer/Products/List.php CHANGED
@@ -39,6 +39,7 @@ class Editionguard_Editionguard_Block_Downloadable_Customer_Products_List extend
39
  {
40
  if (Mage::helper('editionguard')->getUseEditionguard($item))
41
  {
 
42
  return Mage::helper('editionguard')->getDownloadUrl($item->getOrderItemId(), $item->getEditionguardResource());
43
  }
44
  else
39
  {
40
  if (Mage::helper('editionguard')->getUseEditionguard($item))
41
  {
42
+ Mage::log(print_r($item, true));
43
  return Mage::helper('editionguard')->getDownloadUrl($item->getOrderItemId(), $item->getEditionguardResource());
44
  }
45
  else
app/code/community/Editionguard/Editionguard/Helper/Data.php CHANGED
@@ -193,7 +193,9 @@ class Editionguard_Editionguard_Helper_Data extends Mage_Core_Helper_Data
193
  {
194
  $dateval=time();
195
  $sharedSecret = Mage::getStoreConfig(Editionguard_Editionguard_Helper_Data::XML_PATH_CONFIG_EDITIONGUARD_SECRET);
196
- $transactionId = $order_item_id;
 
 
197
  $resourceId = $resource;
198
  $linkURL = Editionguard_Editionguard_Helper_Data::API_LINK_URL;
199
  $orderSource = Mage::getStoreConfig(Editionguard_Editionguard_Helper_Data::XML_PATH_CONFIG_EDITIONGUARD_EMAIL);
193
  {
194
  $dateval=time();
195
  $sharedSecret = Mage::getStoreConfig(Editionguard_Editionguard_Helper_Data::XML_PATH_CONFIG_EDITIONGUARD_SECRET);
196
+ $order_item = Mage::getModel('sales/order_item')->load($order_item_id);
197
+ $order = Mage::getModel("sales/order")->load($order_item->order_id);
198
+ $transactionId = $order->getIncrementId()."-".$order_item_id;
199
  $resourceId = $resource;
200
  $linkURL = Editionguard_Editionguard_Helper_Data::API_LINK_URL;
201
  $orderSource = Mage::getStoreConfig(Editionguard_Editionguard_Helper_Data::XML_PATH_CONFIG_EDITIONGUARD_EMAIL);
app/code/community/Editionguard/Editionguard/etc/config.xml CHANGED
@@ -14,7 +14,7 @@
14
  <config>
15
  <modules>
16
  <Editionguard_Editionguard>
17
- <version>1.0.0.1</version>
18
  </Editionguard_Editionguard>
19
  </modules>
20
  <frontend>
14
  <config>
15
  <modules>
16
  <Editionguard_Editionguard>
17
+ <version>1.0.0.2</version>
18
  </Editionguard_Editionguard>
19
  </modules>
20
  <frontend>
app/code/community/Editionguard/Editionguard/etc/system.xml CHANGED
@@ -80,6 +80,14 @@
80
  <show_in_website>1</show_in_website>
81
  <show_in_store>0</show_in_store>
82
  </editionguard>
 
 
 
 
 
 
 
 
83
  </fields>
84
  </downloadable>
85
  </groups>
80
  <show_in_website>1</show_in_website>
81
  <show_in_store>0</show_in_store>
82
  </editionguard>
83
+ <expiry translate="label">
84
+ <label>Expiry (days)</label>
85
+ <frontend_type>text</frontend_type>
86
+ <sort_order>351</sort_order>
87
+ <show_in_default>1</show_in_default>
88
+ <show_in_website>1</show_in_website>
89
+ <show_in_store>0</show_in_store>
90
+ </expiry>
91
  </fields>
92
  </downloadable>
93
  </groups>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>editionguard_drm</name>
4
- <version>1.0.0.1</version>
5
  <stability>stable</stability>
6
  <license>New BSD</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This extension is used to integrate Magento with EditionGuard, a cost-effective Adobe DRM service for eBooks.</summary>
10
  <description>This extension will allow you to create eBooks protected with the industry standard Adobe Content Server 4 DRM through the EditionGuard APIs. Through the admin interface, you will be able to manage your DRM enabled eBooks and put them up for sale as Downloadable Products. Your clients will then be able to purchase your eBooks, download them securely on the frontend and open them in Adobe Digital Editions.</description>
11
- <notes>Initial release.</notes>
12
  <authors><author><name>EditionGuard</name><user>EditionGuard</user><email>support@editionguard.com</email></author></authors>
13
- <date>2012-12-19</date>
14
- <time>13:21:43</time>
15
- <contents><target name="magecommunity"><dir><dir name="Editionguard"><dir name="Editionguard"><dir name="Block"><dir name="Downloadable"><dir name="Adminhtml"><dir name="Catalog"><dir name="Product"><dir name="Edit"><dir name="Tab"><dir name="Downloadable"><file name="Links.php" hash="d5cc57710639854da0b3af6924195b8c"/></dir></dir></dir></dir></dir></dir><dir name="Customer"><dir name="Products"><file name="List.php" hash="5b46f7d767d2976b3a03d0aac3599c76"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="ae7497261a9e9e5490e4ab580dfa645b"/></dir><dir name="Model"><dir name="Downloadable"><file name="Link.php" hash="85bec88744d31a81853c8e76c3ff55c6"/></dir><file name="Exception.php" hash="18afd5abedb9a0413481ea5255a89a53"/><dir name="Mysql4"><dir name="Editionguard"><file name="Collection.php" hash="de7c2d9c3aa413612a6473dafdf2f779"/></dir><file name="Editionguard.php" hash="adaa5e0d1718f506e89c657420c4d31a"/></dir><dir name="Resource"><dir name="Downloadable"><file name="Link.php" hash="cfc4b1417f2fd0adf93daf15b24681e1"/></dir><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="ff76c3213b9b428220578ba48a667365"/></dir></dir></dir></dir><dir name="controllers"><file name="DownloadController.php" hash="22ef464060c9ffb33b9f031e9ece1752"/></dir><dir name="etc"><file name="config.xml" hash="77637b52e48cadd90d724667d08991b5"/><file name="system.xml" hash="68627dce272876b4b8e76511937d21b4"/></dir><dir name="sql"><dir name="editionguard_setup"><file name="install-1.0.0.0.php" hash="9e9ccd8e5fb5f5f63b32fa6ccea92ce6"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="editionguard"><dir name="downloadable"><dir name="product"><dir name="edit"><dir name="downloadable"><file name="links.phtml" hash="f2d9b8635fd3ea05e23f62ee5e916782"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Editionguard_Editionguard.xml" hash="1d6aac7609bf2b57392b64213f3722ca"/></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.17</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>editionguard_drm</name>
4
+ <version>1.0.0.2</version>
5
  <stability>stable</stability>
6
  <license>New BSD</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This extension is used to integrate Magento with EditionGuard, a cost-effective Adobe DRM service for eBooks.</summary>
10
  <description>This extension will allow you to create eBooks protected with the industry standard Adobe Content Server 4 DRM through the EditionGuard APIs. Through the admin interface, you will be able to manage your DRM enabled eBooks and put them up for sale as Downloadable Products. Your clients will then be able to purchase your eBooks, download them securely on the frontend and open them in Adobe Digital Editions.</description>
11
+ <notes>Added Order ID to download link Transaction ID for easier matching.</notes>
12
  <authors><author><name>EditionGuard</name><user>EditionGuard</user><email>support@editionguard.com</email></author></authors>
13
+ <date>2013-04-26</date>
14
+ <time>09:59:23</time>
15
+ <contents><target name="magecommunity"><dir><dir name="Editionguard"><dir name="Editionguard"><dir name="Block"><dir name="Downloadable"><dir name="Adminhtml"><dir name="Catalog"><dir name="Product"><dir name="Edit"><dir name="Tab"><dir name="Downloadable"><file name="Links.php" hash="d5cc57710639854da0b3af6924195b8c"/></dir></dir></dir></dir></dir></dir><dir name="Customer"><dir name="Products"><file name="List.php" hash="d6ed16a7183e3e97e3725d39d87c4c37"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="7a3bf0365879a58c36960311d21bea2d"/></dir><dir name="Model"><dir name="Downloadable"><file name="Link.php" hash="85bec88744d31a81853c8e76c3ff55c6"/></dir><file name="Exception.php" hash="18afd5abedb9a0413481ea5255a89a53"/><dir name="Mysql4"><dir name="Editionguard"><file name="Collection.php" hash="de7c2d9c3aa413612a6473dafdf2f779"/></dir><file name="Editionguard.php" hash="adaa5e0d1718f506e89c657420c4d31a"/></dir><dir name="Resource"><dir name="Downloadable"><file name="Link.php" hash="cfc4b1417f2fd0adf93daf15b24681e1"/></dir><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="ff76c3213b9b428220578ba48a667365"/></dir></dir></dir></dir><dir name="controllers"><file name="DownloadController.php" hash="22ef464060c9ffb33b9f031e9ece1752"/></dir><dir name="etc"><file name="config.xml" hash="6bdc3f22e4e95afb2c392b2ea1f54605"/><file name="system.xml" hash="e1a700fb181b7b11e318edd4612d93e3"/></dir><dir name="sql"><dir name="editionguard_setup"><file name="install-1.0.0.0.php" hash="9e9ccd8e5fb5f5f63b32fa6ccea92ce6"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="editionguard"><dir name="downloadable"><dir name="product"><dir name="edit"><dir name="downloadable"><file name="links.phtml" hash="f2d9b8635fd3ea05e23f62ee5e916782"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Editionguard_Editionguard.xml" hash="1d6aac7609bf2b57392b64213f3722ca"/></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.17</min><max>6.0.0</max></php></required></dependencies>
18
  </package>