magnetofraktjaktv23 - Version 0.2.5

Version Notes

Integrates Fraktjakt for a complete shipping solution for Posten, Schenker, Bussgods, DHL, DSV, UPS, Fedex...

Download this release

Release Info

Developer Fraktjakt Ecommerce Team
Extension magnetofraktjaktv23
Version 0.2.5
Comparing to
See all releases


Code changes from version 0.2.4 to 0.2.5

Files changed (2) hide show
  1. app/code/community/Fraktjakt/Fraktjaktmodule/Model/Carrier/Shippingmethod.php +6 -1
  2. package.xml +4 -4
app/code/community/Fraktjakt/Fraktjaktmodule/Model/Carrier/Shippingmethod.php CHANGED
@@ -321,8 +321,9 @@ if($xml_results){
321
  }
322
  unset($xml_result);
323
  $xpath = $xml_results->xpath('tax_class');
 
324
  //echo "<pre>";
325
- //print_r($xpath);
326
  //exit;
327
  $handling = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '0';
328
  $allowedMethods = explode(",", strtolower($this->getConfigData('allowed_methods')));
@@ -352,6 +353,10 @@ if($xml_results){
352
  $agent_info = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '';
353
  $xpath = $prod->xpath('price');
354
  $rate = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '';
 
 
 
 
355
  $xpath = $prod->xpath('id');
356
  $shippingid = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '';
357
 
321
  }
322
  unset($xml_result);
323
  $xpath = $xml_results->xpath('tax_class');
324
+ //$tax_class = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '';
325
  //echo "<pre>";
326
+ //print_r($xml_result);
327
  //exit;
328
  $handling = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '0';
329
  $allowedMethods = explode(",", strtolower($this->getConfigData('allowed_methods')));
353
  $agent_info = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '';
354
  $xpath = $prod->xpath('price');
355
  $rate = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '';
356
+ $xpath = $prod->xpath('tax_class');
357
+ $tax_class = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '';
358
+ //$rate = $tax_class;
359
+ $rate = $rate+(($tax_class*$rate)/100);
360
  $xpath = $prod->xpath('id');
361
  $shippingid = ($xpath !== FALSE && isset($xpath[0])) ? (string)$xpath[0] : '';
362
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>magnetofraktjaktv23</name>
4
- <version>0.2.4</version>
5
  <stability>stable</stability>
6
  <license uri="www.opensource.org/licenses/gpl-license.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -19,9 +19,9 @@ User manual for this extension in swedish:&#xD;
19
  &lt;a href="http://www.fraktjakt.se/downloads/Fraktjakt_Magento_Manual.pdf"&gt;http://www.fraktjakt.se/downloads/Fraktjakt_Magento_Manual.pdf&lt;/a&gt;</description>
20
  <notes>Integrates Fraktjakt for a complete shipping solution for Posten, Schenker, Bussgods, DHL, DSV, UPS, Fedex...</notes>
21
  <authors><author><name>Fraktjakt Ecommerce Team</name><user>Fraktjakt</user><email>info@fraktjakt.se</email></author></authors>
22
- <date>2014-05-05</date>
23
- <time>12:22:27</time>
24
- <contents><target name="magecommunity"><dir name="Fraktjakt"><dir name="Fraktjaktmodule"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Shipment"><file name="View.php" hash="9889746bb5f43449514dbebb595237a4"/></dir><file name="View.php" hash="d034207157a53e6c014e79f380b00152"/></dir></dir></dir><file name="Button.php" hash="c824ef0424300a1da6dcbc58e2755074"/></dir><dir name="Helper"><file name="Data.php" hash="312b2968f8d82ae8257a9018664e6e52"/></dir><dir name="Model"><dir name="Carrier"><file name="Shippingmethod.php" hash="fa779f79c3fc0413bf4ecfd917eb5bf8"/></dir><file name="Observer.php" hash="a3c7929ddff94c93d6af8644bb51bdaa"/><dir name="Source"><file name="Dimentionunits.php" hash="c4bc1eba6379368c519d6d7300edac32"/><file name="Method.php" hash="b46ca3dd9149eed71e8d5bb5212a579b"/><file name="Weightunits.php" hash="779c6d30923739673eaa7fd9bf6b4cf1"/></dir></dir><dir name="controllers"><dir name="Checkout"><file name="CartController.php" hash="3ed401189982efec2155a9e3ff2a759a"/></dir></dir><dir name="etc"><file name="config.xml" hash="129239912e2852d24fb2a57aaa242364"/><file name="system.xml" hash="e98455d95799ffc2f8f99c8740493def"/></dir><dir name="sql"><dir name="fraktjaktmodule_setup"><file name="mysql4-install-0.2.0.php" hash="eecc35926e3e0041c4ab965d125243f5"/><file name="mysql4-upgrade-0.2.0-0.2.1.php" hash="b49db5998a45e77676a4202496f92373"/><file name="mysql4-upgrade-0.2.1-0.2.2.php" hash="0c4b02e51a8e97fd977a98b813b56708"/><file name="mysql4-upgrade-0.2.2-0.2.3.php" hash="4b7a0f0b0bd2d69ae688bc233584738a"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Fraktjakt_Fraktjaktmodule.xml" hash="c8d95d33412e623b7ffd9730d6beb467"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="fraktjakt_fraktjaktmodule.xml" hash="638141397c9fbd3dd667e2d1624178d5"/></dir><dir name="template"><dir name="fraktjakt"><dir name="checkout"><dir name="cart"><file name="shipping.phtml" hash="13cd347cc10ac07ecfac22f3f8916b39"/></dir><dir name="onepage"><dir name="shipping_method"><file name="fraktjakttemplate.phtml" hash="ba7c66a594d8bdcaeef4587a5112ad69"/></dir></dir></dir><dir name="fraktjaktmodule"><dir name="checkout"><dir name="cart"><file name="shipping.phtml" hash="13cd347cc10ac07ecfac22f3f8916b39"/></dir><dir name="onepage"><dir name="shipping_method"><file name="fraktjakttemplate.phtml" hash="ba7c66a594d8bdcaeef4587a5112ad69"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target></contents>
25
  <compatible/>
