Pepperjam_Network - Version 1.3.0.2

Version Notes

Changelog for 1.3.0.2
Changed uninstall button language and function to work with the normal uninstall method.

Download this release

Release Info

Developer Philip Preston
Extension Pepperjam_Network
Version 1.3.0.2
Comparing to
See all releases


Code changes from version 1.3.0.1 to 1.3.0.2

Files changed (5) hide show
  1. app/code/community/Pepperjam/Network/Block/Adminhtml/System/Config/Form/Button.php +1 -1
  2. app/code/community/Pepperjam/Network/controllers/Adminhtml/PepperjamNetworkController.php +1 -54
  3. app/code/community/Pepperjam/Network/etc/system.xml +1 -1
  4. app/design/adminhtml/default/default/template/pepperjam_network/system/config/button.phtml +1 -1
  5. package.xml +8 -8
app/code/community/Pepperjam/Network/Block/Adminhtml/System/Config/Form/Button.php CHANGED
@@ -38,7 +38,7 @@ class Pepperjam_Network_Block_Adminhtml_System_Config_Form_Button extends Mage_A
38
  $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData(
39
  array(
40
  'id' => 'pepperjam_network_uninstall',
41
- 'label' => $this->helper('adminhtml')->__('Uninstall'),
42
  'onclick' => 'javascript:uninstall(); return false;',
43
  ));
44
 
38
  $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData(
39
  array(
40
  'id' => 'pepperjam_network_uninstall',
41
+ 'label' => $this->helper('adminhtml')->__('Prepare for Uninstall'),
42
  'onclick' => 'javascript:uninstall(); return false;',
43
  ));
44
 
app/code/community/Pepperjam/Network/controllers/Adminhtml/PepperjamNetworkController.php CHANGED
@@ -45,60 +45,7 @@ class Pepperjam_Network_Adminhtml_PepperjamNetworkController extends Mage_Adminh
45
 
46
  $setup->endSetup();
47
 
48
- // Uninstall extension
49
- Mage_Connect_Command::registerCommands(); // Must run or next line will fail
50
- $installer = Mage_Connect_Command::getInstance('uninstall');
51
- $installer->setFrontendObject(Mage_Connect_Frontend::getInstance('CLI'));
52
- $installer->setSconfig($this->getSingleConfig());
53
-
54
- $installer->doUninstall('uninstall', array(), array(self::PACKAGE_CHANNEL, self::PACKAGE_NAME));
55
-
56
- // Clear cache
57
- Mage::app()->cleanCache();
58
-
59
  // Send message to admin
60
- Mage::getSingleton('core/session')->addSuccess('Package ' . self::PACKAGE_CHANNEL . '/' . self::PACKAGE_NAME . ' successfully deleted');
61
- }
62
-
63
- /**
64
- * Retrieve object of config and set it to Mage_Connect_Command
65
- *
66
- * @return Mage_Connect_Config
67
- */
68
- public function getConfig()
69
- {
70
- if (!$this->_config) {
71
- $this->_config = new Mage_Connect_Config();
72
- $ftp=$this->_config->__get('remote_config');
73
- if(!empty($ftp)){
74
- $packager = new Mage_Connect_Packager();
75
- list($cache, $config, $ftpObj) = $packager->getRemoteConf($ftp);
76
- $this->_config=$config;
77
- $this->_sconfig=$cache;
78
- }
79
- $this->_config->magento_root = Mage::getBaseDir('base');
80
- Mage_Connect_Command::setConfigObject($this->_config);
81
- }
82
- return $this->_config;
83
- }
84
-
85
- /**
86
- * Retrieve object of single config and set it to Mage_Connect_Command
87
- *
88
- * @param bool $reload
89
- * @return Mage_Connect_Singleconfig
90
- */
91
- public function getSingleConfig($reload = false)
92
- {
93
- if(!$this->_sconfig || $reload) {
94
- $this->_sconfig = new Mage_Connect_Singleconfig(
95
- $this->getConfig()->magento_root . DIRECTORY_SEPARATOR
96
- . $this->getConfig()->downloader_path . DIRECTORY_SEPARATOR
97
- . self::DEFAULT_SCONFIG_FILENAME
98
- );
99
- }
100
- Mage_Connect_Command::setSconfig($this->_sconfig);
101
- return $this->_sconfig;
102
-
103
  }
