Version 0.6.0, Added: Three static blocks to the E-Mail-Templates

MaWoScha · Aug 7, 2015 · 03ec3e6 · 03ec3e6
1 parent c368dde
commit 03ec3e6
Show file tree

Hide file tree

Showing 35 changed files with 274 additions and 401 deletions.
diff --git a/MagentoConnect.html b/MagentoConnect.html
@@ -37,4 +37,5 @@ <h3>ChangeLog</h3>
 <li><strong>0.1.0:</strong> Basisversion, only a Framework.</li>
 <li><strong>0.4.0:</strong> Added: E-Mail-Templates (taken from Magento v1.9.0.x).</li>
 <li><strong>0.5.0:</strong> Updated: E-Mail-Templates upgraded to Magento Version 1.9.1.x</li>
+<li><strong>0.6.0:</strong> Added: Three static blocks to the E-Mail-Templates.</li>
 </ul>
diff --git a/app/code/community/German/LocalePackEn/etc/config.xml b/app/code/community/German/LocalePackEn/etc/config.xml
@@ -11,7 +11,7 @@
 <config>
     <modules>
         <German_LocalePackEn>
-            <version>0.4.0</version>
+            <version>0.6.0</version>
             <locale>en_US</locale>
             <title>English (General) Language Pack</title>
             <link_git>https://github.com/MaWoScha/German_LocalePack_en_US</link_git>
@@ -44,6 +44,16 @@
                 </observers>
             </adminhtml_controller_action_predispatch_start>
         </events>
+        <resources>
+            <localepacken_setup>
+                <setup>
+                    <module>German_LocalePackEn</module>
+                </setup>
+                <connection>
+                    <use>core_setup</use>
+                </connection>
+            </localepacken_setup>
+        </resources>
     </global>
 
     <default>

diff --git a/app/code/community/German/LocalePackEn/sql/localepacken_setup/mysql4-install-0.6.0.php b/app/code/community/German/LocalePackEn/sql/localepacken_setup/mysql4-install-0.6.0.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @category  German
+ * @package   German_LocalePack
+ * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
+ * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>  
+ * @version   0.6.0.
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+$installer = $this;
+
+$installer->startSetup();
+
+$blockContent = <<<EOD
+If you have any questions or suggestions, please contact us either
+by email <a href="mailto:{{var store_email}}">{{var store_email}}</a>,
+by phone at <a href="tel:{{var store_phone}}">{{var store_phone}}</a>,
+via <a title="My Service-Site on Skype" href="skype:my.shop?chat" target="_blank">Skype-Chat</a> (Username: my.shop)
+or in Facebook on our <a title="My Fanpage in Facebook" href="http://www.facebook.com/my.shop" target="_blank">My Fanpage</a>.
+EOD;
+
+$storeId = 0;
+
+$staticBlocks = array(
+    array(
+        'title'         => 'eMail Template Say Hello (en)',
+        'identifier'    => 'email_template_say_hello',
+        'content'       => 'Dear,',
+        'is_active'     => 0,
+        'stores'        => array($storeId)
+    ),
+    array(
+        'title'         => 'eMail Template Contact (en)',
+        'identifier'    => 'email_template_contact',
+        'content'       => $blockContent,
+        'is_active'     => 0,
+        'stores'        => array($storeId)
+    ),
+    array(
+        'title'         => 'eMail Template Say Bye (en)',
+        'identifier'    => 'email_template_say_bye',
+        'content'       => 'Thank you!',
+        'is_active'     => 0,
+        'stores'        => array($storeId)
+    )
+);
+
+/**
+ * Insert default blocks
+ */
+foreach ($staticBlocks as $data) {
+    try {
+        Mage::getModel('cms/block')->setData($data)->save();
+    } catch (Exception $e) {
+        # To prevent exception "A block identifier with the same properties already exists
+        # in the selected store." in "app:code:core:Mage:Cms:Model:Resource:Block.php"
+#        throw new Exception("Oops, mi error in EN/US German LocalePack");
+    }
+}
+
+$installer->endSetup();
+
+?>
diff --git a/app/locale/en_US/template/email/account_new.html b/app/locale/en_US/template/email/account_new.html
@@ -17,7 +17,8 @@
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td class="action-content">
-            <h1>Welcome to {{var store.getFrontendName()}}.</h1>
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}}</h1>
+            <p>Welcome to {{var store.getFrontendName()}}.</p>
             <p>To log in when visiting our site just click <a href="{{store url="customer/account/"}}">Login</a> or <a href="{{store url="customer/account/"}}">My Account</a> at the top of every page, and then enter your email address and password.</p>
             <p class="highlighted-text">
                 Use the following values when prompted to log in:<br/>
