Magmodules_Fadello - Version 1.0.1

Version Notes

Fadello

Download this release

Release Info

Developer Magmodules
Extension Magmodules_Fadello
Version 1.0.1
Comparing to
See all releases


Code changes from version 1.0.0 to 1.0.1

Files changed (8) hide show
  1. app/code/community/Magmodules/Fadello/Model/Observer.php +17 -3
  2. app/code/community/Magmodules/Fadello/etc/config.xml +20 -1
  3. app/code/community/Magmodules/Fadello/etc/system.xml +10 -1
  4. app/design/frontend/base/default/layout/magmodules_fadello.xml +8 -0
  5. app/locale/nl_NL/Magmodules_Fadello.csv +1 -0
  6. package.xml +4 -4
  7. skin/frontend/base/default/magmodules/fadello/images/Fadello_logo3.png +0 -0
  8. skin/frontend/base/default/magmodules/fadello/style.css +23 -0
app/code/community/Magmodules/Fadello/Model/Observer.php CHANGED
@@ -48,10 +48,24 @@ class Magmodules_Fadello_Model_Observer {
48
  }
49
  }
50
  $collection = $observer->getOrderGridCollection();
51
- $select = $collection->getSelect();
52
- $select->join('sales_flat_order', 'main_table.entity_id = sales_flat_order.entity_id', array('shipping_method'));
53
- $select->group('main_table.entity_id');
54
  }
55
  }
56
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
57
  }
48
  }
49
  }
50
  $collection = $observer->getOrderGridCollection();
51
+ $sales_table = Mage::getSingleton('core/resource')->getTableName('sales_flat_order');
52
+ $collection->getSelect()->from(array(), array('shipping_method' => new Zend_Db_Expr('(SELECT `weight` FROM `' . $sales_table . '` as `o` WHERE `main_table`.`entity_id` = `o`.`entity_id`)')));
 
53
  }
54
  }
55
 
56
+ public function core_block_abstract_to_html_after($observer)
57
+ {
58
+ if($observer->getBlock() instanceof Mage_Checkout_Block_Onepage_Shipping_Method_Available) {
59
+ $enabled = Mage::getStoreConfig('carriers/fadello/active');
60
+ $logo_style = Mage::getStoreConfig('carriers/fadello/logo_style');
61
+ if($enabled && $logo_style) {
62
+ $html = $observer->getTransport()->getHtml();
63
+ $header = '<dt>' . Mage::getStoreConfig('carriers/fadello/title') . '</dt>';
64
+ $header_new = '<dt class="fadello-class">' . Mage::getStoreConfig('carriers/fadello/title') . '</dt>';
65
+ $html = str_replace($header, $header_new, $html);
66
+ $observer->getTransport()->setHtml($html);
67
+ }
68
+ }
69
+ }
70
+
71
  }
app/code/community/Magmodules/Fadello/etc/config.xml CHANGED
@@ -23,7 +23,7 @@
23
  <config>
24
  <modules>
25
  <Magmodules_Fadello>
26
- <version>1.0.0</version>
27
  </Magmodules_Fadello>
28
  </modules>
29
  <global>
@@ -52,6 +52,16 @@
52
  </connection>
53
  </fadello_setup>
54
  </resources>
 
 
 
 
 
 
 
 
 
 
55
  </global>
56
  <adminhtml>
57
  <translate>
@@ -93,6 +103,15 @@
93
  </adminhtml>
94
  </routers>
95
  </admin>
 
 
 
 
 
 
 
 
 
96
  <default>
97
  <shipping>
98
  <fadello>
23
  <config>
24
  <modules>
25
  <Magmodules_Fadello>
26
+ <version>1.0.1</version>
27
  </Magmodules_Fadello>
28
  </modules>
29
  <global>
52
  </connection>
53
  </fadello_setup>
54
  </resources>
55
+ <events>
56
+ <core_block_abstract_to_html_after>
57
+ <observers>
58
+ <fadello>
59
+ <class>fadello/observer</class>
60
+ <method>core_block_abstract_to_html_after</method>
61
+ </fadello>
62
+ </observers>
63
+ </core_block_abstract_to_html_after>
64
+ </events>
65
  </global>
66
  <adminhtml>
67
  <translate>
103
  </adminhtml>
104
  </routers>
105
  </admin>
106
+ <frontend>
107
+ <layout>
108
+ <updates>
109
+ <fadello>
110
+ <file>magmodules_fadello.xml</file>
111
+ </fadello>
112
+ </updates>
113
+ </layout>
114
+ </frontend>
115
  <default>
116
  <shipping>
117
  <fadello>
app/code/community/Magmodules/Fadello/etc/system.xml CHANGED
@@ -314,10 +314,19 @@
314
  <show_in_website>1</show_in_website>
315
  <show_in_store>1</show_in_store>
316
  </title>
 
 
 
 
 
 
 
 
 
317
  <sort_order translate="label">
318
  <label>Sort Order</label>
319
  <frontend_type>text</frontend_type>
320
- <sort_order>3</sort_order>
321
  <show_in_default>1</show_in_default>
322
  <show_in_website>1</show_in_website>