26
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><extension><name>gd</name><min>1.0.1</min><max>1.0.2</max></extension></required></dependencies>
27
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>magnetofraktjaktv23</name>
4
+ <version>0.2.5</version>
5
  <stability>stable</stability>
6
  <license uri="www.opensource.org/licenses/gpl-license.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
19
  &lt;a href="http://www.fraktjakt.se/downloads/Fraktjakt_Magento_Manual.pdf"&gt;http://www.fraktjakt.se/downloads/Fraktjakt_Magento_Manual.pdf&lt;/a&gt;</description>
20
  <notes>Integrates Fraktjakt for a complete shipping solution for Posten, Schenker, Bussgods, DHL, DSV, UPS, Fedex...</notes>
21
  <authors><author><name>Fraktjakt Ecommerce Team</name><user>Fraktjakt</user><email>info@fraktjakt.se</email></author></authors>
22
+ <date>2014-05-06</date>
23
+ <time>13:03:23</time>
24
+ <contents><target name="magecommunity"><dir name="Fraktjakt"><dir name="Fraktjaktmodule"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Shipment"><file name="View.php" hash="9889746bb5f43449514dbebb595237a4"/></dir><file name="View.php" hash="d034207157a53e6c014e79f380b00152"/></dir></dir></dir><file name="Button.php" hash="c824ef0424300a1da6dcbc58e2755074"/></dir><dir name="Helper"><file name="Data.php" hash="312b2968f8d82ae8257a9018664e6e52"/></dir><dir name="Model"><dir name="Carrier"><file name="Shippingmethod.php" hash="60e03bc88975196719f72c08bb6c8e7d"/></dir><file name="Observer.php" hash="a3c7929ddff94c93d6af8644bb51bdaa"/><dir name="Source"><file name="Dimentionunits.php" hash="c4bc1eba6379368c519d6d7300edac32"/><file name="Method.php" hash="b46ca3dd9149eed71e8d5bb5212a579b"/><file name="Weightunits.php" hash="779c6d30923739673eaa7fd9bf6b4cf1"/></dir></dir><dir name="controllers"><dir name="Checkout"><file name="CartController.php" hash="3ed401189982efec2155a9e3ff2a759a"/></dir></dir><dir name="etc"><file name="config.xml" hash="129239912e2852d24fb2a57aaa242364"/><file name="system.xml" hash="e98455d95799ffc2f8f99c8740493def"/></dir><dir name="sql"><dir name="fraktjaktmodule_setup"><file name="mysql4-install-0.2.0.php" hash="eecc35926e3e0041c4ab965d125243f5"/><file name="mysql4-upgrade-0.2.0-0.2.1.php" hash="b49db5998a45e77676a4202496f92373"/><file name="mysql4-upgrade-0.2.1-0.2.2.php" hash="0c4b02e51a8e97fd977a98b813b56708"/><file name="mysql4-upgrade-0.2.2-0.2.3.php" hash="4b7a0f0b0bd2d69ae688bc233584738a"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Fraktjakt_Fraktjaktmodule.xml" hash="c8d95d33412e623b7ffd9730d6beb467"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="fraktjakt_fraktjaktmodule.xml" hash="638141397c9fbd3dd667e2d1624178d5"/></dir><dir name="template"><dir name="fraktjakt"><dir name="checkout"><dir name="cart"><file name="shipping.phtml" hash="13cd347cc10ac07ecfac22f3f8916b39"/></dir><dir name="onepage"><dir name="shipping_method"><file name="fraktjakttemplate.phtml" hash="ba7c66a594d8bdcaeef4587a5112ad69"/></dir></dir></dir><dir name="fraktjaktmodule"><dir name="checkout"><dir name="cart"><file name="shipping.phtml" hash="13cd347cc10ac07ecfac22f3f8916b39"/></dir><dir name="onepage"><dir name="shipping_method"><file name="fraktjakttemplate.phtml" hash="ba7c66a594d8bdcaeef4587a5112ad69"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target></contents>
25
  <compatible/>
26
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><extension><name>gd</name><min>1.0.1</min><max>1.0.2</max></extension></required></dependencies>
27
  </package>