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.7 |
Comparing to | |
See all releases |
Code changes from version 0.2.6 to 0.2.7
app/code/community/Fraktjakt/Fraktjaktmodule/Block/Button.php
CHANGED
@@ -24,7 +24,7 @@ class Fraktjakt_Fraktjaktmodule_Block_Button extends Mage_Adminhtml_Block_System
|
|
24 |
$html = $this->getLayout()->createBlock('adminhtml/widget_button')
|
25 |
->setType('button')
|
26 |
->setClass('scalable')
|
27 |
-
->setLabel('
|
28 |
->setTarget('_blank')
|
29 |
->setOnClick("setLocation('$url')")
|
30 |
->toHtml();
|
24 |
$html = $this->getLayout()->createBlock('adminhtml/widget_button')
|
25 |
->setType('button')
|
26 |
->setClass('scalable')
|
27 |
+
->setLabel('Log in!')
|
28 |
->setTarget('_blank')
|
29 |
->setOnClick("setLocation('$url')")
|
30 |
->toHtml();
|
app/code/community/Fraktjakt/Fraktjaktmodule/Model/Observer.php
CHANGED
@@ -372,9 +372,9 @@ $quantity = round($item->getQtyOrdered());
|
|
372 |
//print_r($order);
|
373 |
$track = Mage::getModel('sales/order_shipment_track')
|
374 |
->setNumber($shipmentTrackingNumber)
|
375 |
-
->setCarrierCode( $
|
376 |
->setUrl("http://www.fraktjakt.se/trace/list_shipment/$shipmentTrackingNumber")
|
377 |
-
->setTitle(Mage::getStoreConfig('carriers/'.$this->_code.'/'
|
378 |
|
379 |
$shipment->addTrack($track);
|
380 |
|
372 |
//print_r($order);
|
373 |
$track = Mage::getModel('sales/order_shipment_track')
|
374 |
->setNumber($shipmentTrackingNumber)
|
375 |
+
->setCarrierCode( $order->getShippingCarrier()->getCarrierCode())
|
376 |
->setUrl("http://www.fraktjakt.se/trace/list_shipment/$shipmentTrackingNumber")
|
377 |
+
->setTitle(Mage::getStoreConfig('carriers/'.$this->_code.'/title'));
|
378 |
|
379 |
$shipment->addTrack($track);
|
380 |
|
app/code/community/Fraktjakt/Fraktjaktmodule/etc/config.xml
CHANGED
@@ -7,7 +7,7 @@
|
|
7 |
<sallowspecific>0</sallowspecific>
|
8 |
<model>Fraktjakt_Fraktjaktmodule_Model_Carrier_Shippingmethod</model>
|
9 |
<name>Fraktjakt_Fraktjaktmodule</name>
|
10 |
-
<title>
|
11 |
<specificerrmsg>Din valda frakttjänst är inte tillgänglig för din mottagaradress.</specificerrmsg>
|
12 |
<erroremail>0</erroremail>
|
13 |
<handling_type>F</handling_type>
|
7 |
<sallowspecific>0</sallowspecific>
|
8 |
<model>Fraktjakt_Fraktjaktmodule_Model_Carrier_Shippingmethod</model>
|
9 |
<name>Fraktjakt_Fraktjaktmodule</name>
|
10 |
+
<title>Fraktalternativ - från Fraktjakt</title>
|
11 |
<specificerrmsg>Din valda frakttjänst är inte tillgänglig för din mottagaradress.</specificerrmsg>
|
12 |
<erroremail>0</erroremail>
|
13 |
<handling_type>F</handling_type>
|
app/code/community/Fraktjakt/Fraktjaktmodule/etc/system.xml
CHANGED
@@ -44,7 +44,7 @@
|
|
44 |
<show_in_store>0</show_in_store>
|
45 |
</fraktjaktPassword>
|
46 |
<run translate="label">
|
47 |
-
<label>
|
48 |
<frontend_type>button</frontend_type>
|
49 |
<frontend_model>fraktjakt_fraktjaktmodule/button</frontend_model>
|
50 |
<sort_order>98</sort_order>
|
44 |
<show_in_store>0</show_in_store>
|
45 |
</fraktjaktPassword>
|
46 |
<run translate="label">
|
47 |
+
<label>Log in</label>
|
48 |
<frontend_type>button</frontend_type>
|
49 |
<frontend_model>fraktjakt_fraktjaktmodule/button</frontend_model>
|
50 |
<sort_order>98</sort_order>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>magnetofraktjaktv23</name>
|
4 |
-
<version>0.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="www.opensource.org/licenses/gpl-license.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
@@ -20,8 +20,8 @@ User manual for this extension in swedish:
|
|
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-07</date>
|
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="
|
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.7</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="www.opensource.org/licenses/gpl-license.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
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-07</date>
|
23 |
+
<time>13:51:24</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="25305e7dbc9cc151c9afc20afd41a306"/></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="e7a4c8338df69a3ddea3bae9020919fa"/><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="6bcc7fe1766c4431fffaa7e39e0c9c41"/><file name="system.xml" hash="bbd2ca4df53a0764794f29904c3b1a89"/></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>
|