323
  <show_in_store>0</show_in_store>
314
  <show_in_website>1</show_in_website>
315
  <show_in_store>1</show_in_store>
316
  </title>
317
+ <logo_style translate="label">
318
+ <label>Add Fadello logo</label>
319
+ <frontend_type>select</frontend_type>
320
+ <source_model>adminhtml/system_config_source_yesno</source_model>
321
+ <sort_order>3</sort_order>
322
+ <show_in_default>1</show_in_default>
323
+ <show_in_website>1</show_in_website>
324
+ <show_in_store>1</show_in_store>
325
+ </logo_style>
326
  <sort_order translate="label">
327
  <label>Sort Order</label>
328
  <frontend_type>text</frontend_type>
329
+ <sort_order>4</sort_order>
330
  <show_in_default>1</show_in_default>
331
  <show_in_website>1</show_in_website>
332
  <show_in_store>0</show_in_store>
app/design/frontend/base/default/layout/magmodules_fadello.xml ADDED
@@ -0,0 +1,8 @@
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <layout version="0.1.0">
3
+ <default>
4
+ <reference name="head">
5
+ <action method="addCss" ifconfig="carriers/fadello/active"><stylesheet>magmodules/fadello/style.css</stylesheet></action>
6
+ </reference>
7
+ </default>
8
+ </layout>
app/locale/nl_NL/Magmodules_Fadello.csv CHANGED
@@ -1,5 +1,6 @@
1
  "<p>This extension is developed by <a href="http://www.magmodules.eu/">Magmodules</a>. We are a Magento only E-commerce Agency located in the Netherlands.<br></p><p><strong>Read everything about the extension configuration in our <a href="https://www.magmodules.eu/help/fadello" target="_blank">Knowledgebase.</a></strong></p>","<p>Deze extensie is ontwikkeld door <a href="http://www.magmodules.eu/">Magmodules</a>.</p><p><strong>Meer informatie over de configuratie van deze extensie zijn te vinden in onze<a href="https://www.magmodules.eu/help/fadello" target="_blank">Knowledgebase.</a></strong></p>"
2
  "About the Extension","Over deze extensie"
 
3
  "General Settings","Algemene instellingen"
4
  "Enabled","Enabled"
5
  "Method title","Methode titel"
1
  "<p>This extension is developed by <a href="http://www.magmodules.eu/">Magmodules</a>. We are a Magento only E-commerce Agency located in the Netherlands.<br></p><p><strong>Read everything about the extension configuration in our <a href="https://www.magmodules.eu/help/fadello" target="_blank">Knowledgebase.</a></strong></p>","<p>Deze extensie is ontwikkeld door <a href="http://www.magmodules.eu/">Magmodules</a>.</p><p><strong>Meer informatie over de configuratie van deze extensie zijn te vinden in onze<a href="https://www.magmodules.eu/help/fadello" target="_blank">Knowledgebase.</a></strong></p>"
2
  "About the Extension","Over deze extensie"
3
+ "Add Fadello logo","Fadello Logo toevoegen"
4
  "General Settings","Algemene instellingen"
5
  "Enabled","Enabled"
6
  "Method title","Methode titel"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Fadello</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Fadello</description>
11
  <notes>Fadello</notes>
12
  <authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
13
- <date>2016-08-02</date>
14
- <time>07:08:03</time>
15
- <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Fadello"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Availability.php" hash="3ca04582154a7c55051c3b4a843b82c0"/><file name="Shipping.php" hash="e1bbb26e620b7269ea4bcc8e7eff81ac"/></dir><dir name="Renderer"><file name="Select.php" hash="770fd3597fad245a655bee1b1a86fd46"/></dir></dir></dir><dir name="Renderer"><file name="Shipment.php" hash="2908611db82f846bc6df44d0845c7692"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Heading.php" hash="2a778e2d0aa145a7d12ee88ea2082b6e"/><file name="Note.php" hash="34b57d1f8c3b7b6cdaa3312b4a5828f9"/><file name="Version.php" hash="bda96116253c194a69659c53ddafd8d8"/></dir></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="2193a17e21310fdb5b3fc4ba16ed034a"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Availability.php" hash="664f4fc9fbade8cbb0b3ea32c6727034"/><file name="Shipping.php" hash="782c035cd9b166a8dfd9870c4baebda4"/></dir></dir><dir name="Source"><file name="Days.php" hash="a6c2e096106c17edcc055f88b1283888"/></dir></dir></dir></dir><file name="Api.php" hash="e88ac84bc65eb994c421bf404bdcd7ed"/><dir name="Carrier"><file name="ShippingMethod.php" hash="5620479cd7cac46ebce2b0354f69bd08"/></dir><file name="Observer.php" hash="a8dc7dae0ef690b7ccfabbdca317c4e2"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="FadelloController.php" hash="a7d18c9a84f5f87d3350dd84e30c85b8"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="55c39cbc0f74e4b9a62f5e309fd89709"/><file name="config.xml" hash="550346b0d6a26294d24f1b4bcc394f1d"/><file name="system.xml" hash="6ef8d620f46c6a1a6eed71a126df38d0"/></dir><dir name="sql"><dir name="fadello_setup"><file name="mysql4-install-0.9.0.php" hash="b0ec553fd5f0a731e2cfd1df5ddbe05a"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Fadello.xml" hash="88ffa276bf54b6a8fca175074abcb24c"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Fadello.csv" hash="448bf4573d58d11e99b8233d0a13db08"/></dir><dir name="nl_NL"><file name="Magmodules_Fadello.csv" hash="aa1a40890c587719b05711b8f1e16709"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="fadello"><file name="close.png" hash="c057a83b891418703c155c9a1382f8b9"/><file name="export.png" hash="21cef3823db6739081aea971e5789fa9"/><file name="pdf.png" hash="8df694ac11eae7090ccad5062b415020"/><file name="ship.png" hash="05c70f071c5d3cfe6ffa86a1cd3561f7"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Fadello</name>
4
+ <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
10
  <description>Fadello</description>
