From bec545cbf488e57737a056d4efd9cf48a8cf2bae Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Tue, 26 Feb 2013 16:40:23 +0100 Subject: [PATCH] [+TASK] Replace shipping cost block in cart with a link to the shipping costs cms page (configurable) (#132) --- .../FireGento/GermanSetup/etc/config.xml | 11 ++-- .../FireGento/GermanSetup/etc/system.xml | 65 +++++++++++++------ .../base/default/layout/germansetup.xml | 14 +++- .../template/germansetup/shipping.phtml | 46 +++++++++++++ .../locale/de_DE/FireGento_GermanSetup.csv | 6 +- 5 files changed, 113 insertions(+), 29 deletions(-) create mode 100644 src/app/design/frontend/base/default/template/germansetup/shipping.phtml diff --git a/src/app/code/community/FireGento/GermanSetup/etc/config.xml b/src/app/code/community/FireGento/GermanSetup/etc/config.xml index 00313ed..2b93cb1 100644 --- a/src/app/code/community/FireGento/GermanSetup/etc/config.xml +++ b/src/app/code/community/FireGento/GermanSetup/etc/config.xml @@ -259,10 +259,11 @@ - + + - 0 + 1 @@ -280,7 +281,8 @@ Tel: {{var telephone}} {{depend fax}}Fax: {{var fax}} {{/depend}} ]]> - + + {{/depend}} {{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}
@@ -308,7 +310,8 @@ Tel: {{var telephone}} ]]> Javascript Template - #{prefix} #{firstname} #{middlename} #{lastname} #{suffix}
#{street0}
#{street1}
#{street2}
#{street3}
#{postcode} #{city}
#{country_id}
Tel: #{telephone}
Fax: #{fax}]]> + + #{prefix} #{firstname} #{middlename} #{lastname} #{suffix}
#{street0}
#{street1}
#{street2}
#{street3}
#{postcode} #{city}
#{country_id}
Tel: #{telephone}
Fax: #{fax}]]> diff --git a/src/app/code/community/FireGento/GermanSetup/etc/system.xml b/src/app/code/community/FireGento/GermanSetup/etc/system.xml index 96e6bb8..f7b16e3 100644 --- a/src/app/code/community/FireGento/GermanSetup/etc/system.xml +++ b/src/app/code/community/FireGento/GermanSetup/etc/system.xml @@ -305,12 +305,14 @@ - - - + + + - Display content from text field below at the checkout confirm page directly above the checkout button + Display content from text field below at the checkout confirm page directly above + the checkout button + select adminhtml/system_config_source_yesno 500 @@ -326,15 +328,16 @@ 1 1 - 1 + 1 - - - - - + + + + + + Replace with a link to the shipping costs cms page select adminhtml/system_config_source_yesno 500 @@ -342,17 +345,36 @@ 1 1 - - - + + + + + + + + + + select + adminhtml/system_config_source_yesno + 500 + 1 + 1 + 1 + + + + + - Ensures that the ip address of the customers doesnt get involved into the tracking + Ensures that the ip address of the customers doesnt get involved into the + tracking + select adminhtml/system_config_source_yesno 190 @@ -365,12 +387,13 @@ - - - + + + - ATTENTION: This setting overwrites the "Tax Class for Shipping" setting above!]]> + + ATTENTION: This setting overwrites the "Tax Class for Shipping" setting above!]]> select germansetup/source_tax_dynamicType 11 @@ -378,9 +401,9 @@ 1 0 - - - + + + diff --git a/src/app/design/frontend/base/default/layout/germansetup.xml b/src/app/design/frontend/base/default/layout/germansetup.xml index dfb8f84..db95c75 100644 --- a/src/app/design/frontend/base/default/layout/germansetup.xml +++ b/src/app/design/frontend/base/default/layout/germansetup.xml @@ -444,9 +444,9 @@ - - - shipping + + + @@ -502,4 +502,12 @@ template="germansetup/checkout/additional.phtml"/> + + + + + sale.reorder.sidebar + + + diff --git a/src/app/design/frontend/base/default/template/germansetup/shipping.phtml b/src/app/design/frontend/base/default/template/germansetup/shipping.phtml new file mode 100644 index 0000000..6e19541 --- /dev/null +++ b/src/app/design/frontend/base/default/template/germansetup/shipping.phtml @@ -0,0 +1,46 @@ + + * @copyright 2012 FireGento Team (http://www.firegento.de). All rights served. + * @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3) + * @version $Id:$ + * @since 0.1.0 + */ +/** + * Template for shipping cost link + * + * @category FireGento + * @package FireGento_GermanSetup + * @author FireGento Team + * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served. + * @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3) + * @version $Id:$ + * @since 1.2.0 + */ + +/** + * @var $this Mage_Checkout_Block_Cart_Shipping + */ +?> + +getShippingCostUrl() ?> + +
+

__('Shipping Costs') ?>

+

__('Here you find information regarding the shipping costs.') ?>

+
+ diff --git a/src/app/locale/de_DE/FireGento_GermanSetup.csv b/src/app/locale/de_DE/FireGento_GermanSetup.csv index dcf5729..c28dc10 100644 --- a/src/app/locale/de_DE/FireGento_GermanSetup.csv +++ b/src/app/locale/de_DE/FireGento_GermanSetup.csv @@ -109,4 +109,8 @@ "Tax Settings","Steuer-Einstellungen" "Delivery Time","Lieferzeit" -"Hide estimated shipping costs in cart","Geschätzte Versandkosten im Warenkorb verstecken" \ No newline at end of file +"Shipping Costs","Versandkosten" +"Hide estimated shipping costs in cart","Geschätzte Versandkosten im Warenkorb verstecken" +"Replace with a link to the shipping costs cms page","Mit einem Link zur CMS-Seite ""Versandkosten"" ersetzen" +"Here you find information regarding the shipping costs.","Hier finden Sie Informationen zu den Versandkosten." +"Hide box ""Last Ordered Items""","Box ""Zuletzt bestellte Artikel"" verstecken" \ No newline at end of file