@@ -34,9 +35,7 @@ <h1>Welcome to {{var store.getFrontendName()}}.</h1>
                 <li>Store alternative addresses (for shipping to multiple family members and friends!)</li>
             </ul>
             <p>
-                If you have any questions, please feel free to contact us at
-                <a href="mailto:{{var store_email}}">{{var store_email}}</a>
-                {{depend store_phone}} or by phone at <a href="tel:{{var store_phone}}">{{var store_phone}}</a>{{/depend}}.
+                {{block type="cms/block" block_id="email_template_contact"}}
             </p>
         </td>
     </tr>

diff --git a/app/locale/en_US/template/email/account_new_confirmation.html b/app/locale/en_US/template/email/account_new_confirmation.html
@@ -18,33 +18,25 @@
 
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
-        <td>
-            <table cellpadding="0" cellspacing="0" border="0">
+        <td class="action-content">
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}},</h1>
+            <p>Your email {{var customer.email}} must be confirmed before using it to log in to our store.</p>
+            <p class="highlighted-text">
+                Use the following values when prompted to log in:<br/>
+                <strong>Email:</strong> {{var customer.email}}<br/>
+                <strong>Password:</strong> {{htmlescape var=$customer.password}}
+            </p>
+            <p>Click here to confirm your email and instantly log in (the link is valid only once):</p>
+            <table cellspacing="0" cellpadding="0" class="action-button" >
                 <tr>
-                    <td class="action-content">
-                        <h1>{{htmlescape var=$customer.name}},</h1>
-                        <p>Your email {{var customer.email}} must be confirmed before using it to log in to our store.</p>
-                        <p class="highlighted-text">
-                            Use the following values when prompted to log in:<br/>
-                            <strong>Email:</strong> {{var customer.email}}<br/>
-                            <strong>Password:</strong> {{htmlescape var=$customer.password}}
-                        </p>
-                        <p>Click here to confirm your email and instantly log in (the link is valid only once):</p>
-                        <table cellspacing="0" cellpadding="0" class="action-button" >
-                            <tr>
-                                <td>
-                                    <a href="{{store url="customer/account/confirm/" _query_id=$customer.id _query_key=$customer.confirmation _query_back_url=$back_url}}"><span>Confirm Account</span></a>
-                                </td>
-                            </tr>
-                        </table>
-                        <p>
-                            If you have any questions, please feel free to contact us at
-                            <a href="mailto:{{var store_email}}">{{var store_email}}</a>
-                            {{depend store_phone}} or by phone at <a href="tel:{{var store_phone}}">{{var store_phone}}</a>{{/depend}}.
-                        </p>
+                    <td>
+                        <a href="{{store url="customer/account/confirm/" _query_id=$customer.id _query_key=$customer.confirmation _query_back_url=$back_url}}"><span>Confirm Account</span></a>
                     </td>
                 </tr>
             </table>
+            <p>
+                {{block type="cms/block" block_id="email_template_contact"}}
+            </p>
         </td>
     </tr>
 </table>

diff --git a/app/locale/en_US/template/email/account_new_confirmed.html b/app/locale/en_US/template/email/account_new_confirmed.html
@@ -16,7 +16,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td class="action-content">
-            <h1>{{htmlescape var=$customer.name}},</h1>
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}}</h1>
             <p>To log in when visiting our site just click <a href="{{store url="customer/account/"}}">Login</a> or <a href="{{store url="customer/account/"}}">My Account</a> at the top of every page, and then enter your email address and password.</p>
             <p>When you log in to your account, you will be able to do the following:</p>
             <ul>
@@ -28,9 +28,7 @@ <h1>{{htmlescape var=$customer.name}},</h1>
                 <li>Store alternative addresses (for shipping to multiple family members and friends!)</li>
             </ul>
             <p>