11
  <notes>Fadello</notes>
12
  <authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
13
+ <date>2016-08-25</date>
14
+ <time>11:55:48</time>
15
+ <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Fadello"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Availability.php" hash="3ca04582154a7c55051c3b4a843b82c0"/><file name="Shipping.php" hash="e1bbb26e620b7269ea4bcc8e7eff81ac"/></dir><dir name="Renderer"><file name="Select.php" hash="770fd3597fad245a655bee1b1a86fd46"/></dir></dir></dir><dir name="Renderer"><file name="Shipment.php" hash="2908611db82f846bc6df44d0845c7692"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Heading.php" hash="2a778e2d0aa145a7d12ee88ea2082b6e"/><file name="Note.php" hash="34b57d1f8c3b7b6cdaa3312b4a5828f9"/><file name="Version.php" hash="bda96116253c194a69659c53ddafd8d8"/></dir></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="2193a17e21310fdb5b3fc4ba16ed034a"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Availability.php" hash="664f4fc9fbade8cbb0b3ea32c6727034"/><file name="Shipping.php" hash="782c035cd9b166a8dfd9870c4baebda4"/></dir></dir><dir name="Source"><file name="Days.php" hash="a6c2e096106c17edcc055f88b1283888"/></dir></dir></dir></dir><file name="Api.php" hash="e88ac84bc65eb994c421bf404bdcd7ed"/><dir name="Carrier"><file name="ShippingMethod.php" hash="5620479cd7cac46ebce2b0354f69bd08"/></dir><file name="Observer.php" hash="c8fcd5d6b242abbc5c767505ae7229ac"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="FadelloController.php" hash="a7d18c9a84f5f87d3350dd84e30c85b8"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="55c39cbc0f74e4b9a62f5e309fd89709"/><file name="config.xml" hash="4a049ff8d33570319ea4b78851a13bae"/><file name="system.xml" hash="2a65bf2272b1fd171e734955a4aa83d7"/></dir><dir name="sql"><dir name="fadello_setup"><file name="mysql4-install-0.9.0.php" hash="b0ec553fd5f0a731e2cfd1df5ddbe05a"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Fadello.xml" hash="88ffa276bf54b6a8fca175074abcb24c"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Fadello.csv" hash="448bf4573d58d11e99b8233d0a13db08"/></dir><dir name="nl_NL"><file name="Magmodules_Fadello.csv" hash="9b0679e3c383c7bc01866974aa3aa76a"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="fadello"><file name="close.png" hash="c057a83b891418703c155c9a1382f8b9"/><file name="export.png" hash="21cef3823db6739081aea971e5789fa9"/><file name="pdf.png" hash="8df694ac11eae7090ccad5062b415020"/><file name="ship.png" hash="05c70f071c5d3cfe6ffa86a1cd3561f7"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="magmodules"><dir name="fadello"><dir name="images"><file name="Fadello_logo3.png" hash="87130480e8187cf4c2fff28142440aa1"/></dir><file name="style.css" hash="a270bf82e8a257817754711e6097a743"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="magmodules_fadello.xml" hash="474f2db5123f2d8de0a1a23141570efd"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
skin/frontend/base/default/magmodules/fadello/images/Fadello_logo3.png ADDED
Binary file
skin/frontend/base/default/magmodules/fadello/style.css ADDED
@@ -0,0 +1,23 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ /**
2
+ * Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
3
+ * =============================================================
4
+ * NOTICE OF LICENSE [Single domain license]
5
+ * This source file is subject to the EULA that is
6
+ * available through the world-wide-web at:
7
+ * http://www.magmodules.eu/license-agreement/
8
+ * =============================================================
9
+ * @category Magmodules
10
+ * @package Magmodules_Fadello
11
+ * @author Magmodules <info@magmodules.eu>
12
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
13
+ * @license http://www.magmodules.eu/license-agreement/
14
+ * =============================================================
15
+ */
16
+
17
+ .fadello-class {
18
+ color: #0c9;
19
+ background: url(./images/Fadello_logo3.png) no-repeat right;
20
+ background-size: 125px;
21
+ padding-bottom: 10px;
22
+ padding-top: 15px;
23
+ }