Version Notes
Ths is Stable version
Download this release
Release Info
| Developer | Globalshopex |
| Extension | GSXInternationalCheckoutWithIframe |
| Version | 2.5.3 |
| Comparing to | |
| See all releases | |
Code changes from version 2.5.2 to 2.5.3
app/code/community/Gsx/Globalshopex/Helper/Data.php
CHANGED
|
@@ -6,4 +6,8 @@ class Gsx_Globalshopex_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 6 |
return Mage::getStoreConfig("checkout/globalshopex/gsx_enableclearcart");
|
| 7 |
}
|
| 8 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 9 |
}
|
| 6 |
return Mage::getStoreConfig("checkout/globalshopex/gsx_enableclearcart");
|
| 7 |
}
|
| 8 |
|
| 9 |
+
public function getMerchantID() {
|
| 10 |
+
return Mage::getStoreConfig("checkout/globalshopex/gsxmerchatid");
|
| 11 |
+
}
|
| 12 |
+
|
| 13 |
}
|
app/design/frontend/base/default/template/globalshopex/contentTracking.phtml
CHANGED
|
@@ -1,7 +1,3 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
$merchant_id = trim(Mage::getStoreConfig('shipping/internationalcheckout/name_of_company'));
|
| 3 |
-
?>
|
| 4 |
-
|
| 5 |
<div class="col-main">
|
| 6 |
<table id="shopping-cart-table" class="data-table cart-table" style="width: 710px">
|
| 7 |
<tr>
|
|
@@ -9,7 +5,7 @@ $merchant_id = trim(Mage::getStoreConfig('shipping/internationalcheckout/name_of
|
|
| 9 |
<iframe id="Gsframe" name="Gsframe" frameborder="0" scrolling="auto" height="800px" width="100%" allowtransparency="true" onload="hideProgress()">GlobalShopex International checkout Order Tracking</iframe>
|
| 10 |
<form name="frmPP" id="frmPP" method="post" action="https://globalshopex.com/iframe/OrderTracking.aspx" target="Gsframe">
|
| 11 |
<div runat="server" id="itemInfo">
|
| 12 |
-
<input type="hidden" name="MerchantID" value="<?php echo
|
| 13 |
</form>
|
| 14 |
<script type="text/javascript">document.getElementById('frmPP').submit();</script>
|
| 15 |
</td>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
<div class="col-main">
|
| 2 |
<table id="shopping-cart-table" class="data-table cart-table" style="width: 710px">
|
| 3 |
<tr>
|
| 5 |
<iframe id="Gsframe" name="Gsframe" frameborder="0" scrolling="auto" height="800px" width="100%" allowtransparency="true" onload="hideProgress()">GlobalShopex International checkout Order Tracking</iframe>
|
| 6 |
<form name="frmPP" id="frmPP" method="post" action="https://globalshopex.com/iframe/OrderTracking.aspx" target="Gsframe">
|
| 7 |
<div runat="server" id="itemInfo">
|
| 8 |
+
<input type="hidden" name="MerchantID" value="<?php echo Mage::helper('gsx_globalshopex')->getMerchantID(); ?>" />
|
| 9 |
</form>
|
| 10 |
<script type="text/javascript">document.getElementById('frmPP').submit();</script>
|
| 11 |
</td>
|
app/design/frontend/default/default/template/globalshopex/contentTracking.phtml
CHANGED
|
@@ -1,19 +1,15 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
$merchant_id = trim(Mage::getStoreConfig('shipping/internationalcheckout/name_of_company'));
|
| 3 |
-
?>
|
| 4 |
-
|
| 5 |
<div class="col-main">
|
| 6 |
-
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
<div class="col-main">
|
| 2 |
+
<table id="shopping-cart-table" class="data-table cart-table" style="width: 710px">
|
| 3 |
+
<tr>
|
| 4 |
+
<td>
|
| 5 |
+
|
| 6 |
+
<iframe id="Gsframe" name="Gsframe" frameborder="0" scrolling="auto" height="800px" width="100%" allowtransparency="true" onload="hideProgress()">GlobalShopex International checkout Order Tracking</iframe>
|
| 7 |
+
<form name="frmPP" id="frmPP" method="post" action="https://globalshopex.com/iframe/OrderTracking.aspx" target="Gsframe">
|
| 8 |
+
<div runat="server" id="itemInfo">
|
| 9 |
+
<input type="hidden" name="MerchantID" value="<?php echo Mage::helper('gsx_globalshopex')->getMerchantID(); ?>" />
|
| 10 |
+
</form>
|
| 11 |
+
<script type="text/javascript">document.getElementById('frmPP').submit();</script>
|
| 12 |
+
</td>
|
| 13 |
+
</tr>
|
| 14 |
+
</table>
|
| 15 |
+
</div>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>GSXInternationalCheckoutWithIframe</name>
|
| 4 |
-
<version>2.5.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/gpl-license">GPL</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -11,8 +11,8 @@
|
|
| 11 |
<notes>Ths is Stable version</notes>
|
| 12 |
<authors><author><name>Globalshopex</name><user>Globalshopex</user><email>technical_support@globalshopex.com</email></author></authors>
|
| 13 |
<date>2015-12-28</date>
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magecommunity"><dir name="Gsx"><dir name="Globalshopex"><dir name="Block"><file name="Internationallogic.php" hash="e57c2b9077dd25904165504e72a9e162"/></dir><dir name="Helper"><file name="Data.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>4.0.1</min><max>5.5.30</max></php></required></dependencies>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>GSXInternationalCheckoutWithIframe</name>
|
| 4 |
+
<version>2.5.3</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/gpl-license">GPL</license>
|
| 7 |
<channel>community</channel>
|
| 11 |
<notes>Ths is Stable version</notes>
|
| 12 |
<authors><author><name>Globalshopex</name><user>Globalshopex</user><email>technical_support@globalshopex.com</email></author></authors>
|
| 13 |
<date>2015-12-28</date>
|
| 14 |
+
<time>22:26:10</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="Gsx"><dir name="Globalshopex"><dir name="Block"><file name="Internationallogic.php" hash="e57c2b9077dd25904165504e72a9e162"/></dir><dir name="Helper"><file name="Data.php" hash="af83d8f516c58d4015d97f1b119e5049"/></dir><dir name="Model"><file name="IframeCarttoCart.php" hash="f687b8fe003cbc7c5ee192fc5c53dcab"/><file name="Servers.php" hash="43bf27049c55b729aeb4af248188076d"/></dir><dir name="controllers"><file name="GsxController.php" hash="546a6bec92e9aa47215e092e2126bf77"/><file name="GsxemptycartController.php" hash="f432922192819ce6980eeea56a624598"/><file name="InvoiceController.php" hash="83684c21d0afc2b70a16f3df12493ce1"/><file name="TrackingController.php" hash="5ce2cdbd045ca062d2ff44b9ddb215e2"/></dir><dir name="etc"><file name="config.xml" hash="9c0e9a35563cb5f057095ded9339a534"/><file name="system.xml" hash="7f82828c8c37beeb20f3c0cb1441bdc0"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="globalshopex.xml" hash="882b5b10dbcba25b45774cf97b133493"/></dir><dir name="template"><dir name="globalshopex"><file name="buttoniframe.phtml" hash="552e34556ce44f1cdc746020d12c0e5e"/><file name="contentInvoice.phtml" hash="2fb0bc3fbcfb69dae8327a2242165ad4"/><file name="contentTracking.phtml" hash="398a9980a61313cbae8a2655631aa735"/><file name="formcarttocart.phtml" hash="fbb3ace6394cd1769c37a7c1c02fc9f9"/><file name="formiframe.phtml" hash="23ef9e1a3341324f8a003cacef2aa4a4"/><file name="login.phtml" hash="e0336dde1d4dec2c1a6f9480cd62efee"/><file name="switchtypecart.phtml" hash="10c03f0fd5ada46ffb9c5f23dc782054"/></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="globalshopex.xml" hash="882b5b10dbcba25b45774cf97b133493"/></dir><dir name="template"><dir name="globalshopex"><file name="buttoniframe.phtml" hash="552e34556ce44f1cdc746020d12c0e5e"/><file name="contentInvoice.phtml" hash="2fb0bc3fbcfb69dae8327a2242165ad4"/><file name="contentTracking.phtml" hash="0edbd1419ae2b88a53f659fc7fe5983f"/><file name="formcarttocart.phtml" hash="a7a9a67cb950806e07a04cba5dcc536d"/><file name="formiframe.phtml" hash="4bd4c808223c68ca1150becee00f4f41"/><file name="login.phtml" hash="e0336dde1d4dec2c1a6f9480cd62efee"/><file name="switchtypecart.phtml" hash="10c03f0fd5ada46ffb9c5f23dc782054"/></dir></dir></dir></dir></dir></target><target name="magemedia"><dir name="Gsx"><dir name="images"><dir name="default"><file name="gc_button.gif" hash="4d53b9fb727fd399486e4c1d7b35170c"/><file name="gsx_button.gif" hash="4d53b9fb727fd399486e4c1d7b35170c"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Gsx_Globalshopex.xml" hash="b2d4fb7a215175c62d0380416285d8b2"/></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>4.0.1</min><max>5.5.30</max></php></required></dependencies>
|
| 18 |
</package>
|