-                If you have any questions, please feel free to contact us at
-                <a href="mailto:{{var store_email}}">{{var store_email}}</a>
-                {{depend store_phone}} or by phone at <a href="tel:{{var store_phone}}">{{var store_phone}}</a>{{/depend}}.
+                {{block type="cms/block" block_id="email_template_contact"}}
             </p>
         </td>
     </tr>

diff --git a/app/locale/en_US/template/email/account_password_reset_confirmation.html b/app/locale/en_US/template/email/account_password_reset_confirmation.html
@@ -16,7 +16,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td class="action-content">
-            <h1>{{htmlescape var=$customer.name}},</h1>
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}},</h1>
             <p>There was recently a request to change the password for your account.</p>
             <p>If you requested this password change, please reset your password here:</p>
             <table cellspacing="0" cellpadding="0" class="action-button" >

diff --git a/app/locale/en_US/template/email/admin_password_new.html b/app/locale/en_US/template/email/admin_password_new.html
@@ -17,7 +17,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td class="action-content">
-            <h1>{{htmlescape var=$user.name}},</h1>
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$user.name}},</h1>
             <p><strong>Your new password is:</strong> {{htmlescape var=$password}}</p>
             <p>You can change your password at any time by logging into <a href="{{store url="adminhtml/system_account/"}}">your account</a>.</p>
         </td>

diff --git a/app/locale/en_US/template/email/admin_password_reset_confirmation.html b/app/locale/en_US/template/email/admin_password_reset_confirmation.html
@@ -17,7 +17,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td class="action-content">
-            <h1>{{htmlescape var=$user.name}},</h1>
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$user.name}},</h1>
             <p>There was recently a request to change the password for your account.</p>
             <p>You can change your password at any time by logging into <a href="{{store url="adminhtml/system_account/"}}">your account</a>.</p>
             <p>If you requested this password change, click here to reset your password:</p>

diff --git a/app/locale/en_US/template/email/html/footer.html b/app/locale/en_US/template/email/html/footer.html
@@ -3,7 +3,7 @@
                     </td>
                 </tr>
             </table>
-            <h5 class="closing-text">Thank you, {{var store.getFrontendName()}}!</h5>
+            <h5 class="closing-text">{{block type="cms/block" block_id="email_template_say_bye"}} {{var store.getFrontendName()}}!</h5>
         </td>
     </tr>
 </table>

diff --git a/app/locale/en_US/template/email/html/support.html b/app/locale/en_US/template/email/html/support.html
@@ -0,0 +1,14 @@
+<!--@subject Email - Support @-->
+<h4>Order Questions?</h4>
+<p>
+    {{depend store_phone}}
+    <b>Call Us:</b>
+    <a href="tel:{{var store_phone}}">{{var store_phone}}</a><br>
+    {{/depend}}
+    {{depend store_hours}}
+    <span class="no-link">{{var store_hours}}</span><br>
+    {{/depend}}
+    {{depend store_email}}
+    <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
+    {{/depend}}
+</p>
diff --git a/app/locale/en_US/template/email/password_new.html b/app/locale/en_US/template/email/password_new.html
@@ -16,7 +16,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td class="action-content">
-            <h1>{{htmlescape var=$customer.name}},</h1>
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}},</h1>
             <p><strong>Your new password is:</strong> {{htmlescape var=$customer.password}}</p>
             <p>You can change your password at any time by logging into <a href="{{store url="customer/account/"}}">your account</a>.</p>
         </td>

diff --git a/app/locale/en_US/template/email/product_price_alert.html b/app/locale/en_US/template/email/product_price_alert.html
@@ -9,7 +9,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td class="action-content">
-            <h1>{{var customerName}},</h1>
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{var customerName}},</h1>
 
             {{var alertGrid}}
         </td>

diff --git a/app/locale/en_US/template/email/product_share.html b/app/locale/en_US/template/email/product_share.html
@@ -16,7 +16,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td class="action-content">
-            <h1>{{htmlescape var=$name}},</h1>
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$name}}</h1>
             <p>Your friend wants to share this product with you: <a href="{{var product_url}}">{{var product_name}}</a></p>
             <table cellspacing="0" cellpadding="0" class="message-container">
                 <tr>

