Craig_Tco - Version 2.1.4

Version Notes

Updated default currency behavior for all parameter sets so that multi-currency listings can be supported.

Download this release

Release Info

Developer Magento Core Team
Extension Craig_Tco
Version 2.1.4
Comparing to
See all releases


Code changes from version 2.1.3 to 2.1.4

Files changed (3) hide show
  1. app/code/local/Craig/Tco/Model/Checkout.php +3 -3
  2. app/code/local/Craig/Tco/etc/config.xml +1 -1
  3. package.xml +7 -7
app/code/local/Craig/Tco/Model/Checkout.php CHANGED
@@ -107,7 +107,7 @@ class Craig_Tco_Model_Checkout extends Mage_Payment_Model_Method_Abstract {
107
  $lineitems['li_'.$i.'_quantity'] = $item->getQtyToInvoice();
108
  $lineitems['li_'.$i.'_name'] = $item->getName();
109
  $lineitems['li_'.$i.'_description'] = $item->getDescription();
110
- $lineitems['li_'.$i.'_price'] = number_format($item->getPrice(), 2, '.', '');
111
  $i++;
112
  }
113
  }
@@ -124,7 +124,7 @@ class Craig_Tco_Model_Checkout extends Mage_Payment_Model_Method_Abstract {
124
  if ($ship_method) {
125
  $lineitems['li_'.$i.'_type'] = 'shipping';
126
  $lineitems['li_'.$i.'_name'] = $order->getShipping_description();
127
- $lineitems['li_'.$i.'_price'] = round($order->getShippingAmount(), 2);
128
  $i++;
129
  }
130
  //get coupons
@@ -158,7 +158,7 @@ class Craig_Tco_Model_Checkout extends Mage_Payment_Model_Method_Abstract {
158
  public function getFormFields() {
159
  $order_id = $this->getCheckout()->getLastRealOrderId();
160
  $order = Mage::getModel('sales/order')->loadByIncrementId($order_id);
161
- $amount = round($order->getGrandTotal(), 2);
162
  $a = $this->getQuote()->getShippingAddress();
163
  $b = $this->getQuote()->getBillingAddress();
164
  $country = $b->getCountry();
107
  $lineitems['li_'.$i.'_quantity'] = $item->getQtyToInvoice();
108
  $lineitems['li_'.$i.'_name'] = $item->getName();
109
  $lineitems['li_'.$i.'_description'] = $item->getDescription();
110
+ $lineitems['li_'.$i.'_price'] = number_format($item->getBasePrice(), 2, '.', '');
111
  $i++;
112
  }
113
  }
124
  if ($ship_method) {
125
  $lineitems['li_'.$i.'_type'] = 'shipping';
126
  $lineitems['li_'.$i.'_name'] = $order->getShipping_description();
127
+ $lineitems['li_'.$i.'_price'] = round($order->getBaseShippingAmount(), 2);
128
  $i++;
129
  }
130
  //get coupons
158
  public function getFormFields() {
159
  $order_id = $this->getCheckout()->getLastRealOrderId();
160
  $order = Mage::getModel('sales/order')->loadByIncrementId($order_id);
161
+ $amount = round($order->getBaseGrandTotal(), 2);
162
  $a = $this->getQuote()->getShippingAddress();
163
  $b = $this->getQuote()->getBillingAddress();
164
  $country = $b->getCountry();
app/code/local/Craig/Tco/etc/config.xml CHANGED
@@ -24,7 +24,7 @@
24
  <config>
25
  <modules>
26
  <Craig_Tco>
27
- <version>2.1.3</version>
28
  </Craig_Tco>
29
  </modules>
30
  <global>
24
  <config>
25
  <modules>
26
  <Craig_Tco>
27
+ <version>2.1.4</version>
28
  </Craig_Tco>
29
  </modules>
30
  <global>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Craig_Tco</name>
4
- <version>2.1.3</version>
5
  <stability>stable</stability>
6
- <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL-3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Official 2Checkout Payment Extension</summary>
10
  <description>Official 2Checkout Payment Extension</description>
11
- <notes>Added templates for 1.4 support</notes>
12
  <authors><author><name>Craig Christenson</name><user>auto-converted</user><email>christensoncraig@gmail.com</email></author></authors>
13
- <date>2012-03-25</date>
14
- <time>12:42:47</time>
15
- <contents><target name="magelocal"><dir name="Craig"><dir name="Tco"><dir name="Block"><file name="Form.php" hash="b552018543f57090c42784d939004dd4"/><file name="Info.php" hash="ceb4ec03e4de3e4f1dafaf5d7da9b982"/><file name="Redirect.php" hash="e2809d56d51bdc74367dad8da77ac563"/></dir><dir name="Model"><file name="Observer.php" hash="727312c017289346a6c9a4aedb5fcc4f"/><file name="Checkout.php" hash="78ba967c187bc769abd44894a9c28598"/></dir><dir name="controllers"><file name="NotificationController.php" hash="2bbb8caf512b8bcdea2855842a56539b"/><file name="RedirectController.php" hash="197de0df037cf5ae45531ef735abfed1"/></dir><dir name="etc"><file name="config.xml" hash="fd8c84ff83db986a7f972871db38e443"/><file name="system.xml" hash="4bf8199f530281ba446d9c943fcb6932"/></dir><dir name="Helper"><file name="Data.php" hash="de7680011db7d6821c1f68d70a8fa684"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Craig_Tco.xml" hash="4a6e92678d9b2a310af880d35a4c355f"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="tco"><file name="form.phtml" hash="08ae585e158550d0a5dccbed3d37758d"/><file name="info.phtml" hash="b714a7398773adc71ea086024dfc96b1"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Craig_Tco</name>
4
+ <version>2.1.4</version>
5
  <stability>stable</stability>
6
+ <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>2Checkout Payment Extension</summary>
10
  <description>Official 2Checkout Payment Extension</description>
11
+ <notes>Updated default currency behavior for all parameter sets so that multi-currency listings can be supported.</notes>
12
  <authors><author><name>Craig Christenson</name><user>auto-converted</user><email>christensoncraig@gmail.com</email></author></authors>
13
+ <date>2012-07-07</date>
14
+ <time>16:17:01</time>
15
+ <contents><target name="mageetc"><dir name="modules"><file name="Craig_Tco.xml" hash="4a6e92678d9b2a310af880d35a4c355f"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="tco"><file name="form.phtml" hash="08ae585e158550d0a5dccbed3d37758d"/><file name="info.phtml" hash="b714a7398773adc71ea086024dfc96b1"/></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Craig"><dir name="Tco"><dir name="Block"><file name="Form.php" hash="b552018543f57090c42784d939004dd4"/><file name="Info.php" hash="ceb4ec03e4de3e4f1dafaf5d7da9b982"/><file name="Redirect.php" hash="e2809d56d51bdc74367dad8da77ac563"/></dir><dir name="controllers"><file name="NotificationController.php" hash="2bbb8caf512b8bcdea2855842a56539b"/><file name="RedirectController.php" hash="197de0df037cf5ae45531ef735abfed1"/></dir><dir name="etc"><file name="config.xml" hash="d79dd3ffe2d63a4aa6cb61114b8c12a2"/><file name="system.xml" hash="4bf8199f530281ba446d9c943fcb6932"/></dir><dir name="Helper"><file name="Data.php" hash="de7680011db7d6821c1f68d70a8fa684"/></dir><dir name="Model"><file name="Checkout.php" hash="1fd1027d01d734386f27cb64047bc845"/><file name="Observer.php" hash="727312c017289346a6c9a4aedb5fcc4f"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>