104
  }
45
 
46
  $setup->endSetup();
47
 
 
 
 
 
 
 
 
 
 
 
 
48
  // Send message to admin
49
+ Mage::getSingleton('core/session')->addSuccess('Package ' . self::PACKAGE_CHANNEL . '/' . self::PACKAGE_NAME . ' is ready to uninstall');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
50
  }
51
  }
app/code/community/Pepperjam/Network/etc/system.xml CHANGED
@@ -962,7 +962,7 @@ http://assets.pepperjam.com/legal/magento-connect-extension-eula.pdf
962
  </pepperjam_network_product_attribute_map>
963
  <uninstall translate="label comment">
964
  <label>Uninstall Extension</label>
965
- <comment>If you wish to uninstall this extension, please use this Uninstall button.</comment>
966
  <sort_order>300</sort_order>
967
  <show_in_default>1</show_in_default>
968
  <show_in_website>0</show_in_website>
962
  </pepperjam_network_product_attribute_map>
963
  <uninstall translate="label comment">
964
  <label>Uninstall Extension</label>
965
+ <comment>If you wish to uninstall this extension, please use this Uninstall button before uninstalling fully.</comment>
966
  <sort_order>300</sort_order>
967
  <show_in_default>1</show_in_default>
968
  <show_in_website>0</show_in_website>
app/design/adminhtml/default/default/template/pepperjam_network/system/config/button.phtml CHANGED
@@ -18,7 +18,7 @@
18
 
19
  <script type="text/javascript">
