Version Notes
N/A
Download this release
Release Info
| Developer | Troop ID |
| Extension | TroopID_Connect |
| Version | 0.3.0 |
| Comparing to | |
| See all releases | |
Code changes from version 0.2.0 to 0.3.0
app/code/community/TroopID/Connect/Block/Adminhtml/System/Config/Instructions.php
CHANGED
|
@@ -9,8 +9,8 @@ class TroopID_Connect_Block_Adminhtml_System_Config_Instructions extends Mage_Ad
|
|
| 9 |
$html .= '<ul class="steps">';
|
| 10 |
$html .= '<li>' . $this->__("Create a developer account at") . ' <a href="' . $config["developer_url"] . '" target="_blank">' . $config["developer_url"] . '</a></li>';
|
| 11 |
$html .= '<li>' . $this->__("Register an application at") . ' <a href="' . $config["apps_url"] . '" target="_blank">' . $config["apps_url"] . '</a></li>';
|
| 12 |
-
$html .= '<li>' . $this->__("Fill in <strong>Redirect URI</strong> with") . ' ' . Mage::getUrl("troopid/authorize/callback") . '</li>';
|
| 13 |
-
$html .= '<li>' . $this->__("Fill in <strong>Base URI</strong> with") . ' ' .
|
| 14 |
$html .= '<li>' . $this->__("Copy and paste your <strong>Client ID</strong> and <strong>Client Secret</strong> values from your application settings on Troop ID") . '</li>';
|
| 15 |
$html .= '<li>' . $this->__("That's it! You are ready to go.") . '</li>';
|
| 16 |
$html .= '</ul>';
|
|
@@ -29,4 +29,20 @@ class TroopID_Connect_Block_Adminhtml_System_Config_Instructions extends Mage_Ad
|
|
| 29 |
return false;
|
| 30 |
}
|
| 31 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 32 |
}
|
| 9 |
$html .= '<ul class="steps">';
|
| 10 |
$html .= '<li>' . $this->__("Create a developer account at") . ' <a href="' . $config["developer_url"] . '" target="_blank">' . $config["developer_url"] . '</a></li>';
|
| 11 |
$html .= '<li>' . $this->__("Register an application at") . ' <a href="' . $config["apps_url"] . '" target="_blank">' . $config["apps_url"] . '</a></li>';
|
| 12 |
+
$html .= '<li>' . $this->__("Fill in <strong>Redirect URI</strong> with") . ' ' . Mage::getUrl("troopid/authorize/callback", array("_store" => $this->getStore()->getCode(), "_store_to_url" => false, "_nosid" => true)) . '</li>';
|
| 13 |
+
$html .= '<li>' . $this->__("Fill in <strong>Base URI</strong> with") . ' ' . $this->getStore()->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB) . '</li>';
|
| 14 |
$html .= '<li>' . $this->__("Copy and paste your <strong>Client ID</strong> and <strong>Client Secret</strong> values from your application settings on Troop ID") . '</li>';
|
| 15 |
$html .= '<li>' . $this->__("That's it! You are ready to go.") . '</li>';
|
| 16 |
$html .= '</ul>';
|
| 29 |
return false;
|
| 30 |
}
|
| 31 |
|
| 32 |
+
protected function getStore() {
|
| 33 |
+
$store = Mage::app()->getRequest()->getParam("store");
|
| 34 |
+
$site = Mage::app()->getRequest()->getParam("website");
|
| 35 |
+
$front = null;
|
| 36 |
+
|
| 37 |
+
if (isset($store)) {
|
| 38 |
+
$front = Mage::app()->getStore($store);
|
| 39 |
+
} else if(isset($site)) {
|
| 40 |
+
$front = Mage::app()->getWebsite($site)->getDefaultStore();
|
| 41 |
+
} else {
|
| 42 |
+
$front = Mage::app()->getStore();
|
| 43 |
+
}
|
| 44 |
+
|
| 45 |
+
return $front;
|
| 46 |
+
}
|
| 47 |
+
|
| 48 |
}
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>TroopID_Connect</name>
|
| 4 |
-
<version>0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -10,9 +10,9 @@
|
|
| 10 |
<description>N/A</description>
|
| 11 |
<notes>N/A</notes>
|
| 12 |
<authors><author><name>Troop ID</name><user>troopid</user><email>support@troopid.com</email></author></authors>
|
| 13 |
-
<date>2013-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magecommunity"><dir name="TroopID"><dir name="Connect"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><file name="Help.php" hash="dbb0fb61c7d5a7dbe61620d26afaea3c"/><file name="Instructions.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>TroopID_Connect</name>
|
| 4 |
+
<version>0.3.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 10 |
<description>N/A</description>
|
| 11 |
<notes>N/A</notes>
|
| 12 |
<authors><author><name>Troop ID</name><user>troopid</user><email>support@troopid.com</email></author></authors>
|
| 13 |
+
<date>2013-02-11</date>
|
| 14 |
+
<time>15:18:06</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="TroopID"><dir name="Connect"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><file name="Help.php" hash="dbb0fb61c7d5a7dbe61620d26afaea3c"/><file name="Instructions.php" hash="73d8da665a30d9cb7d14b739bb373e95"/></dir></dir></dir><file name="Cart.php" hash="2f4aee3250d9e396f4db3cbfe0bb8c3d"/></dir><dir name="Helper"><file name="Data.php" hash="784a3105a77f3651fc26e70ad1a849b6"/><file name="Oauth.php" hash="bf60a13267c383026c3f2074378949e6"/></dir><dir name="Model"><dir name="Rule"><file name="Condition.php" hash="d11bda0d429870d3c33deffa89ad281b"/><file name="Observer.php" hash="ba4faa579190480aa5e497c5632e5649"/></dir></dir><dir name="controllers"><file name="AuthorizeController.php" hash="8b16894d853ea569bf18dbd1f0b8c287"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e96ed1474688e377a910dbbc48317978"/><file name="config.xml" hash="49e0d9fc2ad551ad1d131f4984490918"/><file name="system.xml" hash="33a49f6320c0febe9ce136e82ac890c6"/></dir><dir name="sql"><dir name="troopid_connect_setup"><file name="mysql4-install-0.1.0.php" hash="2ed9e5f82407c756477d7fc2d3cd20ff"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="troopid_connect.xml" hash="40661e46e044c7b154114bf7feea3a2e"/></dir><dir name="template"><dir name="troopid"><dir name="connect"><file name="order.phtml" hash="47d0a58564e02b5326a700da28496238"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="troopid_connect.xml" hash="188214a896b052e295dabbf4281a106d"/></dir><dir name="template"><dir name="troopid"><dir name="connect"><file name="callback.phtml" hash="71b10af7408d6f50999529c08aa75dfb"/><file name="cart.phtml" hash="1e1accd15ca8aadabd699ebb1d4cfaf9"/><file name="script.phtml" hash="d8d34c032c5a68000125008c26b84f57"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="TroopID_Connect.xml" hash="c599f9e8aa2c1296fbfb08db03b0d001"/></dir></target><target name="magelocale"><dir name="en_US"><file name="TroopID_Connect.csv" hash="fd903faf1751e6b9712b055bcf93af43"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="troopid_connect"><dir name="images"><file name="logo.png" hash="b4652dab2eddd53440f36c353524beaa"/></dir><file name="troopid.css" hash="1a66f25f2b81ff569fc592de18f5ffb3"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="troopid_connect"><file name="troopid.css" hash="e5d27c03f451777841bcbe290cadb813"/></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 18 |
</package>
|