diff --git a/app/locale/en_US/template/email/sales/creditmemo_new.html b/app/locale/en_US/template/email/sales/creditmemo_new.html
@@ -23,30 +23,13 @@
 
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
-        <td>
-            <table cellpadding="0" cellspacing="0" border="0">
-                <tr>
-                    <td class="email-heading">
-                        <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
-                        <p>You can check the status of your order by <a href="{{store url="customer/account/"}}"">logging into your account</a>.</p>
-                    </td>
-                    <td class="store-info">
-                        <h4>Order Questions?</h4>
-                        <p>
-                            {{depend store_phone}}
-                            <b>Call Us:</b>
-                            <a href="tel:{{var store_phone}}">{{var store_phone}}</a><br>
-                            {{/depend}}
-                            {{depend store_hours}}
-                            <span class="no-link">{{var store_hours}}</span><br>
-                            {{/depend}}
-                            {{depend store_email}}
-                            <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
-                            {{/depend}}
-                        </p>
-                    </td>
-                </tr>
-            </table>
+        <td class="email-heading">
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}</h1>
+            <p>Thank you for your order from {{var store.getFrontendName()}}.</p>
+            <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
+        </td>
+        <td class="store-info">
+{{template config_path="design/email/support"}}
         </td>
     </tr>
     <tr>

diff --git a/app/locale/en_US/template/email/sales/creditmemo_new_guest.html b/app/locale/en_US/template/email/sales/creditmemo_new_guest.html
@@ -22,30 +22,13 @@
 
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
-        <td>
-            <table cellpadding="0" cellspacing="0" border="0">
-                <tr>
-                    <td class="email-heading">
-                        <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
-                        <p>You can check the status of your order by <a href="{{store url="customer/account/"}}"">logging into your account</a>.</p>
-                    </td>
-                    <td class="store-info">
-                        <h4>Order Questions?</h4>
-                        <p>
-                            {{depend store_phone}}
-                            <b>Call Us:</b>
-                            <a href="tel:{{var store_phone}}">{{var store_phone}}</a><br>
-                            {{/depend}}
-                            {{depend store_hours}}
-                            <span class="no-link">{{var store_hours}}</span><br>
-                            {{/depend}}
-                            {{depend store_email}}
-                            <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
-                            {{/depend}}
-                        </p>
-                    </td>
-                </tr>
-            </table>
+        <td class="email-heading">
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$billing.getName()}}</h1>
+            <p>Thank you for your order from {{var store.getFrontendName()}}.</p>
+            <p>You can check the status of your order by <a href="{{store url="customer/account/"}}"">logging into your account</a>.</p>
+        </td>
+        <td class="store-info">
+{{template config_path="design/email/support"}}
         </td>
     </tr>
     <tr>

diff --git a/app/locale/en_US/template/email/sales/creditmemo_update.html b/app/locale/en_US/template/email/sales/creditmemo_update.html
@@ -18,28 +18,20 @@
 
 <table cellpadding="0" cellspacing="0" border="0">
     <tr>
-        <td>
-            <table cellpadding="0" cellspacing="0" border="0">
+        <td class="action-content">
+            <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}},</h1>
+            <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
+            {{if comment}}
+            <table cellspacing="0" cellpadding="0" class="message-container">
                 <tr>
-                    <td class="action-content">
-                        <h1>{{htmlescape var=$order.getCustomerName()}},</h1>
-                        <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
-                        {{if comment}}
-                        <table cellspacing="0" cellpadding="0" class="message-container">
-                            <tr>
-                                <td>{{var comment}}</td>
-                            </tr>
-                        </table>
-                        {{/if}}
-                        <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
-                        <p>
-                            If you have any questions, please feel free to contact us at
-                            <a href="mailto:{{var store_email}}">{{var store_email}}</a>
-                            {{depend store_phone}} or by phone at <a href="tel:{{var store_phone}}">{{var store_phone}}</a>{{/depend}}.
-                        </p>
-                    </td>
+                    <td>{{var comment}}</td>
                 </tr>
             </table>
+            {{/if}}
+            <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
+            <p>
+                {{block type="cms/block" block_id="email_template_contact"}}
+            </p>
         </td>
     </tr>
 </table>