From de5f6053c7215aca52a7a75be6e4b052f7ee2cab Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Wed, 5 Apr 2023 18:56:03 +0100 Subject: [PATCH 01/15] Converted RWD's default logos to SVG --- .../Core/Model/Email/Template/Abstract.php | 2 +- app/code/core/Mage/Page/etc/config.xml | 14 +++--- .../mysql4-upgrade-0.6.2-0.7.0.php | 4 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 4 +- .../mysql4-upgrade-0.8.3-0.8.4.php | 2 +- .../base/default/template/page/print.phtml | 2 +- skin/frontend/rwd/default/images/logo.gif | Bin 1013 -> 0 bytes skin/frontend/rwd/default/images/logo.svg | 45 ++++++++++++++++++ .../rwd/default/images/logo_email.gif | Bin 949 -> 0 bytes .../rwd/default/images/logo_print.gif | Bin 949 -> 0 bytes 10 files changed, 59 insertions(+), 14 deletions(-) delete mode 100644 skin/frontend/rwd/default/images/logo.gif create mode 100644 skin/frontend/rwd/default/images/logo.svg delete mode 100644 skin/frontend/rwd/default/images/logo_email.gif delete mode 100644 skin/frontend/rwd/default/images/logo_print.gif diff --git a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php index b3a2ada7a19..3a2fcfff530 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php @@ -117,7 +117,7 @@ protected function _getLogoUrl($store) return Mage::getBaseUrl('media') . $uploadDir . '/' . $fileName; } } - return Mage::getDesign()->getSkinUrl('images/logo_email.gif'); + return Mage::getDesign()->getSkinUrl('images/logo.svg'); } /** diff --git a/app/code/core/Mage/Page/etc/config.xml b/app/code/core/Mage/Page/etc/config.xml index 8a177e6d709..acfc1994269 100644 --- a/app/code/core/Mage/Page/etc/config.xml +++ b/app/code/core/Mage/Page/etc/config.xml @@ -105,21 +105,21 @@ - Magento Commerce + OpenMage Default Description - Magento, Varien, E-commerce + OpenMage, e-commerce * text/html utf-8
- images/logo.gif - Magento Commerce - images/logo.gif - Default welcome msg! + images/logo.svg + OpenMage + images/logo.svg + Welcome!
- © 2020 OpenMage Demo Store. All Rights Reserved. + © 2023 OpenMage Demo Store. All Rights Reserved.
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php index 8e1e4e18b1c..d75b7f6f2ca 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php @@ -19,8 +19,8 @@ $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"Magento\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.getFormated(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.getFormated(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"Magento\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
Magento Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.getFormated(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.getFormated(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
Magento Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; DROP TABLE IF EXISTS {$this->getTable('sales_order_status')}; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php index 31d4d761b72..0f0a2b85688 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,8 +18,8 @@ $installer->startSetup(); $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"Magento\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"Magento\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
Magento Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
Magento Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; "); $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php index 061b38ee435..9d62dba62fe 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -18,7 +18,7 @@ $installer->startSetup(); $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"Magento\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; "); $installer->endSetup(); diff --git a/app/design/frontend/base/default/template/page/print.phtml b/app/design/frontend/base/default/template/page/print.phtml index 5598fde6590..b9633815eef 100644 --- a/app/design/frontend/base/default/template/page/print.phtml +++ b/app/design/frontend/base/default/template/page/print.phtml @@ -26,7 +26,7 @@
- + getPrintLogoText()):?>
escapeHtml($this->getPrintLogoText())) ?>
diff --git a/skin/frontend/rwd/default/images/logo.gif b/skin/frontend/rwd/default/images/logo.gif deleted file mode 100644 index e4202278b26456e518f483e479805e2db85a36f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1013 zcmVgYnPz5Y|Ns900000000000A^!_bMO0Hm zK~P09E-(WD0000X`2+<300aOm00000!~i$|00aL>y4?OS%1NueIP1;3|6nMNWNDsg zs;+G7zHlthbZy^wuJ3&B|G=QI2Phhk$fOb=2n?ULrF41}K(8^XR%*q1SKDyX`7N8o z=wjE*4yDuNww&`u$LIJgp5>0|d&; z&A!jOqRXw;oN?08+riSm$=g=m)z9Y3w%eTxOsxx6Xr(H7DinJ#&&U+_aoOh4K?uPaC*a;!Y;j^$clGsuiWhvr15cCJH){ z1RL5wt4Oj85}rlnz#GjzX4UFDI+tzHy1%}KEXj%M09XL=0RX1zq^qxGcb5Eg6m0{5 zdp|Cui)^!M{*K=Fr8VZNq@*8% znOpep-Mx3R&JB02r4>iVCl77>?%@CawHF$F1E435dIz$n-Cqw>HJyH_%tqT*lDXFz zL89^ZUVq>@;9!0b4*1H1eHbVTf+s47QgbC);h1LG+(zPU`0e+fjRG#nSaCG+h+|H) zndsaS>xsqJ9d8N8Ab&1)*pF@4`IXytA#Ugwiwi=tqI_CjMw5`L9Z}>)H!=g&PfGr! z6ovqyq|Au65=HSPisq$CjJet{E8TIFLe%6`E2ull z2_l`2qN>h*xHbxEPYS@Agsi7UU{X{cuu+vOJ7&^K$|t0-a_s}cSc{lEtkyD0GPkg1 z9Xhskyiv+U(;531}_ExY;A^}dIubA#O+X27<+vJ~I z7${MvpzWrpsRj%;>=i&KMWq3W^@40qVIVL3tHut?gk>8UqnuGn{(8}}%iIn$tsKVD joB>vZ>Fo2*KnE@K&_ow)^wCHst@P4NH|;bI2><{)w7cd1 diff --git a/skin/frontend/rwd/default/images/logo.svg b/skin/frontend/rwd/default/images/logo.svg new file mode 100644 index 00000000000..ee8c022e36c --- /dev/null +++ b/skin/frontend/rwd/default/images/logo.svg @@ -0,0 +1,45 @@ + + + + + + + + + diff --git a/skin/frontend/rwd/default/images/logo_email.gif b/skin/frontend/rwd/default/images/logo_email.gif deleted file mode 100644 index 0c4ed888223917621f89d9a637839a6215f436a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 949 zcmV;m14{fyNk%w1VZ;C?0HOo{M)jvi#5OhB$|>%Q=a&ZZjQc&_7g?@YU( za7ZNhjtX0G$!vmjFTz=$7x>^MbO<>-f;^Pbh^Y(1v54%RCX6|*YS(Emzk-zt6dG2HVkLx2l0_IqK@kE{ zEa^{fSrud}1U)KNnAg4>5AoGIE3m4nP!AVAW_4CKRo$|zWlHoR23rI$XOI`{o9E7h z>l(h0m~`R47piJ*3@w&7&$;M6eGqWzf_R}T-$Jc5pGJ6R&zx1k*mOVR)p$?+sa&^B zgtR%Ckp4rrn`6y6UMv?}@z~?NtFcc0b2Ibu<8N(u{Fv8t_ti(IK3&+nZ)TpqNyVID_2d&q zVZBwAkRaaZ+<`2Y`~iys&LDP3&p9TL8cItd0PwFeLDmuZlt@$teYxet^(e2 z;I6tm^cSFACBS=ak|f-VuMRJ{*%ArOvO;XaZDFDfx-t$-1g!r^{DHt0-$3z68F#Q+ X#}mJ!E6C&VOLD&a7+Nm}2><{)TVcs4 diff --git a/skin/frontend/rwd/default/images/logo_print.gif b/skin/frontend/rwd/default/images/logo_print.gif deleted file mode 100644 index 0c4ed888223917621f89d9a637839a6215f436a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 949 zcmV;m14{fyNk%w1VZ;C?0HOo{M)jvi#5OhB$|>%Q=a&ZZjQc&_7g?@YU( za7ZNhjtX0G$!vmjFTz=$7x>^MbO<>-f;^Pbh^Y(1v54%RCX6|*YS(Emzk-zt6dG2HVkLx2l0_IqK@kE{ zEa^{fSrud}1U)KNnAg4>5AoGIE3m4nP!AVAW_4CKRo$|zWlHoR23rI$XOI`{o9E7h z>l(h0m~`R47piJ*3@w&7&$;M6eGqWzf_R}T-$Jc5pGJ6R&zx1k*mOVR)p$?+sa&^B zgtR%Ckp4rrn`6y6UMv?}@z~?NtFcc0b2Ibu<8N(u{Fv8t_ti(IK3&+nZ)TpqNyVID_2d&q zVZBwAkRaaZ+<`2Y`~iys&LDP3&p9TL8cItd0PwFeLDmuZlt@$teYxet^(e2 z;I6tm^cSFACBS=ak|f-VuMRJ{*%ArOvO;XaZDFDfx-t$-1g!r^{DHt0-$3z68F#Q+ X#}mJ!E6C&VOLD&a7+Nm}2><{)TVcs4 From 5c314bf3d02c352b191d93c1a8f31d6844f5ca71 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Wed, 5 Apr 2023 19:03:35 +0100 Subject: [PATCH 02/15] Using the gray logo --- skin/frontend/rwd/default/images/logo.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/frontend/rwd/default/images/logo.svg b/skin/frontend/rwd/default/images/logo.svg index ee8c022e36c..c64be5599bf 100644 --- a/skin/frontend/rwd/default/images/logo.svg +++ b/skin/frontend/rwd/default/images/logo.svg @@ -4,7 +4,7 @@ viewBox="0 0 162 31" style="enable-background:new 0 0 162 31;" xml:space="preserve"> getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.getFormated(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.getFormated(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
Magento Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.getFormated(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.getFormated(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
OpenMage Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; DROP TABLE IF EXISTS {$this->getTable('sales_order_status')}; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php index 0f0a2b85688..046524deda5 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,8 +18,8 @@ $installer->startSetup(); $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
Magento Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
OpenMage Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; "); $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php index 9d62dba62fe..586b53ddf6a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -18,7 +18,7 @@ $installer->startSetup(); $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; "); $installer->endSetup(); From 2a8a8ee3f4869cf3e710df1e7c251a9ab344f4f7 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sat, 8 Apr 2023 23:33:00 +0100 Subject: [PATCH 05/15] suggestions by @addison74 --- .../Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php | 2 +- .../Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php index 5d161de7cc4..ba5c7d70897 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php @@ -19,7 +19,7 @@ $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.getFormated(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.getFormated(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.getFormated(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.getFormated(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
OpenMage Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; DROP TABLE IF EXISTS {$this->getTable('sales_order_status')}; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php index 046524deda5..eae2a9ec571 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,7 +18,7 @@ $installer->startSetup(); $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
OpenMage Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; "); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php index 586b53ddf6a..7b90d979117 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -18,7 +18,7 @@ $installer->startSetup(); $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; "); $installer->endSetup(); From 719dcb2ff32ea9236f2a5d4d4f8385c8e7c8456c Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 15:05:16 +0100 Subject: [PATCH 06/15] revert to GIF for email logo --- .../Mage/Core/Model/Email/Template/Abstract.php | 2 +- skin/frontend/rwd/default/images/logo_email.gif | Bin 0 -> 949 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 skin/frontend/rwd/default/images/logo_email.gif diff --git a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php index 5c66d8fe141..518edf96fbc 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php @@ -116,7 +116,7 @@ protected function _getLogoUrl($store) return Mage::getBaseUrl('media') . $uploadDir . '/' . $fileName; } } - return Mage::getDesign()->getSkinUrl('images/logo.svg'); + Mage::getDesign()->getSkinUrl('images/logo_email.gif'); } /** diff --git a/skin/frontend/rwd/default/images/logo_email.gif b/skin/frontend/rwd/default/images/logo_email.gif new file mode 100644 index 0000000000000000000000000000000000000000..0c4ed888223917621f89d9a637839a6215f436a0 GIT binary patch literal 949 zcmV;m14{fyNk%w1VZ;C?0HOo{M)jvi#5OhB$|>%Q=a&ZZjQc&_7g?@YU( za7ZNhjtX0G$!vmjFTz=$7x>^MbO<>-f;^Pbh^Y(1v54%RCX6|*YS(Emzk-zt6dG2HVkLx2l0_IqK@kE{ zEa^{fSrud}1U)KNnAg4>5AoGIE3m4nP!AVAW_4CKRo$|zWlHoR23rI$XOI`{o9E7h z>l(h0m~`R47piJ*3@w&7&$;M6eGqWzf_R}T-$Jc5pGJ6R&zx1k*mOVR)p$?+sa&^B zgtR%Ckp4rrn`6y6UMv?}@z~?NtFcc0b2Ibu<8N(u{Fv8t_ti(IK3&+nZ)TpqNyVID_2d&q zVZBwAkRaaZ+<`2Y`~iys&LDP3&p9TL8cItd0PwFeLDmuZlt@$teYxet^(e2 z;I6tm^cSFACBS=ak|f-VuMRJ{*%ArOvO;XaZDFDfx-t$-1g!r^{DHt0-$3z68F#Q+ X#}mJ!E6C&VOLD&a7+Nm}2><{)TVcs4 literal 0 HcmV?d00001 From c9e1d28f03e74c0ec71c42189df5aadbbcb76328 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 15:05:59 +0100 Subject: [PATCH 07/15] revert to GIF for email logo --- app/code/core/Mage/Core/Model/Email/Template/Abstract.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php index 518edf96fbc..6e4e5aa1ccf 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php @@ -116,7 +116,7 @@ protected function _getLogoUrl($store) return Mage::getBaseUrl('media') . $uploadDir . '/' . $fileName; } } - Mage::getDesign()->getSkinUrl('images/logo_email.gif'); + return Mage::getDesign()->getSkinUrl('images/logo_email.gif'); } /** From f2d18101da551101fe55229d13dfa9d14b5332af Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 15:17:39 +0100 Subject: [PATCH 08/15] revert commit error --- app/code/core/Mage/SalesRule/Model/Validator.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index 07dde4b9fd7..8300c9e7cf0 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -178,6 +178,11 @@ protected function _canProcessRule($rule, $address) $rule->setIsValidForAddress($address, false); return false; } + // check coupon expiration + if ($coupon->hasExpirationDate() && ($coupon->getExpirationDate() < Mage::getModel('core/date')->date())) { + $rule->setIsValidForAddress($address, false); + return false; + } // check per customer usage limit $customerId = $address->getQuote()->getCustomerId(); if ($customerId && $coupon->getUsagePerCustomer()) { From ade7b7fc52b9d323c4f75890fcaa7dc1c0027d8a Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 15:20:48 +0100 Subject: [PATCH 09/15] Reverted to GIF for emails --- .../Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php index ba5c7d70897..6552fcd589e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php @@ -19,8 +19,8 @@ $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.getFormated(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.getFormated(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
OpenMage Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.getFormated(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.getFormated(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
OpenMage Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; DROP TABLE IF EXISTS {$this->getTable('sales_order_status')}; From f20049a6f00d29b4d22e5a5f87f5ba86280f3b74 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 15:21:51 +0100 Subject: [PATCH 10/15] Reverted to GIF for emails --- .../Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php index eae2a9ec571..bdc14af29d5 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,8 +18,8 @@ $installer->startSetup(); $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
OpenMage Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by logging into your account. If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n
\r\n\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Dear {{var billing.name}},
\r\n Your order # {{var order.increment_id}} has been {{var order.getStatusLabel()}}.

\r\n

{{var comment}}

\r\n

If you have any questions, please feel free to contact us at \r\n dummyemail@openmage.org or by phone at (555) 555-0123.

\r\n

Thank you again,
OpenMage Demo Store

\r\n
\r\n
\r\n
\r\n' WHERE template_code='Order update (HTML)'; "); $installer->endSetup(); From a9b864abf7e6c35a5f9cedf4cd2184a627acaeef Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 15:22:31 +0100 Subject: [PATCH 11/15] Reverted to GIF for emails --- .../Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php index 7b90d979117..174d9dad8d0 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -18,7 +18,7 @@ $installer->startSetup(); $installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"OpenMage\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@openmage.org or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
OpenMage Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; "); $installer->endSetup(); From 6b57a6cf189918da88327a974f54145080c3e467 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 16:12:23 +0100 Subject: [PATCH 12/15] Removed large/small logos from template since with SVG there is no need for that --- .../frontend/rwd/default/template/page/html/header.phtml | 3 +-- skin/frontend/rwd/default/css/styles.css | 6 ------ skin/frontend/rwd/default/scss/layout/_header.scss | 7 ------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/app/design/frontend/rwd/default/template/page/html/header.phtml b/app/design/frontend/rwd/default/template/page/html/header.phtml index 3433fdff029..1ec4e15f12d 100644 --- a/app/design/frontend/rwd/default/template/page/html/header.phtml +++ b/app/design/frontend/rwd/default/template/page/html/header.phtml @@ -31,8 +31,7 @@
Date: Fri, 21 Apr 2023 16:14:35 +0100 Subject: [PATCH 13/15] Fixed whitespaces --- .../frontend/rwd/default/template/page/html/header.phtml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/design/frontend/rwd/default/template/page/html/header.phtml b/app/design/frontend/rwd/default/template/page/html/header.phtml index 1ec4e15f12d..c63d0d80bbb 100644 --- a/app/design/frontend/rwd/default/template/page/html/header.phtml +++ b/app/design/frontend/rwd/default/template/page/html/header.phtml @@ -39,7 +39,6 @@
-
-
getChildHtml('minicart_head'); ?>
- -
-
getChildHtml('topMenu') ?>
-
getChildHtml('topSearch') ?>
-
getChildHtml('topLinks') ?>
From d2e1530686ddc047838527638f04828e61f8712f Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 17:14:46 +0100 Subject: [PATCH 14/15] removed more styles --- skin/frontend/rwd/default/css/styles.css | 6 ------ skin/frontend/rwd/default/scss/layout/_header.scss | 7 ------- 2 files changed, 13 deletions(-) diff --git a/skin/frontend/rwd/default/css/styles.css b/skin/frontend/rwd/default/css/styles.css index 5d63ddcc00b..280a5fefdd2 100644 --- a/skin/frontend/rwd/default/css/styles.css +++ b/skin/frontend/rwd/default/css/styles.css @@ -3240,12 +3240,6 @@ body { max-width: 300px; min-height: 90px; } - .logo .small { - display: none; - } - .logo .large { - display: block; - } } /* ============================================ * * Skip Links diff --git a/skin/frontend/rwd/default/scss/layout/_header.scss b/skin/frontend/rwd/default/scss/layout/_header.scss index c11d4c55b21..5c2b8633d02 100644 --- a/skin/frontend/rwd/default/scss/layout/_header.scss +++ b/skin/frontend/rwd/default/scss/layout/_header.scss @@ -130,13 +130,6 @@ .logo { max-width: 300px; min-height: 90px; - - .small { - display: none; - } - .large { - display: block; - } } } From 5d2ef88abc1c076740e395615b08a2815fe6b705 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 21 Apr 2023 17:31:59 +0100 Subject: [PATCH 15/15] deprecated method getLogoSrcSmall --- app/code/core/Mage/Page/Block/Html/Header.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/core/Mage/Page/Block/Html/Header.php b/app/code/core/Mage/Page/Block/Html/Header.php index f983fc607e5..e073473604a 100644 --- a/app/code/core/Mage/Page/Block/Html/Header.php +++ b/app/code/core/Mage/Page/Block/Html/Header.php @@ -64,6 +64,7 @@ public function getLogoSrc() /** * @return string + * @deprecated Use SVG or srcset */ public function getLogoSrcSmall() {