20
  function uninstall() {
21
- if (confirm('Remove Pepperjam Network extension?')) {
22
  new Ajax.Request('<?php echo $this->getAjaxUninstallUrl(); ?>', {
23
  method: 'get',
24
  onSuccess: function(response) {
18
 
19
  <script type="text/javascript">
20
  function uninstall() {
21
+ if (confirm('Prepare Pepperjam Network for uninstallation?')) {
22
  new Ajax.Request('<?php echo $this->getAjaxUninstallUrl(); ?>', {
23
  method: 'get',
24
  onSuccess: function(response) {
package.xml CHANGED
@@ -1,19 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Pepperjam_Network</name>
4
- <version>1.3.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://assets.pepperjam.com/legal/magento-connect-extension-eula.pdf">EULA</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Please use the uninstall button in the Pepperjam Network extension configuration settings. Using this uninstall method may cause issues after the extension is removed.</summary>
10
- <description>Please use the uninstall button in the Pepperjam Network extension configuration settings. Using this uninstall method may cause issues after the extension is removed.</description>
11
- <notes>Changelog for 1.3.0.1&#xD;
12
- Addressed cron scheduling bug for product feed</notes>
13
  <authors><author><name>Philip Preston</name><user>ppreston</user><email>ppreston@corp.pepperjam.com</email></author></authors>
14
- <date>2017-03-30</date>
15
- <time>18:29:08</time>
16
- <contents><target name="mageetc"><dir name="modules"><file name="Pepperjam_Network.xml" hash="d293e24c998ef81d8daf58b0f547a45c"/></dir></target><target name="magecommunity"><dir name="Pepperjam"><dir name="Network"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="590d3760d4f9de597624879e39134a44"/></dir></dir></dir></dir><file name="Beacon.php" hash="279d4ab5cfafa329ef257a19231642c3"/><file name="Tracking.php" hash="2c9bb4839704745e1a02a8b02f13d4b1"/></dir><dir name="Exception"><file name="Configuration.php" hash="78d9d2be394b4dfae56f0e7c5eb5acdf"/></dir><dir name="Helper"><file name="Config.php" hash="23c4d37b1b1cb2ba7882bfe4fd8d6bc1"/><file name="Data.php" hash="b139c69789651d0643e7be20dfcf6fcc"/><dir name="Map"><file name="Order.php" hash="79c9da2232abf8999d75e39665207f98"/><file name="Product.php" hash="224e5b4562e9b78654fc4551f09af6a6"/></dir><file name="Map.php" hash="ecd1c2d9fe2fbcca410f19a7e29d9900"/></dir><dir name="Model"><dir name="Feed"><file name="Abstract.php" hash="0fed99b49316e68f51efdad505ba6c9c"/><dir name="Order"><file name="Abstract.php" hash="681a55f620b609d5c90dad0daec87d24"/><file name="Basic.php" hash="bb4fcd1bb581c9c36c1c69545f58123b"/><file name="Dynamic.php" hash="1f9fb44a3746e4240a5f1e15ee3b2d35"/><file name="Itemized.php" hash="4bd9d352d94dbcc951b3f1aaf18f9267"/></dir><file name="Product.php" hash="d56c526f6b58b92d84c7452a5e0a52db"/></dir><file name="Observer.php" hash="21cc57e25cc6f9510580f6d8bb720f49"/><dir name="Product"><dir name="Attribute"><dir name="Source"><file name="CommissioningCategory.php" hash="bf0ced5bdc96becfb998e2f090f0ef56"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Attributes.php" hash="a7371a8d7eedabbfbc3899f44f7d4f40"/><file name="Categories.php" hash="5876e17c9c73a58a4d50672f626187c5"/><file name="Ordertypes.php" hash="d26a48ce19804ce26984539fc4852b43"/><file name="Stockquantity.php" hash="b5788bf323b0ecd3c87d40f2c5ac2d6e"/><file name="Stockyesno.php" hash="e32252148723d5afd2acd575dbad807f"/><file name="Trackingmethods.php" hash="b7364ea53b3362853764108c428871e7"/><file name="Transactiontype.php" hash="bd9ca045f793a25eb7be5690fd4f4704"/><file name="Visibilityyesno.php" hash="2c3c2e3801f2aa00f19fb18258ce9b29"/></dir></dir></dir></dir><dir name="Test"><dir name="Block"><file name="BeaconTest.php" hash="d89dcfcfa8c8b135442a96121b99b139"/><dir name="providers"><file name="testShowBeacon.yaml" hash="3a605cb51a86987f318ce4186d80e04f"/></dir></dir><dir name="Helper"><file name="DataTest.php" hash="62b321d69fdf49343e35d28fb7f14a5e"/><dir name="Map"><file name="ProductTest.php" hash="6cd1eb4410f061ce057a18c903a1ef01"/></dir><dir name="providers"><file name="testIsValidCookie.yaml" hash="1c94e7a661d72fc05724c40e509cf5ad"/></dir></dir><dir name="Model"><dir name="Feed"><file name="AbstractTest.php" hash="d43afcb5f4312cd1cacd6c4d5c8e980c"/><dir name="Order"><file name="AbstractTest.php" hash="19721d959c8fff2ecbb5c6fa093971ef"/><file name="BasicTest.php" hash="a493b77aceb70eede155c24301d06259"/><file name="ItemizedTest.php" hash="c5d108c538033c3dae8cc72b535b2cad"/></dir><file name="ProductTest.php" hash="2e7f3c395f4bc070005917c08d93c7b2"/></dir><file name="ObserverTest.php" hash="f4e6d2e60e47efcd1057d7d6808a720c"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="PepperjamNetworkController.php" hash="94c71abe6ea9f43b9ae7d3f0c8099e59"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="0da08cc1337e4f07a74408b2dd379c26"/><file name="config.xml" hash="51bcc821c329ccf63aa1bb3147121f32"/><file name="system.xml" hash="b0644ba6e6491cb7fc64ac8c70def46a"/></dir><dir name="sql"><dir name="pepperjam_network_setup"><file name="install-1.0.0.1.php" hash="c16d2390643fe92260773421af04196e"/><file name="mysql4-data-upgrade-1.2.1.0-1.2.2.0.php" hash="e32121b8893c6fe9ff598aa5e93f8bb3"/><file name="mysql4-data-upgrade-1.2.2.0-1.3.0.0.php" hash="0974aee7b5caf395a9f9cb8564b2e5af"/><file name="mysql4-install-1.0.0.1.php" hash="c16d2390643fe92260773421af04196e"/><file name="mysql4-upgrade-1.0.0.1-1.2.0.0.php" hash="2b0692625b2c15b58cf63b8cf8d51856"/><file name="mysql4-upgrade-1.2.99.99-1.3.0.0.php" hash="8d288efe53bede9195c7f881d541a49d"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="pepperjam_network"><dir name="system"><dir name="config"><file name="button.phtml" hash="9ba57be66b39e53a4b2063a70195a2a2"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pepperjam_network.xml" hash="31a7ee00e5d3ca1c616eae472f54ecb7"/></dir><dir name="template"><dir name="pepperjam_network"><file name="beacon.phtml" hash="1ca76e21e7419faa6067ca0cd6027cf0"/><file name="tracking.phtml" hash="fb479dac42ccc3b82212aed980466fd5"/></dir></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.3.0</min><max>5.6.99</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Pepperjam_Network</name>
4
+ <version>1.3.0.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://assets.pepperjam.com/legal/magento-connect-extension-eula.pdf">EULA</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>Please use the "Prepare for Uninstall" button in the Pepperjam Network extension configuration settings before uninstalling the extension. Failure to do so may cause issues after the extension is removed.</summary>
10
+ <description>Please use the "Prepare for Uninstall" button in the Pepperjam Network extension configuration settings before uninstalling the extension. Failure to do so may cause issues after the extension is removed.</description>
11
+ <notes>Changelog for 1.3.0.2&#xD;
12
+ Changed uninstall button language and function to work with the normal uninstall method.</notes>
13
  <authors><author><name>Philip Preston</name><user>ppreston</user><email>ppreston@corp.pepperjam.com</email></author></authors>
14
+ <date>2017-04-13</date>
15
+ <time>18:27:33</time>
16
+ <contents><target name="mageetc"><dir name="modules"><file name="Pepperjam_Network.xml" hash="d293e24c998ef81d8daf58b0f547a45c"/></dir></target><target name="magecommunity"><dir name="Pepperjam"><dir name="Network"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="2b615bb13fac1b640763384668f56dfa"/></dir></dir></dir></dir><file name="Beacon.php" hash="279d4ab5cfafa329ef257a19231642c3"/><file name="Tracking.php" hash="2c9bb4839704745e1a02a8b02f13d4b1"/></dir><dir name="Exception"><file name="Configuration.php" hash="78d9d2be394b4dfae56f0e7c5eb5acdf"/></dir><dir name="Helper"><file name="Config.php" hash="23c4d37b1b1cb2ba7882bfe4fd8d6bc1"/><file name="Data.php" hash="b139c69789651d0643e7be20dfcf6fcc"/><dir name="Map"><file name="Order.php" hash="79c9da2232abf8999d75e39665207f98"/><file name="Product.php" hash="224e5b4562e9b78654fc4551f09af6a6"/></dir><file name="Map.php" hash="ecd1c2d9fe2fbcca410f19a7e29d9900"/></dir><dir name="Model"><dir name="Feed"><file name="Abstract.php" hash="0fed99b49316e68f51efdad505ba6c9c"/><dir name="Order"><file name="Abstract.php" hash="681a55f620b609d5c90dad0daec87d24"/><file name="Basic.php" hash="bb4fcd1bb581c9c36c1c69545f58123b"/><file name="Dynamic.php" hash="1f9fb44a3746e4240a5f1e15ee3b2d35"/><file name="Itemized.php" hash="4bd9d352d94dbcc951b3f1aaf18f9267"/></dir><file name="Product.php" hash="d56c526f6b58b92d84c7452a5e0a52db"/></dir><file name="Observer.php" hash="21cc57e25cc6f9510580f6d8bb720f49"/><dir name="Product"><dir name="Attribute"><dir name="Source"><file name="CommissioningCategory.php" hash="bf0ced5bdc96becfb998e2f090f0ef56"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Attributes.php" hash="a7371a8d7eedabbfbc3899f44f7d4f40"/><file name="Categories.php" hash="5876e17c9c73a58a4d50672f626187c5"/><file name="Ordertypes.php" hash="d26a48ce19804ce26984539fc4852b43"/><file name="Stockquantity.php" hash="b5788bf323b0ecd3c87d40f2c5ac2d6e"/><file name="Stockyesno.php" hash="e32252148723d5afd2acd575dbad807f"/><file name="Trackingmethods.php" hash="b7364ea53b3362853764108c428871e7"/><file name="Transactiontype.php" hash="bd9ca045f793a25eb7be5690fd4f4704"/><file name="Visibilityyesno.php" hash="2c3c2e3801f2aa00f19fb18258ce9b29"/></dir></dir></dir></dir><dir name="Test"><dir name="Block"><file name="BeaconTest.php" hash="d89dcfcfa8c8b135442a96121b99b139"/><dir name="providers"><file name="testShowBeacon.yaml" hash="3a605cb51a86987f318ce4186d80e04f"/></dir></dir><dir name="Helper"><file name="DataTest.php" hash="62b321d69fdf49343e35d28fb7f14a5e"/><dir name="Map"><file name="ProductTest.php" hash="6cd1eb4410f061ce057a18c903a1ef01"/></dir><dir name="providers"><file name="testIsValidCookie.yaml" hash="1c94e7a661d72fc05724c40e509cf5ad"/></dir></dir><dir name="Model"><dir name="Feed"><file name="AbstractTest.php" hash="d43afcb5f4312cd1cacd6c4d5c8e980c"/><dir name="Order"><file name="AbstractTest.php" hash="19721d959c8fff2ecbb5c6fa093971ef"/><file name="BasicTest.php" hash="a493b77aceb70eede155c24301d06259"/><file name="ItemizedTest.php" hash="c5d108c538033c3dae8cc72b535b2cad"/></dir><file name="ProductTest.php" hash="2e7f3c395f4bc070005917c08d93c7b2"/></dir><file name="ObserverTest.php" hash="f4e6d2e60e47efcd1057d7d6808a720c"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="PepperjamNetworkController.php" hash="140b5e36d9a2886d763f42317134b858"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="0da08cc1337e4f07a74408b2dd379c26"/><file name="config.xml" hash="51bcc821c329ccf63aa1bb3147121f32"/><file name="system.xml" hash="87b8d7bc1fd1a8e8a087980b07a2ab2d"/></dir><dir name="sql"><dir name="pepperjam_network_setup"><file name="install-1.0.0.1.php" hash="c16d2390643fe92260773421af04196e"/><file name="mysql4-data-upgrade-1.2.1.0-1.2.2.0.php" hash="e32121b8893c6fe9ff598aa5e93f8bb3"/><file name="mysql4-data-upgrade-1.2.2.0-1.3.0.0.php" hash="0974aee7b5caf395a9f9cb8564b2e5af"/><file name="mysql4-install-1.0.0.1.php" hash="c16d2390643fe92260773421af04196e"/><file name="mysql4-upgrade-1.0.0.1-1.2.0.0.php" hash="2b0692625b2c15b58cf63b8cf8d51856"/><file name="mysql4-upgrade-1.2.99.99-1.3.0.0.php" hash="8d288efe53bede9195c7f881d541a49d"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="pepperjam_network"><dir name="system"><dir name="config"><file name="button.phtml" hash="5b1ec8371b238028dac034a71f33e1fc"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pepperjam_network.xml" hash="31a7ee00e5d3ca1c616eae472f54ecb7"/></dir><dir name="template"><dir name="pepperjam_network"><file name="beacon.phtml" hash="1ca76e21e7419faa6067ca0cd6027cf0"/><file name="tracking.phtml" hash="fb479dac42ccc3b82212aed980466fd5"/></dir></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.3.0</min><max>5.6.99</max></php></required></dependencies>
19
  </package>