Version Notes
1.2.0
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Interface_Frontend_Blank |
| Version | 1.2.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.1.8 to 1.2.0
- app/design/frontend/blank/default/layout/catalogsearch.xml +1 -0
- app/design/frontend/blank/default/layout/core.xml +3 -0
- app/design/frontend/blank/default/layout/directory.xml +13 -0
- app/design/frontend/blank/default/layout/downloadable.xml +167 -0
- app/design/frontend/blank/default/layout/googleoptimizer.xml +153 -0
- app/design/frontend/blank/default/template/bundle/catalog/product/price.phtml +164 -3
- app/design/frontend/blank/default/template/bundle/catalog/product/view/price.phtml +39 -0
- app/design/frontend/blank/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml +1 -1
- app/design/frontend/blank/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +1 -1
- app/design/frontend/blank/default/template/bundle/email/order/items/creditmemo/default.phtml +73 -6
- app/design/frontend/blank/default/template/bundle/email/order/items/invoice/default.phtml +73 -6
- app/design/frontend/blank/default/template/bundle/email/order/items/order/default.phtml +74 -7
- app/design/frontend/blank/default/template/bundle/sales/order/creditmemo/items/renderer.phtml +179 -26
- app/design/frontend/blank/default/template/bundle/sales/order/invoice/items/renderer.phtml +227 -28
- app/design/frontend/blank/default/template/bundle/sales/order/items/renderer.phtml +226 -28
- app/design/frontend/blank/default/template/callouts/left_col.phtml +1 -1
- app/design/frontend/blank/default/template/callouts/right_col.phtml +1 -1
- app/design/frontend/blank/default/template/catalog/category/view.phtml +1 -1
- app/design/frontend/blank/default/template/catalog/product/list.phtml +4 -4
- app/design/frontend/blank/default/template/catalog/product/price.phtml +239 -25
- app/design/frontend/blank/default/template/catalog/product/view/media.phtml +2 -2
- app/design/frontend/blank/default/template/catalog/product/view/tierprices.phtml +138 -7
- app/design/frontend/blank/default/template/catalogsearch/advanced/form.phtml +1 -1
- app/design/frontend/blank/default/template/checkout/cart/item/default.phtml +172 -6
- app/design/frontend/blank/default/template/checkout/cart/sidebar/default.phtml +78 -6
- app/design/frontend/blank/default/template/checkout/multishipping/billing.phtml +1 -1
- app/design/frontend/blank/default/template/checkout/multishipping/overview.phtml +4 -4
- app/design/frontend/blank/default/template/checkout/multishipping/shipping.phtml +1 -1
- app/design/frontend/blank/default/template/checkout/multishipping/success.phtml +1 -0
- app/design/frontend/blank/default/template/checkout/onepage/billing.phtml +1 -1
- app/design/frontend/blank/default/template/checkout/onepage/progress.phtml +4 -4
- app/design/frontend/blank/default/template/checkout/onepage/review/item.phtml +178 -4
- app/design/frontend/blank/default/template/checkout/success.phtml +4 -1
- app/design/frontend/blank/default/template/checkout/total/tax.phtml +8 -3
- app/design/frontend/blank/default/template/contacts/form.phtml +2 -2
- app/design/frontend/blank/default/template/core/formkey.phtml +27 -0
- app/design/frontend/blank/default/template/customer/address/edit.phtml +3 -2
- app/design/frontend/blank/default/template/customer/form/address.phtml +2 -2
- app/design/frontend/blank/default/template/customer/form/edit.phtml +2 -1
- app/design/frontend/blank/default/template/customer/form/newsletter.phtml +1 -0
- app/design/frontend/blank/default/template/customer/form/register.phtml +3 -3
- app/design/frontend/blank/default/template/customer/widget/dob.phtml +3 -3
- app/design/frontend/blank/default/template/downloadable/catalog/product/links.phtml +111 -0
- app/design/frontend/blank/default/template/downloadable/catalog/product/samples.phtml +45 -0
- app/design/frontend/blank/default/template/downloadable/catalog/product/type.phtml +45 -0
- app/design/frontend/blank/default/template/downloadable/checkout/cart/item/default.phtml +103 -0
- app/design/frontend/blank/default/template/downloadable/checkout/multishipping/item/downloadable.phtml +57 -0
- app/design/frontend/blank/default/template/downloadable/checkout/onepage/review/item.phtml +72 -0
- app/design/frontend/blank/default/template/downloadable/checkout/success.phtml +29 -0
- app/design/frontend/blank/default/template/downloadable/customer/products/list.phtml +62 -0
- app/design/frontend/blank/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +128 -0
- app/design/frontend/blank/default/template/downloadable/email/order/items/invoice/downloadable.phtml +131 -0
- app/design/frontend/blank/default/template/downloadable/email/order/items/order/downloadable.phtml +137 -0
- app/design/frontend/blank/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +113 -0
- app/design/frontend/blank/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +110 -0
- app/design/frontend/blank/default/template/downloadable/sales/order/items/renderer.phtml +130 -0
- app/design/frontend/blank/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +132 -0
- app/design/frontend/blank/default/template/email/order/items/creditmemo/default.phtml +74 -7
- app/design/frontend/blank/default/template/email/order/items/invoice/default.phtml +74 -7
- app/design/frontend/blank/default/template/email/order/items/order/default.phtml +74 -7
- app/design/frontend/blank/default/template/googlecheckout/link.phtml +5 -1
- app/design/frontend/blank/default/template/page/html/head.phtml +1 -0
- app/design/frontend/blank/default/template/paypal/express/review.phtml +5 -5
- app/design/frontend/blank/default/template/paypal/express/review/details.phtml +12 -12
- app/design/frontend/blank/default/template/sales/order/creditmemo/items/renderer/default.phtml +207 -9
- app/design/frontend/blank/default/template/sales/order/invoice/items/renderer/default.phtml +206 -8
- app/design/frontend/blank/default/template/sales/order/items/renderer/default.phtml +206 -8
- app/design/frontend/blank/default/template/sales/order/print/tax.phtml +8 -2
- app/design/frontend/blank/default/template/sales/order/tax.phtml +7 -2
- app/design/frontend/blank/default/template/shipping/tracking/popup.phtml +1 -1
- app/design/frontend/blank/default/template/tag/customer/edit.phtml +1 -1
- app/design/frontend/blank/default/template/tag/list.phtml +1 -1
- app/design/frontend/blank/default/template/wishlist/sharing.phtml +4 -3
- app/design/frontend/blank/default/template/wishlist/view.phtml +1 -0
- package.xml +6 -6
- skin/frontend/blank/default/css/styles.css +14 -15
- skin/frontend/blank/default/js/bundle.js +21 -4
app/design/frontend/blank/default/layout/catalogsearch.xml
CHANGED
|
@@ -45,6 +45,7 @@
|
|
| 45 |
<action method="setTemplate"><template>page/3columns.phtml</template></action>
|
| 46 |
</reference>
|
| 47 |
<reference name="left">
|
|
|
|
| 48 |
<block type="newsletter/subscribe" name="left.newsletter" template="newsletter/subscribe.phtml"/>
|
| 49 |
</reference>
|
| 50 |
<reference name="content">
|
| 45 |
<action method="setTemplate"><template>page/3columns.phtml</template></action>
|
| 46 |
</reference>
|
| 47 |
<reference name="left">
|
| 48 |
+
<block type="catalogsearch/layer" name="catalogsearch.leftnav" after="currency" template="catalog/layer/view.phtml"/>
|
| 49 |
<block type="newsletter/subscribe" name="left.newsletter" template="newsletter/subscribe.phtml"/>
|
| 50 |
</reference>
|
| 51 |
<reference name="content">
|
app/design/frontend/blank/default/layout/core.xml
CHANGED
|
@@ -27,4 +27,7 @@
|
|
| 27 |
|
| 28 |
-->
|
| 29 |
<layout version="0.1.0">
|
|
|
|
|
|
|
|
|
|
| 30 |
</layout>
|
| 27 |
|
| 28 |
-->
|
| 29 |
<layout version="0.1.0">
|
| 30 |
+
<default>
|
| 31 |
+
<block name="formkey" type="core/template" template="core/formkey.phtml" />
|
| 32 |
+
</default>
|
| 33 |
</layout>
|
app/design/frontend/blank/default/layout/directory.xml
CHANGED
|
@@ -57,4 +57,17 @@ Catalog Search layout
|
|
| 57 |
<block type="directory/currency" name="right_currency" before="-" template="directory/currency.phtml"/>
|
| 58 |
</reference>
|
| 59 |
</catalogsearch_advanced_index>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 60 |
</layout>
|
| 57 |
<block type="directory/currency" name="right_currency" before="-" template="directory/currency.phtml"/>
|
| 58 |
</reference>
|
| 59 |
</catalogsearch_advanced_index>
|
| 60 |
+
|
| 61 |
+
<catalogsearch_result_index>
|
| 62 |
+
<reference name="left">
|
| 63 |
+
<block type="directory/currency" name="currency" before="-" template="directory/currency.phtml"/>
|
| 64 |
+
</reference>
|
| 65 |
+
</catalogsearch_result_index>
|
| 66 |
+
|
| 67 |
+
<catalogsearch_advanced_result>
|
| 68 |
+
<reference name="right">
|
| 69 |
+
<block type="directory/currency" name="right_currency" before="-" template="directory/currency.phtml"/>
|
| 70 |
+
</reference>
|
| 71 |
+
</catalogsearch_advanced_result>
|
| 72 |
+
|
| 73 |
</layout>
|
app/design/frontend/blank/default/layout/downloadable.xml
ADDED
|
@@ -0,0 +1,167 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<!--
|
| 3 |
+
/**
|
| 4 |
+
* Magento
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* DISCLAIMER
|
| 17 |
+
*
|
| 18 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 19 |
+
* versions in the future. If you wish to customize Magento for your
|
| 20 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 21 |
+
*
|
| 22 |
+
* @category design_default
|
| 23 |
+
* @package Mage_Downloadable
|
| 24 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 25 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
+
*/
|
| 27 |
+
|
| 28 |
+
-->
|
| 29 |
+
<layout version="0.1.0">
|
| 30 |
+
|
| 31 |
+
<customer_account>
|
| 32 |
+
<reference name="customer_account_navigation">
|
| 33 |
+
<action method="addLink" translate="label" module="downloadable"><name>downloadable_products</name><path>downloadable/customer/products</path><label>My Downloadable Products</label></action>
|
| 34 |
+
</reference>
|
| 35 |
+
</customer_account>
|
| 36 |
+
|
| 37 |
+
<downloadable_customer_products>
|
| 38 |
+
<update handle="customer_account"/>
|
| 39 |
+
<reference name="content">
|
| 40 |
+
<block type="downloadable/customer_products_list" name="downloadable_customer_products_list" template="downloadable/customer/products/list.phtml" />
|
| 41 |
+
</reference>
|
| 42 |
+
<reference name="root">
|
| 43 |
+
<action method="setHeaderTitle" translate="title" module="downloadable"><title>My Downloadable Products</title></action>
|
| 44 |
+
</reference>
|
| 45 |
+
</downloadable_customer_products>
|
| 46 |
+
|
| 47 |
+
<checkout_cart_index>
|
| 48 |
+
<reference name="checkout.cart">
|
| 49 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/cart/item/default.phtml</template></action>
|
| 50 |
+
</reference>
|
| 51 |
+
</checkout_cart_index>
|
| 52 |
+
|
| 53 |
+
<checkout_onepage_review>
|
| 54 |
+
<reference name="root">
|
| 55 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/onepage/review/item.phtml</template></action>
|
| 56 |
+
</reference>
|
| 57 |
+
</checkout_onepage_review>
|
| 58 |
+
|
| 59 |
+
<checkout_onepage_success>
|
| 60 |
+
<reference name="checkout.success">
|
| 61 |
+
<block type="downloadable/checkout_success" name="downloadable.checkout.success" template="downloadable/checkout/success.phtml"/>
|
| 62 |
+
</reference>
|
| 63 |
+
</checkout_onepage_success>
|
| 64 |
+
|
| 65 |
+
<checkout_multishipping_addresses>
|
| 66 |
+
<reference name="checkout_addresses">
|
| 67 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/multishipping/item/downloadable.phtml</template></action>
|
| 68 |
+
</reference>
|
| 69 |
+
</checkout_multishipping_addresses>
|
| 70 |
+
|
| 71 |
+
<checkout_multishipping_shipping>
|
| 72 |
+
<reference name="checkout_billing_items">
|
| 73 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/multishipping/item/downloadable.phtml</template></action>
|
| 74 |
+
</reference>
|
| 75 |
+
</checkout_multishipping_shipping>
|
| 76 |
+
|
| 77 |
+
<checkout_multishipping_overview>
|
| 78 |
+
<reference name="checkout_overview">
|
| 79 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/multishipping/item/downloadable.phtml</template></action>
|
| 80 |
+
</reference>
|
| 81 |
+
</checkout_multishipping_overview>
|
| 82 |
+
|
| 83 |
+
<checkout_multishipping_success>
|
| 84 |
+
<reference name="checkout_success">
|
| 85 |
+
<block type="downloadable/checkout_success" name="downloadable.checkout.success" template="downloadable/checkout/success.phtml"/>
|
| 86 |
+
</reference>
|
| 87 |
+
</checkout_multishipping_success>
|
| 88 |
+
|
| 89 |
+
<sales_order_view>
|
| 90 |
+
<reference name="order_items">
|
| 91 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/items/renderer/downloadable.phtml</template></action>
|
| 92 |
+
</reference>
|
| 93 |
+
</sales_order_view>
|
| 94 |
+
|
| 95 |
+
<sales_order_invoice>
|
| 96 |
+
<reference name="invoice_items">
|
| 97 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/invoice/items/renderer/downloadable.phtml</template></action>
|
| 98 |
+
</reference>
|
| 99 |
+
</sales_order_invoice>
|
| 100 |
+
|
| 101 |
+
<sales_order_creditmemo>
|
| 102 |
+
<reference name="creditmemo_items">
|
| 103 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml</template></action>
|
| 104 |
+
</reference>
|
| 105 |
+
</sales_order_creditmemo>
|
| 106 |
+
|
| 107 |
+
<!--
|
| 108 |
+
Print pages
|
| 109 |
+
-->
|
| 110 |
+
|
| 111 |
+
<sales_order_print>
|
| 112 |
+
<reference name="sales.order.print">
|
| 113 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/items/renderer/downloadable.phtml</template></action>
|
| 114 |
+
</reference>
|
| 115 |
+
</sales_order_print>
|
| 116 |
+
|
| 117 |
+
<sales_order_printinvoice>
|
| 118 |
+
<reference name="sales.order.print.invoice">
|
| 119 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/invoice/items/renderer/downloadable.phtml</template></action>
|
| 120 |
+
</reference>
|
| 121 |
+
</sales_order_printinvoice>
|
| 122 |
+
|
| 123 |
+
<sales_order_printcreditmemo>
|
| 124 |
+
<reference name="sales.order.print.creditmemo">
|
| 125 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml</template></action>
|
| 126 |
+
</reference>
|
| 127 |
+
</sales_order_printcreditmemo>
|
| 128 |
+
|
| 129 |
+
<!--
|
| 130 |
+
EOF Print pages
|
| 131 |
+
-->
|
| 132 |
+
|
| 133 |
+
<!--
|
| 134 |
+
Emails
|
| 135 |
+
-->
|
| 136 |
+
|
| 137 |
+
<sales_email_order_items>
|
| 138 |
+
<reference name="items">
|
| 139 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_email_items_order_downloadable</block><template>downloadable/email/order/items/order/downloadable.phtml</template></action>
|
| 140 |
+
</reference>
|
| 141 |
+
</sales_email_order_items>
|
| 142 |
+
|
| 143 |
+
<sales_email_order_invoice_items>
|
| 144 |
+
<reference name="items">
|
| 145 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_email_items_downloadable</block><template>downloadable/email/order/items/invoice/downloadable.phtml</template></action>
|
| 146 |
+
</reference>
|
| 147 |
+
</sales_email_order_invoice_items>
|
| 148 |
+
|
| 149 |
+
<sales_email_order_creditmemo_items>
|
| 150 |
+
<reference name="items">
|
| 151 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_email_items_downloadable</block><template>downloadable/email/order/items/creditmemo/downloadable.phtml</template></action>
|
| 152 |
+
</reference>
|
| 153 |
+
</sales_email_order_creditmemo_items>
|
| 154 |
+
|
| 155 |
+
<PRODUCT_TYPE_downloadable>
|
| 156 |
+
<reference name="product.info">
|
| 157 |
+
<block type="downloadable/catalog_product_view_type" name="product.info.downloadable" as="product_type_data" template="downloadable/catalog/product/type.phtml">
|
| 158 |
+
<block type="downloadable/catalog_product_samples" name="product.info.downloadable.samples" as="samples" template="downloadable/catalog/product/samples.phtml"/>
|
| 159 |
+
</block>
|
| 160 |
+
</reference>
|
| 161 |
+
<reference name="product.info.options.wrapper">
|
| 162 |
+
<block type="downloadable/catalog_product_links" name="product.info.downloadable.options" as="type_downloadable_options" before="-" template="downloadable/catalog/product/links.phtml"/>
|
| 163 |
+
<action method="insert"><block>product.info.downloadable.options</block></action>
|
| 164 |
+
</reference>
|
| 165 |
+
</PRODUCT_TYPE_downloadable>
|
| 166 |
+
|
| 167 |
+
</layout>
|
app/design/frontend/blank/default/layout/googleoptimizer.xml
ADDED
|
@@ -0,0 +1,153 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<!--
|
| 3 |
+
/**
|
| 4 |
+
* Magento
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* DISCLAIMER
|
| 17 |
+
*
|
| 18 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 19 |
+
* versions in the future. If you wish to customize Magento for your
|
| 20 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 21 |
+
*
|
| 22 |
+
* @category design_default
|
| 23 |
+
* @package Mage
|
| 24 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 25 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 26 |
+
*/
|
| 27 |
+
-->
|
| 28 |
+
<layout version="0.1.0">
|
| 29 |
+
|
| 30 |
+
<!--
|
| 31 |
+
Product view
|
| 32 |
+
-->
|
| 33 |
+
|
| 34 |
+
<catalog_product_view>
|
| 35 |
+
<reference name="head">
|
| 36 |
+
<block type="googleoptimizer/code_product" before="-" name="googleoptimizer.control.script">
|
| 37 |
+
<action method="setScriptType"><scriptType>control_script</scriptType></action>
|
| 38 |
+
</block>
|
| 39 |
+
</reference>
|
| 40 |
+
<reference name="before_body_end">
|
| 41 |
+
<block type="googleoptimizer/code_product" after="-" name="googleoptimizer.tracking.script">
|
| 42 |
+
<action method="setScriptType"><scriptType>tracking_script</scriptType></action>
|
| 43 |
+
</block>
|
| 44 |
+
</reference>
|
| 45 |
+
</catalog_product_view>
|
| 46 |
+
|
| 47 |
+
<catalog_category_default>
|
| 48 |
+
<reference name="head">
|
| 49 |
+
<block type="googleoptimizer/code_category" before="-" name="googleoptimizer.control.script">
|
| 50 |
+
<action method="setScriptType"><scriptType>control_script</scriptType></action>
|
| 51 |
+
</block>
|
| 52 |
+
</reference>
|
| 53 |
+
<reference name="before_body_end">
|
| 54 |
+
<block type="googleoptimizer/code_category" after="-" name="googleoptimizer.tracking.script">
|
| 55 |
+
<action method="setScriptType"><scriptType>tracking_script</scriptType></action>
|
| 56 |
+
</block>
|
| 57 |
+
</reference>
|
| 58 |
+
</catalog_category_default>
|
| 59 |
+
|
| 60 |
+
<catalog_category_layered>
|
| 61 |
+
<reference name="head">
|
| 62 |
+
<block type="googleoptimizer/code_category" before="-" name="googleoptimizer.control.script">
|
| 63 |
+
<action method="setScriptType"><scriptType>control_script</scriptType></action>
|
| 64 |
+
</block>
|
| 65 |
+
</reference>
|
| 66 |
+
<reference name="before_body_end">
|
| 67 |
+
<block type="googleoptimizer/code_category" after="-" name="googleoptimizer.tracking.script">
|
| 68 |
+
<action method="setScriptType"><scriptType>tracking_script</scriptType></action>
|
| 69 |
+
</block>
|
| 70 |
+
</reference>
|
| 71 |
+
</catalog_category_layered>
|
| 72 |
+
|
| 73 |
+
<cms_page>
|
| 74 |
+
<reference name="head">
|
| 75 |
+
<block type="googleoptimizer/code_page" before="-" name="googleoptimizer.control.script">
|
| 76 |
+
<action method="setScriptType"><scriptType>control_script</scriptType></action>
|
| 77 |
+
</block>
|
| 78 |
+
</reference>
|
| 79 |
+
<reference name="before_body_end">
|
| 80 |
+
<block type="googleoptimizer/code_page" after="-" name="googleoptimizer.tracking.script">
|
| 81 |
+
<action method="setScriptType"><scriptType>tracking_script</scriptType></action>
|
| 82 |
+
</block>
|
| 83 |
+
</reference>
|
| 84 |
+
</cms_page>
|
| 85 |
+
|
| 86 |
+
<cms_page>
|
| 87 |
+
<reference name="head">
|
| 88 |
+
<block type="googleoptimizer/code_page" before="-" name="googleoptimizer.control.script">
|
| 89 |
+
<action method="setScriptType"><scriptType>control_script</scriptType></action>
|
| 90 |
+
</block>
|
| 91 |
+
</reference>
|
| 92 |
+
<reference name="before_body_end">
|
| 93 |
+
<block type="googleoptimizer/code_page" after="-" name="googleoptimizer.tracking.script">
|
| 94 |
+
<action method="setScriptType"><scriptType>tracking_script</scriptType></action>
|
| 95 |
+
</block>
|
| 96 |
+
</reference>
|
| 97 |
+
</cms_page>
|
| 98 |
+
|
| 99 |
+
<checkout_cart_index>
|
| 100 |
+
<reference name="before_body_end">
|
| 101 |
+
<block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
|
| 102 |
+
<action method="setScriptType"><scriptType>conversion_script</scriptType></action>
|
| 103 |
+
<action method="setPageType"><pageType>checkout_cart</pageType></action>
|
| 104 |
+
</block>
|
| 105 |
+
</reference>
|
| 106 |
+
</checkout_cart_index>
|
| 107 |
+
|
| 108 |
+
<checkout_onepage_index>
|
| 109 |
+
<reference name="before_body_end">
|
| 110 |
+
<block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
|
| 111 |
+
<action method="setScriptType"><scriptType>conversion_script</scriptType></action>
|
| 112 |
+
<action method="setPageType"><pageType>checkout_onepage</pageType></action>
|
| 113 |
+
</block>
|
| 114 |
+
</reference>
|
| 115 |
+
</checkout_onepage_index>
|
| 116 |
+
|
| 117 |
+
<checkout_onepage_success>
|
| 118 |
+
<reference name="before_body_end">
|
| 119 |
+
<block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
|
| 120 |
+
<action method="setScriptType"><scriptType>conversion_script</scriptType></action>
|
| 121 |
+
<action method="setPageType"><pageType>checkout_onepage_success</pageType></action>
|
| 122 |
+
</block>
|
| 123 |
+
</reference>
|
| 124 |
+
</checkout_onepage_success>
|
| 125 |
+
|
| 126 |
+
<checkout_multishipping_success>
|
| 127 |
+
<reference name="before_body_end">
|
| 128 |
+
<block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
|
| 129 |
+
<action method="setScriptType"><scriptType>conversion_script</scriptType></action>
|
| 130 |
+
<action method="setPageType"><pageType>checkout_multishipping_success</pageType></action>
|
| 131 |
+
</block>
|
| 132 |
+
</reference>
|
| 133 |
+
</checkout_multishipping_success>
|
| 134 |
+
|
| 135 |
+
<checkout_multishipping>
|
| 136 |
+
<reference name="before_body_end">
|
| 137 |
+
<block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
|
| 138 |
+
<action method="setScriptType"><scriptType>conversion_script</scriptType></action>
|
| 139 |
+
<action method="setPageType"><pageType>checkout_multishipping</pageType></action>
|
| 140 |
+
</block>
|
| 141 |
+
</reference>
|
| 142 |
+
</checkout_multishipping>
|
| 143 |
+
|
| 144 |
+
<customer_account_create>
|
| 145 |
+
<reference name="before_body_end">
|
| 146 |
+
<block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
|
| 147 |
+
<action method="setScriptType"><scriptType>conversion_script</scriptType></action>
|
| 148 |
+
<action method="setPageType"><pageType>customer_account_create</pageType></action>
|
| 149 |
+
</block>
|
| 150 |
+
</reference>
|
| 151 |
+
</customer_account_create>
|
| 152 |
+
|
| 153 |
+
</layout>
|
app/design/frontend/blank/default/template/bundle/catalog/product/price.phtml
CHANGED
|
@@ -28,9 +28,28 @@
|
|
| 28 |
<?php list($_minimalPrice, $_maximalPrice) = $_product->getPriceModel()->getPrices($_product) ?>
|
| 29 |
<?php $_id = $_product->getId() ?>
|
| 30 |
|
|
|
|
|
|
|
| 31 |
<?php $_minimalPriceTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice); ?>
|
| 32 |
<?php $_minimalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice, true); ?>
|
| 33 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
<div class="price-box">
|
| 35 |
<?php if ($_product->getPriceView()): ?>
|
| 36 |
<p class="minimal-price">
|
|
@@ -40,15 +59,47 @@
|
|
| 40 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 41 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 42 |
</span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
<span class="price-including-tax">
|
| 44 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 45 |
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 46 |
</span>
|
| 47 |
-
</p>
|
| 48 |
<?php else: ?>
|
| 49 |
-
|
| 50 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
<?php endif; ?>
|
|
|
|
| 52 |
<?php else: ?>
|
| 53 |
<?php if ($_minimalPrice <> $_maximalPrice): ?>
|
| 54 |
<p class="price-from">
|
|
@@ -58,16 +109,60 @@
|
|
| 58 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 59 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 60 |
</span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 61 |
<span class="price-including-tax">
|
| 62 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 63 |
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 64 |
</span>
|
| 65 |
<?php else: ?>
|
| 66 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 67 |
<?php endif; ?>
|
| 68 |
</p>
|
| 69 |
<?php $_maximalPriceTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice); ?>
|
| 70 |
<?php $_maximalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice, true); ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
<p class="price-to">
|
| 72 |
<span class="price-label"><?php echo $this->__('To') ?>:</span>
|
| 73 |
<?php if ($this->helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
|
|
@@ -75,12 +170,45 @@
|
|
| 75 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 76 |
<?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
|
| 77 |
</span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 78 |
<span class="price-including-tax">
|
| 79 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax') ?></span>
|
| 80 |
<?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
|
| 81 |
</span>
|
| 82 |
<?php else: ?>
|
| 83 |
<?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 84 |
<?php endif; ?>
|
| 85 |
</p>
|
| 86 |
<?php else: ?>
|
|
@@ -89,12 +217,45 @@
|
|
| 89 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 90 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 91 |
</span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 92 |
<span class="price-including-tax">
|
| 93 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 94 |
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 95 |
</span>
|
| 96 |
<?php else: ?>
|
| 97 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 98 |
<?php endif; ?>
|
| 99 |
<?php endif; ?>
|
| 100 |
<?php endif; ?>
|
| 28 |
<?php list($_minimalPrice, $_maximalPrice) = $_product->getPriceModel()->getPrices($_product) ?>
|
| 29 |
<?php $_id = $_product->getId() ?>
|
| 30 |
|
| 31 |
+
<?php $_weeeTaxAmount = 0; ?>
|
| 32 |
+
|
| 33 |
<?php $_minimalPriceTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice); ?>
|
| 34 |
<?php $_minimalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice, true); ?>
|
| 35 |
|
| 36 |
+
<?php
|
| 37 |
+
if ($_product->getPriceType() == 1) {
|
| 38 |
+
$_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
|
| 39 |
+
if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
|
| 40 |
+
$_minimalPriceTax += $_weeeTaxAmount;
|
| 41 |
+
$_minimalPriceInclTax += $_weeeTaxAmount;
|
| 42 |
+
}
|
| 43 |
+
if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
|
| 44 |
+
$_minimalPriceInclTax += $_weeeTaxAmount;
|
| 45 |
+
}
|
| 46 |
+
|
| 47 |
+
if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
|
| 48 |
+
$_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
|
| 49 |
+
}
|
| 50 |
+
}
|
| 51 |
+
?>
|
| 52 |
+
|
| 53 |
<div class="price-box">
|
| 54 |
<?php if ($_product->getPriceView()): ?>
|
| 55 |
<p class="minimal-price">
|
| 59 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 60 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 61 |
</span>
|
| 62 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 63 |
+
<span class="weee">(<small>
|
| 64 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 65 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 66 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 67 |
+
<?php else: ?>
|
| 68 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 69 |
+
<?php endif; ?>
|
| 70 |
+
|
| 71 |
+
<?php echo $_weeeSeparator; ?>
|
| 72 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 73 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 74 |
+
<?php endforeach; ?>
|
| 75 |
+
</small>)</span>
|
| 76 |
+
<?php endif; ?>
|
| 77 |
<span class="price-including-tax">
|
| 78 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 79 |
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 80 |
</span>
|
|
|
|
| 81 |
<?php else: ?>
|
| 82 |
+
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 83 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 84 |
+
<span class="weee">(<small>
|
| 85 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 86 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 87 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 88 |
+
<?php else: ?>
|
| 89 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 90 |
+
<?php endif; ?>
|
| 91 |
+
|
| 92 |
+
<?php echo $_weeeSeparator; ?>
|
| 93 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 94 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 95 |
+
<?php endforeach; ?>
|
| 96 |
+
</small>)</span>
|
| 97 |
+
<?php endif; ?>
|
| 98 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
|
| 99 |
+
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 100 |
+
<?php endif; ?>
|
| 101 |
<?php endif; ?>
|
| 102 |
+
</p>
|
| 103 |
<?php else: ?>
|
| 104 |
<?php if ($_minimalPrice <> $_maximalPrice): ?>
|
| 105 |
<p class="price-from">
|
| 109 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 110 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 111 |
</span>
|
| 112 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 113 |
+
<span class="weee">(<small>
|
| 114 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 115 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 116 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 117 |
+
<?php else: ?>
|
| 118 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 119 |
+
<?php endif; ?>
|
| 120 |
+
|
| 121 |
+
<?php echo $_weeeSeparator; ?>
|
| 122 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 123 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 124 |
+
<?php endforeach; ?>
|
| 125 |
+
</small>)</span>
|
| 126 |
+
<?php endif; ?>
|
| 127 |
<span class="price-including-tax">
|
| 128 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 129 |
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 130 |
</span>
|
| 131 |
<?php else: ?>
|
| 132 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 133 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 134 |
+
<span class="weee">(<small>
|
| 135 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 136 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 137 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 138 |
+
<?php else: ?>
|
| 139 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 140 |
+
<?php endif; ?>
|
| 141 |
+
|
| 142 |
+
<?php echo $_weeeSeparator; ?>
|
| 143 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 144 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 145 |
+
<?php endforeach; ?>
|
| 146 |
+
</small>)</span>
|
| 147 |
+
<?php endif; ?>
|
| 148 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
|
| 149 |
+
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 150 |
+
<?php endif; ?>
|
| 151 |
<?php endif; ?>
|
| 152 |
</p>
|
| 153 |
<?php $_maximalPriceTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice); ?>
|
| 154 |
<?php $_maximalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice, true); ?>
|
| 155 |
+
<?php
|
| 156 |
+
if ($_product->getPriceType() == 1) {
|
| 157 |
+
if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
|
| 158 |
+
$_maximalPriceTax += $_weeeTaxAmount;
|
| 159 |
+
$_maximalPriceInclTax += $_weeeTaxAmount;
|
| 160 |
+
}
|
| 161 |
+
if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
|
| 162 |
+
$_maximalPriceInclTax += $_weeeTaxAmount;
|
| 163 |
+
}
|
| 164 |
+
}
|
| 165 |
+
?>
|
| 166 |
<p class="price-to">
|
| 167 |
<span class="price-label"><?php echo $this->__('To') ?>:</span>
|
| 168 |
<?php if ($this->helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
|
| 170 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 171 |
<?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
|
| 172 |
</span>
|
| 173 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 174 |
+
<span class="weee">(<small>
|
| 175 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 176 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 177 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 178 |
+
<?php else: ?>
|
| 179 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 180 |
+
<?php endif; ?>
|
| 181 |
+
|
| 182 |
+
<?php echo $_weeeSeparator; ?>
|
| 183 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 184 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 185 |
+
<?php endforeach; ?>
|
| 186 |
+
</small>)</span>
|
| 187 |
+
<?php endif; ?>
|
| 188 |
<span class="price-including-tax">
|
| 189 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax') ?></span>
|
| 190 |
<?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
|
| 191 |
</span>
|
| 192 |
<?php else: ?>
|
| 193 |
<?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
|
| 194 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 195 |
+
<span class="weee">(<small>
|
| 196 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 197 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 198 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 199 |
+
<?php else: ?>
|
| 200 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 201 |
+
<?php endif; ?>
|
| 202 |
+
|
| 203 |
+
<?php echo $_weeeSeparator; ?>
|
| 204 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 205 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 206 |
+
<?php endforeach; ?>
|
| 207 |
+
</small>)</span>
|
| 208 |
+
<?php endif; ?>
|
| 209 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
|
| 210 |
+
<?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
|
| 211 |
+
<?php endif; ?>
|
| 212 |
<?php endif; ?>
|
| 213 |
</p>
|
| 214 |
<?php else: ?>
|
| 217 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 218 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 219 |
</span>
|
| 220 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 221 |
+
<span class="weee">(<small>
|
| 222 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 223 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 224 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 225 |
+
<?php else: ?>
|
| 226 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 227 |
+
<?php endif; ?>
|
| 228 |
+
|
| 229 |
+
<?php echo $_weeeSeparator; ?>
|
| 230 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 231 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 232 |
+
<?php endforeach; ?>
|
| 233 |
+
</small>)</span>
|
| 234 |
+
<?php endif; ?>
|
| 235 |
<span class="price-including-tax">
|
| 236 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 237 |
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 238 |
</span>
|
| 239 |
<?php else: ?>
|
| 240 |
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
|
| 241 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 242 |
+
<span class="weee">(<small>
|
| 243 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 244 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 245 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 246 |
+
<?php else: ?>
|
| 247 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 248 |
+
<?php endif; ?>
|
| 249 |
+
|
| 250 |
+
<?php echo $_weeeSeparator; ?>
|
| 251 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 252 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 253 |
+
<?php endforeach; ?>
|
| 254 |
+
</small>)</span>
|
| 255 |
+
<?php endif; ?>
|
| 256 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
|
| 257 |
+
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
|
| 258 |
+
<?php endif; ?>
|
| 259 |
<?php endif; ?>
|
| 260 |
<?php endif; ?>
|
| 261 |
<?php endif; ?>
|
app/design/frontend/blank/default/template/bundle/catalog/product/view/price.phtml
CHANGED
|
@@ -27,6 +27,15 @@
|
|
| 27 |
<?php $_product = $this->getProduct() ?>
|
| 28 |
<?php $_finalPrice = Mage::helper('tax')->getPrice($_product, $_product->getFinalPrice()); ?>
|
| 29 |
<?php $_finalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_product->getFinalPrice(), true); ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
|
| 31 |
<div class="price-box">
|
| 32 |
<p class="price-as-configured">
|
|
@@ -37,6 +46,21 @@
|
|
| 37 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 38 |
<span class="price" id="price-excluding-tax-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
|
| 39 |
</span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
<span class="price-including-tax">
|
| 41 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 42 |
<span class="price" id="price-including-tax-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
|
|
@@ -44,6 +68,21 @@
|
|
| 44 |
</span>
|
| 45 |
<?php else: ?>
|
| 46 |
<span class="price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 47 |
<?php endif; ?>
|
| 48 |
</p>
|
| 49 |
</div>
|
| 27 |
<?php $_product = $this->getProduct() ?>
|
| 28 |
<?php $_finalPrice = Mage::helper('tax')->getPrice($_product, $_product->getFinalPrice()); ?>
|
| 29 |
<?php $_finalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_product->getFinalPrice(), true); ?>
|
| 30 |
+
<?php $_weeeTaxAmount = 0; ?>
|
| 31 |
+
<?php
|
| 32 |
+
if ($_product->getPriceType() == 1) {
|
| 33 |
+
$_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
|
| 34 |
+
if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
|
| 35 |
+
$_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
|
| 36 |
+
}
|
| 37 |
+
}
|
| 38 |
+
?>
|
| 39 |
|
| 40 |
<div class="price-box">
|
| 41 |
<p class="price-as-configured">
|
| 46 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 47 |
<span class="price" id="price-excluding-tax-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
|
| 48 |
</span>
|
| 49 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 50 |
+
<span class="weee">(<small>
|
| 51 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 52 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 53 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 54 |
+
<?php else: ?>
|
| 55 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 56 |
+
<?php endif; ?>
|
| 57 |
+
|
| 58 |
+
<?php echo $_weeeSeparator; ?>
|
| 59 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 60 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 61 |
+
<?php endforeach; ?>
|
| 62 |
+
</small>)</span>
|
| 63 |
+
<?php endif; ?>
|
| 64 |
<span class="price-including-tax">
|
| 65 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 66 |
<span class="price" id="price-including-tax-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
|
| 68 |
</span>
|
| 69 |
<?php else: ?>
|
| 70 |
<span class="price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
|
| 71 |
+
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
|
| 72 |
+
<span class="weee">(<small>
|
| 73 |
+
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 74 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
|
| 75 |
+
<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
|
| 76 |
+
<?php else: ?>
|
| 77 |
+
<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
|
| 78 |
+
<?php endif; ?>
|
| 79 |
+
|
| 80 |
+
<?php echo $_weeeSeparator; ?>
|
| 81 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
|
| 82 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 83 |
+
<?php endforeach; ?>
|
| 84 |
+
</small>)</span>
|
| 85 |
+
<?php endif; ?>
|
| 86 |
<?php endif; ?>
|
| 87 |
</p>
|
| 88 |
</div>
|
app/design/frontend/blank/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
CHANGED
|
@@ -43,7 +43,7 @@
|
|
| 43 |
<?php $_canChangeQty = $_selections[0]->getSelectionCanChangeQty() ?>
|
| 44 |
<?php endif; ?>
|
| 45 |
<?php endif; ?>
|
| 46 |
-
<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input onkeyup="bundle.changeOptionQty(this)" <?php echo $_canChangeQty?'':'disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php echo $_canChangeQty?'':' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
|
| 47 |
</span>
|
| 48 |
<label><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<span class="required"> *</span>' ?></label>
|
| 49 |
</dt>
|
| 43 |
<?php $_canChangeQty = $_selections[0]->getSelectionCanChangeQty() ?>
|
| 44 |
<?php endif; ?>
|
| 45 |
<?php endif; ?>
|
| 46 |
+
<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php echo $_canChangeQty?'':'disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php echo $_canChangeQty?'':' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
|
| 47 |
</span>
|
| 48 |
<label><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<span class="required"> *</span>' ?></label>
|
| 49 |
</dt>
|
app/design/frontend/blank/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
CHANGED
|
@@ -42,7 +42,7 @@
|
|
| 42 |
<?php $_canChangeQty = $_selections[0]->getSelectionCanChangeQty() ?>
|
| 43 |
<?php endif; ?>
|
| 44 |
<?php endif; ?>
|
| 45 |
-
<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input onkeyup="bundle.changeOptionQty(this)" <?php echo $_canChangeQty?'':'disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php echo $_canChangeQty?'':' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
|
| 46 |
</span>
|
| 47 |
<label><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<span class="required"> *</span>' ?></label>
|
| 48 |
</dt>
|
| 42 |
<?php $_canChangeQty = $_selections[0]->getSelectionCanChangeQty() ?>
|
| 43 |
<?php endif; ?>
|
| 44 |
<?php endif; ?>
|
| 45 |
+
<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php echo $_canChangeQty?'':'disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php echo $_canChangeQty?'':' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
|
| 46 |
</span>
|
| 47 |
<label><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<span class="required"> *</span>' ?></label>
|
| 48 |
</dt>
|
app/design/frontend/blank/default/template/bundle/email/order/items/creditmemo/default.phtml
CHANGED
|
@@ -25,6 +25,7 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $parentItem = $this->getItem() ?>
|
|
|
|
| 28 |
|
| 29 |
<?php $items = $this->getChilds($parentItem) ?>
|
| 30 |
|
|
@@ -66,14 +67,80 @@
|
|
| 66 |
</td>
|
| 67 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 68 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
|
|
|
|
|
|
| 73 |
<?php else: ?>
|
| 74 |
-
<?php echo
|
| 75 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 76 |
<?php endif; ?>
|
|
|
|
| 77 |
<?php else: ?>
|
| 78 |
|
| 79 |
<?php endif; ?>
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $parentItem = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrder(); ?>
|
| 29 |
|
| 30 |
<?php $items = $this->getChilds($parentItem) ?>
|
| 31 |
|
| 67 |
</td>
|
| 68 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 69 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 70 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 71 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 72 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 73 |
+
<?php endif; ?>
|
| 74 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 75 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 76 |
<?php else: ?>
|
| 77 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 78 |
+
<?php endif; ?>
|
| 79 |
+
|
| 80 |
+
|
| 81 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 82 |
+
<br />
|
| 83 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 84 |
+
<small>
|
| 85 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 86 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 87 |
+
<?php endforeach; ?>
|
| 88 |
+
</small>
|
| 89 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 90 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 91 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 92 |
+
<?php endforeach; ?>
|
| 93 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 94 |
+
<small>
|
| 95 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 96 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 97 |
+
<?php endforeach; ?>
|
| 98 |
+
</small>
|
| 99 |
+
<?php endif; ?>
|
| 100 |
+
|
| 101 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 102 |
+
<br />
|
| 103 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 104 |
+
<?php endif; ?>
|
| 105 |
+
<?php endif; ?>
|
| 106 |
+
<?php endif; ?>
|
| 107 |
+
|
| 108 |
+
|
| 109 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 110 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 111 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 112 |
+
<?php endif; ?>
|
| 113 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 114 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 115 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 116 |
+
<?php else: ?>
|
| 117 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 118 |
+
<?php endif; ?>
|
| 119 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 120 |
+
<br />
|
| 121 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 122 |
+
<small>
|
| 123 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 124 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 125 |
+
<?php endforeach; ?>
|
| 126 |
+
</small>
|
| 127 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 128 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 129 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 130 |
+
<?php endforeach; ?>
|
| 131 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 132 |
+
<small>
|
| 133 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 134 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 135 |
+
<?php endforeach; ?>
|
| 136 |
+
</small>
|
| 137 |
+
<?php endif; ?>
|
| 138 |
+
|
| 139 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 140 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 141 |
+
<?php endif; ?>
|
| 142 |
<?php endif; ?>
|
| 143 |
+
<?php endif; ?>
|
| 144 |
<?php else: ?>
|
| 145 |
|
| 146 |
<?php endif; ?>
|
app/design/frontend/blank/default/template/bundle/email/order/items/invoice/default.phtml
CHANGED
|
@@ -28,6 +28,7 @@
|
|
| 28 |
<?php $parentItem = $this->getItem() ?>
|
| 29 |
<?php $items = $this->getChilds($parentItem) ?>
|
| 30 |
<?php $_index = 0 ?>
|
|
|
|
| 31 |
|
| 32 |
<?php $_prevOptionId = '' ?>
|
| 33 |
|
|
@@ -67,14 +68,80 @@
|
|
| 67 |
</td>
|
| 68 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 69 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
|
|
|
|
|
|
| 74 |
<?php else: ?>
|
| 75 |
-
<?php echo
|
| 76 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
<?php endif; ?>
|
|
|
|
| 78 |
<?php else: ?>
|
| 79 |
|
| 80 |
<?php endif; ?>
|
| 28 |
<?php $parentItem = $this->getItem() ?>
|
| 29 |
<?php $items = $this->getChilds($parentItem) ?>
|
| 30 |
<?php $_index = 0 ?>
|
| 31 |
+
<?php $_order = $this->getItem()->getOrder(); ?>
|
| 32 |
|
| 33 |
<?php $_prevOptionId = '' ?>
|
| 34 |
|
| 68 |
</td>
|
| 69 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 70 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 71 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 72 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 73 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 74 |
+
<?php endif; ?>
|
| 75 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 76 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 77 |
<?php else: ?>
|
| 78 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 79 |
+
<?php endif; ?>
|
| 80 |
+
|
| 81 |
+
|
| 82 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 83 |
+
<br />
|
| 84 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 85 |
+
<small>
|
| 86 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 87 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 88 |
+
<?php endforeach; ?>
|
| 89 |
+
</small>
|
| 90 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 91 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 92 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 93 |
+
<?php endforeach; ?>
|
| 94 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 95 |
+
<small>
|
| 96 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 97 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 98 |
+
<?php endforeach; ?>
|
| 99 |
+
</small>
|
| 100 |
+
<?php endif; ?>
|
| 101 |
+
|
| 102 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 103 |
+
<br />
|
| 104 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 105 |
+
<?php endif; ?>
|
| 106 |
+
<?php endif; ?>
|
| 107 |
+
<?php endif; ?>
|
| 108 |
+
|
| 109 |
+
|
| 110 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 111 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 112 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 113 |
+
<?php endif; ?>
|
| 114 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 115 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 116 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 117 |
+
<?php else: ?>
|
| 118 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 119 |
+
<?php endif; ?>
|
| 120 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 121 |
+
<br />
|
| 122 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 123 |
+
<small>
|
| 124 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 125 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 126 |
+
<?php endforeach; ?>
|
| 127 |
+
</small>
|
| 128 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 129 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 130 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 131 |
+
<?php endforeach; ?>
|
| 132 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 133 |
+
<small>
|
| 134 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 135 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 136 |
+
<?php endforeach; ?>
|
| 137 |
+
</small>
|
| 138 |
+
<?php endif; ?>
|
| 139 |
+
|
| 140 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 141 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 142 |
+
<?php endif; ?>
|
| 143 |
<?php endif; ?>
|
| 144 |
+
<?php endif; ?>
|
| 145 |
<?php else: ?>
|
| 146 |
|
| 147 |
<?php endif; ?>
|
app/design/frontend/blank/default/template/bundle/email/order/items/order/default.phtml
CHANGED
|
@@ -25,6 +25,7 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem() ?>
|
|
|
|
| 28 |
|
| 29 |
<?php $parentItem = $this->getItem() ?>
|
| 30 |
<?php $items = array_merge(array($parentItem), $parentItem->getChildrenItems()); ?>
|
|
@@ -67,13 +68,79 @@
|
|
| 67 |
</td>
|
| 68 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 69 |
<?php if (!$_item->getParentItem()): ?>
|
| 70 |
-
<?php if ($this->helper('tax')->
|
| 71 |
-
<?php
|
| 72 |
-
|
| 73 |
-
<?php
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
<?php endif; ?>
|
| 78 |
<?php else: ?>
|
| 79 |
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order=$this->getOrder() ?>
|
| 29 |
|
| 30 |
<?php $parentItem = $this->getItem() ?>
|
| 31 |
<?php $items = array_merge(array($parentItem), $parentItem->getChildrenItems()); ?>
|
| 68 |
</td>
|
| 69 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 70 |
<?php if (!$_item->getParentItem()): ?>
|
| 71 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 72 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 73 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 74 |
+
<?php endif; ?>
|
| 75 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 76 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 77 |
+
<?php else: ?>
|
| 78 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 79 |
+
<?php endif; ?>
|
| 80 |
+
|
| 81 |
+
|
| 82 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 83 |
+
<br />
|
| 84 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 85 |
+
<small>
|
| 86 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 87 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 88 |
+
<?php endforeach; ?>
|
| 89 |
+
</small>
|
| 90 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 91 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 92 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 93 |
+
<?php endforeach; ?>
|
| 94 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 95 |
+
<small>
|
| 96 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 97 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 98 |
+
<?php endforeach; ?>
|
| 99 |
+
</small>
|
| 100 |
+
<?php endif; ?>
|
| 101 |
+
|
| 102 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 103 |
+
<br />
|
| 104 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 105 |
+
<?php endif; ?>
|
| 106 |
+
<?php endif; ?>
|
| 107 |
+
<?php endif; ?>
|
| 108 |
+
|
| 109 |
+
|
| 110 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 111 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 112 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 113 |
+
<?php endif; ?>
|
| 114 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 115 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 116 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 117 |
+
<?php else: ?>
|
| 118 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 119 |
+
<?php endif; ?>
|
| 120 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 121 |
+
<br />
|
| 122 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 123 |
+
<small>
|
| 124 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 125 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 126 |
+
<?php endforeach; ?>
|
| 127 |
+
</small>
|
| 128 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 129 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 130 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 131 |
+
<?php endforeach; ?>
|
| 132 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 133 |
+
<small>
|
| 134 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 135 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 136 |
+
<?php endforeach; ?>
|
| 137 |
+
</small>
|
| 138 |
+
<?php endif; ?>
|
| 139 |
+
|
| 140 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 141 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 142 |
+
<?php endif; ?>
|
| 143 |
+
<?php endif; ?>
|
| 144 |
<?php endif; ?>
|
| 145 |
<?php else: ?>
|
| 146 |
|
app/design/frontend/blank/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
CHANGED
|
@@ -27,6 +27,7 @@
|
|
| 27 |
<?php $parentItem = $this->getItem() ?>
|
| 28 |
|
| 29 |
<?php $items = $this->getChilds($parentItem) ?>
|
|
|
|
| 30 |
<?php $_count = count ($items) ?>
|
| 31 |
<?php $_index = 0 ?>
|
| 32 |
|
|
@@ -65,22 +66,120 @@
|
|
| 65 |
<td><?php echo $_item->getSku() ?></td>
|
| 66 |
<td class="a-right">
|
| 67 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
|
|
|
| 72 |
<?php endif; ?>
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 77 |
-
<span class="price-incl-tax">
|
| 78 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 79 |
-
<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 80 |
<?php endif; ?>
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 84 |
<?php else: ?>
|
| 85 |
|
| 86 |
<?php endif; ?>
|
|
@@ -94,18 +193,72 @@
|
|
| 94 |
</td>
|
| 95 |
<td class="a-right">
|
| 96 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 97 |
-
|
| 98 |
-
|
| 99 |
-
|
| 100 |
-
|
|
|
|
| 101 |
<?php endif; ?>
|
| 102 |
-
|
| 103 |
-
|
| 104 |
-
|
| 105 |
-
|
| 106 |
-
|
| 107 |
-
|
| 108 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 109 |
<?php endif; ?>
|
| 110 |
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
|
| 111 |
</span>
|
|
@@ -123,7 +276,7 @@
|
|
| 123 |
</td>
|
| 124 |
<td class="last a-right">
|
| 125 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 126 |
-
<?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()) ?>
|
| 127 |
<?php else: ?>
|
| 128 |
|
| 129 |
<?php endif; ?>
|
| 27 |
<?php $parentItem = $this->getItem() ?>
|
| 28 |
|
| 29 |
<?php $items = $this->getChilds($parentItem) ?>
|
| 30 |
+
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
|
| 31 |
<?php $_count = count ($items) ?>
|
| 32 |
<?php $_index = 0 ?>
|
| 33 |
|
| 66 |
<td><?php echo $_item->getSku() ?></td>
|
| 67 |
<td class="a-right">
|
| 68 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 69 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 70 |
+
<span class="price-excl-tax">
|
| 71 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 72 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 73 |
+
<div class="cart-price">
|
| 74 |
<?php endif; ?>
|
| 75 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 76 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 77 |
+
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 78 |
<?php endif; ?>
|
| 79 |
+
<?php endif; ?>
|
| 80 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 81 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 82 |
+
<?php else: ?>
|
| 83 |
+
<div class="cart-price">
|
| 84 |
+
<?php endif; ?>
|
| 85 |
+
|
| 86 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 87 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
|
| 88 |
+
<?php else: ?>
|
| 89 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 90 |
+
<?php endif; ?>
|
| 91 |
+
|
| 92 |
+
</div>
|
| 93 |
+
|
| 94 |
+
|
| 95 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 96 |
+
|
| 97 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 98 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 99 |
+
<small>
|
| 100 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 101 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 102 |
+
<?php endforeach; ?>
|
| 103 |
+
</small>
|
| 104 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 105 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 106 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 107 |
+
<?php endforeach; ?>
|
| 108 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 109 |
+
<small>
|
| 110 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 111 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 112 |
+
<?php endforeach; ?>
|
| 113 |
+
</small>
|
| 114 |
+
<?php endif; ?>
|
| 115 |
+
</div>
|
| 116 |
+
|
| 117 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 118 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 119 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
|
| 120 |
+
</div>
|
| 121 |
+
<?php endif; ?>
|
| 122 |
+
<?php endif; ?>
|
| 123 |
+
</span>
|
| 124 |
+
<br /><br />
|
| 125 |
+
<?php endif; ?>
|
| 126 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 127 |
+
<span class="price-incl-tax">
|
| 128 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 129 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 130 |
+
<div class="cart-price">
|
| 131 |
+
<?php endif; ?>
|
| 132 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 133 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 134 |
+
</div>
|
| 135 |
+
<?php endif; ?>
|
| 136 |
+
<?php endif; ?>
|
| 137 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
|
| 138 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 139 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 140 |
+
<?php else: ?>
|
| 141 |
+
<div class="cart-price">
|
| 142 |
+
<?php endif; ?>
|
| 143 |
+
|
| 144 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 145 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
|
| 146 |
+
<?php else: ?>
|
| 147 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
|
| 148 |
+
<?php endif; ?>
|
| 149 |
+
|
| 150 |
+
</div>
|
| 151 |
+
|
| 152 |
+
|
| 153 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 154 |
+
|
| 155 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 156 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 157 |
+
<small>
|
| 158 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 159 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 160 |
+
<?php endforeach; ?>
|
| 161 |
+
</small>
|
| 162 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 163 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 164 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 165 |
+
<?php endforeach; ?>
|
| 166 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 167 |
+
<small>
|
| 168 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 169 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 170 |
+
<?php endforeach; ?>
|
| 171 |
+
</small>
|
| 172 |
+
<?php endif; ?>
|
| 173 |
+
</div>
|
| 174 |
+
|
| 175 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 176 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 177 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
|
| 178 |
+
</div>
|
| 179 |
+
<?php endif; ?>
|
| 180 |
+
<?php endif; ?>
|
| 181 |
+
</span>
|
| 182 |
+
<?php endif; ?>
|
| 183 |
<?php else: ?>
|
| 184 |
|
| 185 |
<?php endif; ?>
|
| 193 |
</td>
|
| 194 |
<td class="a-right">
|
| 195 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 196 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 197 |
+
<span class="price-excl-tax">
|
| 198 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 199 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 200 |
+
<div class="cart-price">
|
| 201 |
<?php endif; ?>
|
| 202 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 203 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 204 |
+
</div>
|
| 205 |
+
<?php endif; ?>
|
| 206 |
+
<?php endif; ?>
|
| 207 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 208 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 209 |
+
<?php else: ?>
|
| 210 |
+
<div class="cart-price">
|
| 211 |
+
<?php endif; ?>
|
| 212 |
+
|
| 213 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 214 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
|
| 215 |
+
<?php else: ?>
|
| 216 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 217 |
+
<?php endif; ?>
|
| 218 |
+
|
| 219 |
+
</div>
|
| 220 |
+
|
| 221 |
+
|
| 222 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 223 |
+
|
| 224 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 225 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 226 |
+
<small>
|
| 227 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 228 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 229 |
+
<?php endforeach; ?>
|
| 230 |
+
</small>
|
| 231 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 232 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 233 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 234 |
+
<?php endforeach; ?>
|
| 235 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 236 |
+
<small>
|
| 237 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 238 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 239 |
+
<?php endforeach; ?>
|
| 240 |
+
</small>
|
| 241 |
+
<?php endif; ?>
|
| 242 |
+
</div>
|
| 243 |
+
|
| 244 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 245 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 246 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
|
| 247 |
+
</div>
|
| 248 |
+
<?php endif; ?>
|
| 249 |
+
<?php endif; ?>
|
| 250 |
+
</span>
|
| 251 |
+
<br /><br />
|
| 252 |
+
<?php endif; ?>
|
| 253 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 254 |
+
<span class="price-incl-tax">
|
| 255 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 256 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 257 |
+
<div class="cart-price">
|
| 258 |
+
<?php endif; ?>
|
| 259 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 260 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 261 |
+
</div>
|
| 262 |
<?php endif; ?>
|
| 263 |
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
|
| 264 |
</span>
|
| 276 |
</td>
|
| 277 |
<td class="last a-right">
|
| 278 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 279 |
+
<?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
|
| 280 |
<?php else: ?>
|
| 281 |
|
| 282 |
<?php endif; ?>
|
app/design/frontend/blank/default/template/bundle/sales/order/invoice/items/renderer.phtml
CHANGED
|
@@ -25,6 +25,7 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $parentItem = $this->getItem() ?>
|
|
|
|
| 28 |
|
| 29 |
<?php $items = $this->getChilds($parentItem) ?>
|
| 30 |
<?php $_count = count ($items) ?>
|
|
@@ -62,22 +63,120 @@
|
|
| 62 |
<td><?php echo $_item->getSku() ?></td>
|
| 63 |
<td class="a-right">
|
| 64 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 65 |
-
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
|
|
|
|
| 69 |
<?php endif; ?>
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 74 |
-
<span class="price-incl-tax">
|
| 75 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 76 |
-
<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 77 |
<?php endif; ?>
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 81 |
<?php else: ?>
|
| 82 |
|
| 83 |
<?php endif; ?>
|
|
@@ -91,22 +190,122 @@
|
|
| 91 |
</td>
|
| 92 |
<td class="a-right">
|
| 93 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 94 |
-
|
| 95 |
-
|
| 96 |
-
|
| 97 |
-
|
|
|
|
| 98 |
<?php endif; ?>
|
| 99 |
-
|
| 100 |
-
|
| 101 |
-
|
| 102 |
-
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 103 |
-
<span class="price-incl-tax">
|
| 104 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 105 |
-
<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 106 |
<?php endif; ?>
|
| 107 |
-
|
| 108 |
-
|
| 109 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 110 |
<?php else: ?>
|
| 111 |
|
| 112 |
<?php endif; ?>
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $parentItem = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
|
| 29 |
|
| 30 |
<?php $items = $this->getChilds($parentItem) ?>
|
| 31 |
<?php $_count = count ($items) ?>
|
| 63 |
<td><?php echo $_item->getSku() ?></td>
|
| 64 |
<td class="a-right">
|
| 65 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 66 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 67 |
+
<span class="price-excl-tax">
|
| 68 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 69 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 70 |
+
<div class="cart-price">
|
| 71 |
<?php endif; ?>
|
| 72 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 73 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 74 |
+
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 75 |
<?php endif; ?>
|
| 76 |
+
<?php endif; ?>
|
| 77 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 78 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 79 |
+
<?php else: ?>
|
| 80 |
+
<div class="cart-price">
|
| 81 |
+
<?php endif; ?>
|
| 82 |
+
|
| 83 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 84 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
|
| 85 |
+
<?php else: ?>
|
| 86 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 87 |
+
<?php endif; ?>
|
| 88 |
+
|
| 89 |
+
</div>
|
| 90 |
+
|
| 91 |
+
|
| 92 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 93 |
+
|
| 94 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 95 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 96 |
+
<small>
|
| 97 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 98 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 99 |
+
<?php endforeach; ?>
|
| 100 |
+
</small>
|
| 101 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 102 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 103 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 104 |
+
<?php endforeach; ?>
|
| 105 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 106 |
+
<small>
|
| 107 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 108 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 109 |
+
<?php endforeach; ?>
|
| 110 |
+
</small>
|
| 111 |
+
<?php endif; ?>
|
| 112 |
+
</div>
|
| 113 |
+
|
| 114 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 115 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 116 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
|
| 117 |
+
</div>
|
| 118 |
+
<?php endif; ?>
|
| 119 |
+
<?php endif; ?>
|
| 120 |
+
</span>
|
| 121 |
+
<br /><br />
|
| 122 |
+
<?php endif; ?>
|
| 123 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 124 |
+
<span class="price-incl-tax">
|
| 125 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 126 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 127 |
+
<div class="cart-price">
|
| 128 |
+
<?php endif; ?>
|
| 129 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 130 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 131 |
+
</div>
|
| 132 |
+
<?php endif; ?>
|
| 133 |
+
<?php endif; ?>
|
| 134 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
|
| 135 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 136 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 137 |
+
<?php else: ?>
|
| 138 |
+
<div class="cart-price">
|
| 139 |
+
<?php endif; ?>
|
| 140 |
+
|
| 141 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 142 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
|
| 143 |
+
<?php else: ?>
|
| 144 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
|
| 145 |
+
<?php endif; ?>
|
| 146 |
+
|
| 147 |
+
</div>
|
| 148 |
+
|
| 149 |
+
|
| 150 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 151 |
+
|
| 152 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 153 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 154 |
+
<small>
|
| 155 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 156 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 157 |
+
<?php endforeach; ?>
|
| 158 |
+
</small>
|
| 159 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 160 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 161 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 162 |
+
<?php endforeach; ?>
|
| 163 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 164 |
+
<small>
|
| 165 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 166 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 167 |
+
<?php endforeach; ?>
|
| 168 |
+
</small>
|
| 169 |
+
<?php endif; ?>
|
| 170 |
+
</div>
|
| 171 |
+
|
| 172 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 173 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 174 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
|
| 175 |
+
</div>
|
| 176 |
+
<?php endif; ?>
|
| 177 |
+
<?php endif; ?>
|
| 178 |
+
</span>
|
| 179 |
+
<?php endif; ?>
|
| 180 |
<?php else: ?>
|
| 181 |
|
| 182 |
<?php endif; ?>
|
| 190 |
</td>
|
| 191 |
<td class="a-right">
|
| 192 |
<?php if ($this->canShowPriceInfo($_item)): ?>
|
| 193 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 194 |
+
<span class="price-excl-tax">
|
| 195 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 196 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 197 |
+
<div class="cart-price">
|
| 198 |
<?php endif; ?>
|
| 199 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 200 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 201 |
+
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 202 |
<?php endif; ?>
|
| 203 |
+
<?php endif; ?>
|
| 204 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 205 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 206 |
+
<?php else: ?>
|
| 207 |
+
<div class="cart-price">
|
| 208 |
+
<?php endif; ?>
|
| 209 |
+
|
| 210 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 211 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
|
| 212 |
+
<?php else: ?>
|
| 213 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 214 |
+
<?php endif; ?>
|
| 215 |
+
|
| 216 |
+
</div>
|
| 217 |
+
|
| 218 |
+
|
| 219 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 220 |
+
|
| 221 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 222 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 223 |
+
<small>
|
| 224 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 225 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 226 |
+
<?php endforeach; ?>
|
| 227 |
+
</small>
|
| 228 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 229 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 230 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 231 |
+
<?php endforeach; ?>
|
| 232 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 233 |
+
<small>
|
| 234 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 235 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 236 |
+
<?php endforeach; ?>
|
| 237 |
+
</small>
|
| 238 |
+
<?php endif; ?>
|
| 239 |
+
</div>
|
| 240 |
+
|
| 241 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 242 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 243 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
|
| 244 |
+
</div>
|
| 245 |
+
<?php endif; ?>
|
| 246 |
+
<?php endif; ?>
|
| 247 |
+
</span>
|
| 248 |
+
<br /><br />
|
| 249 |
+
<?php endif; ?>
|
| 250 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 251 |
+
<span class="price-incl-tax">
|
| 252 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 253 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 254 |
+
<div class="cart-price">
|
| 255 |
+
<?php endif; ?>
|
| 256 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 257 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 258 |
+
</div>
|
| 259 |
+
<?php endif; ?>
|
| 260 |
+
<?php endif; ?>
|
| 261 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
|
| 262 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 263 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 264 |
+
<?php else: ?>
|
| 265 |
+
<div class="cart-price">
|
| 266 |
+
<?php endif; ?>
|
| 267 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 268 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
|
| 269 |
+
<?php else: ?>
|
| 270 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
|
| 271 |
+
<?php endif; ?>
|
| 272 |
+
|
| 273 |
+
</div>
|
| 274 |
+
|
| 275 |
+
|
| 276 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 277 |
+
|
| 278 |
+
<div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 279 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 280 |
+
<small>
|
| 281 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 282 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 283 |
+
<?php endforeach; ?>
|
| 284 |
+
</small>
|
| 285 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 286 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 287 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 288 |
+
<?php endforeach; ?>
|
| 289 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 290 |
+
<small>
|
| 291 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 292 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 293 |
+
<?php endforeach; ?>
|
| 294 |
+
</small>
|
| 295 |
+
<?php endif; ?>
|
| 296 |
+
</div>
|
| 297 |
+
|
| 298 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 299 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 300 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 301 |
+
</div>
|
| 302 |
+
<?php endif; ?>
|
| 303 |
+
<?php endif; ?>
|
| 304 |
+
|
| 305 |
+
|
| 306 |
+
|
| 307 |
+
</span>
|
| 308 |
+
<?php endif; ?>
|
| 309 |
<?php else: ?>
|
| 310 |
|
| 311 |
<?php endif; ?>
|
app/design/frontend/blank/default/template/bundle/sales/order/items/renderer.phtml
CHANGED
|
@@ -62,22 +62,120 @@
|
|
| 62 |
<td><?php echo Mage::helper('core/string')->splitInjection($_item->getSku()) ?></td>
|
| 63 |
<td class="a-right">
|
| 64 |
<?php if (!$_item->getParentItem()): ?>
|
| 65 |
-
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
|
|
|
|
| 69 |
<?php endif; ?>
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 74 |
-
<span class="price-incl-tax">
|
| 75 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 76 |
-
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 77 |
<?php endif; ?>
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 81 |
<?php else: ?>
|
| 82 |
|
| 83 |
<?php endif; ?>
|
|
@@ -107,22 +205,122 @@
|
|
| 107 |
</td>
|
| 108 |
<td class="a-right">
|
| 109 |
<?php if (!$_item->getParentItem()): ?>
|
| 110 |
-
|
| 111 |
-
|
| 112 |
-
|
| 113 |
-
|
|
|
|
| 114 |
<?php endif; ?>
|
| 115 |
-
|
| 116 |
-
|
| 117 |
-
|
| 118 |
-
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 119 |
-
<span class="price-incl-tax">
|
| 120 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 121 |
-
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 122 |
<?php endif; ?>
|
| 123 |
-
|
| 124 |
-
|
| 125 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 126 |
<?php else: ?>
|
| 127 |
|
| 128 |
<?php endif; ?>
|
| 62 |
<td><?php echo Mage::helper('core/string')->splitInjection($_item->getSku()) ?></td>
|
| 63 |
<td class="a-right">
|
| 64 |
<?php if (!$_item->getParentItem()): ?>
|
| 65 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 66 |
+
<span class="price-excl-tax">
|
| 67 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 68 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 69 |
+
<div class="cart-price">
|
| 70 |
<?php endif; ?>
|
| 71 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 72 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 73 |
+
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 74 |
<?php endif; ?>
|
| 75 |
+
<?php endif; ?>
|
| 76 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 77 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 78 |
+
<?php else: ?>
|
| 79 |
+
<div class="cart-price">
|
| 80 |
+
<?php endif; ?>
|
| 81 |
+
|
| 82 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 83 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
|
| 84 |
+
<?php else: ?>
|
| 85 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 86 |
+
<?php endif; ?>
|
| 87 |
+
|
| 88 |
+
</div>
|
| 89 |
+
|
| 90 |
+
|
| 91 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 92 |
+
|
| 93 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 94 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 95 |
+
<small>
|
| 96 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 97 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 98 |
+
<?php endforeach; ?>
|
| 99 |
+
</small>
|
| 100 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 101 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 102 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 103 |
+
<?php endforeach; ?>
|
| 104 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 105 |
+
<small>
|
| 106 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 107 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 108 |
+
<?php endforeach; ?>
|
| 109 |
+
</small>
|
| 110 |
+
<?php endif; ?>
|
| 111 |
+
</div>
|
| 112 |
+
|
| 113 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 114 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 115 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
|
| 116 |
+
</div>
|
| 117 |
+
<?php endif; ?>
|
| 118 |
+
<?php endif; ?>
|
| 119 |
+
</span>
|
| 120 |
+
<br /><br />
|
| 121 |
+
<?php endif; ?>
|
| 122 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 123 |
+
<span class="price-incl-tax">
|
| 124 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 125 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 126 |
+
<div class="cart-price">
|
| 127 |
+
<?php endif; ?>
|
| 128 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 129 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 130 |
+
</div>
|
| 131 |
+
<?php endif; ?>
|
| 132 |
+
<?php endif; ?>
|
| 133 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
|
| 134 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 135 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 136 |
+
<?php else: ?>
|
| 137 |
+
<div class="cart-price">
|
| 138 |
+
<?php endif; ?>
|
| 139 |
+
|
| 140 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 141 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
|
| 142 |
+
<?php else: ?>
|
| 143 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
|
| 144 |
+
<?php endif; ?>
|
| 145 |
+
|
| 146 |
+
</div>
|
| 147 |
+
|
| 148 |
+
|
| 149 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 150 |
+
|
| 151 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 152 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 153 |
+
<small>
|
| 154 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 155 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 156 |
+
<?php endforeach; ?>
|
| 157 |
+
</small>
|
| 158 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 159 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 160 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 161 |
+
<?php endforeach; ?>
|
| 162 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 163 |
+
<small>
|
| 164 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 165 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 166 |
+
<?php endforeach; ?>
|
| 167 |
+
</small>
|
| 168 |
+
<?php endif; ?>
|
| 169 |
+
</div>
|
| 170 |
+
|
| 171 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 172 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 173 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
|
| 174 |
+
</div>
|
| 175 |
+
<?php endif; ?>
|
| 176 |
+
<?php endif; ?>
|
| 177 |
+
</span>
|
| 178 |
+
<?php endif; ?>
|
| 179 |
<?php else: ?>
|
| 180 |
|
| 181 |
<?php endif; ?>
|
| 205 |
</td>
|
| 206 |
<td class="a-right">
|
| 207 |
<?php if (!$_item->getParentItem()): ?>
|
| 208 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 209 |
+
<span class="price-excl-tax">
|
| 210 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 211 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 212 |
+
<div class="cart-price">
|
| 213 |
<?php endif; ?>
|
| 214 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 215 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 216 |
+
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 217 |
<?php endif; ?>
|
| 218 |
+
<?php endif; ?>
|
| 219 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 220 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 221 |
+
<?php else: ?>
|
| 222 |
+
<div class="cart-price">
|
| 223 |
+
<?php endif; ?>
|
| 224 |
+
|
| 225 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 226 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
|
| 227 |
+
<?php else: ?>
|
| 228 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 229 |
+
<?php endif; ?>
|
| 230 |
+
|
| 231 |
+
</div>
|
| 232 |
+
|
| 233 |
+
|
| 234 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 235 |
+
|
| 236 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 237 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 238 |
+
<small>
|
| 239 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 240 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 241 |
+
<?php endforeach; ?>
|
| 242 |
+
</small>
|
| 243 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 244 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 245 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 246 |
+
<?php endforeach; ?>
|
| 247 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 248 |
+
<small>
|
| 249 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 250 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 251 |
+
<?php endforeach; ?>
|
| 252 |
+
</small>
|
| 253 |
+
<?php endif; ?>
|
| 254 |
+
</div>
|
| 255 |
+
|
| 256 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 257 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 258 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
|
| 259 |
+
</div>
|
| 260 |
+
<?php endif; ?>
|
| 261 |
+
<?php endif; ?>
|
| 262 |
+
</span>
|
| 263 |
+
<br /><br />
|
| 264 |
+
<?php endif; ?>
|
| 265 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 266 |
+
<span class="price-incl-tax">
|
| 267 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 268 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 269 |
+
<div class="cart-price">
|
| 270 |
+
<?php endif; ?>
|
| 271 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 272 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 273 |
+
</div>
|
| 274 |
+
<?php endif; ?>
|
| 275 |
+
<?php endif; ?>
|
| 276 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
|
| 277 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 278 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 279 |
+
<?php else: ?>
|
| 280 |
+
<div class="cart-price">
|
| 281 |
+
<?php endif; ?>
|
| 282 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 283 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
|
| 284 |
+
<?php else: ?>
|
| 285 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
|
| 286 |
+
<?php endif; ?>
|
| 287 |
+
|
| 288 |
+
</div>
|
| 289 |
+
|
| 290 |
+
|
| 291 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 292 |
+
|
| 293 |
+
<div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 294 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 295 |
+
<small>
|
| 296 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 297 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 298 |
+
<?php endforeach; ?>
|
| 299 |
+
</small>
|
| 300 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 301 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 302 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 303 |
+
<?php endforeach; ?>
|
| 304 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 305 |
+
<small>
|
| 306 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 307 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 308 |
+
<?php endforeach; ?>
|
| 309 |
+
</small>
|
| 310 |
+
<?php endif; ?>
|
| 311 |
+
</div>
|
| 312 |
+
|
| 313 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 314 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 315 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 316 |
+
</div>
|
| 317 |
+
<?php endif; ?>
|
| 318 |
+
<?php endif; ?>
|
| 319 |
+
|
| 320 |
+
|
| 321 |
+
|
| 322 |
+
</span>
|
| 323 |
+
<?php endif; ?>
|
| 324 |
<?php else: ?>
|
| 325 |
|
| 326 |
<?php endif; ?>
|
app/design/frontend/blank/default/template/callouts/left_col.phtml
CHANGED
|
@@ -31,7 +31,7 @@
|
|
| 31 |
<?php elseif($this->getLinkUrl()): ?>
|
| 32 |
<a href="<?php echo $this->getUrl($this->getLinkUrl()) ?>">
|
| 33 |
<?php endif; ?>
|
| 34 |
-
<img src="<?php echo $this->getSkinUrl($this->getImgSrc()) ?>"
|
| 35 |
<?php if ($this->getLinkUrl()): ?>
|
| 36 |
</a>
|
| 37 |
<?php endif ?>
|
| 31 |
<?php elseif($this->getLinkUrl()): ?>
|
| 32 |
<a href="<?php echo $this->getUrl($this->getLinkUrl()) ?>">
|
| 33 |
<?php endif; ?>
|
| 34 |
+
<img src="<?php echo $this->getSkinUrl($this->getImgSrc()) ?>" alt="<?php echo $this->__($this->getImgAlt()) ?>" title="<?php echo $this->__($this->getImgAlt()) ?>" />
|
| 35 |
<?php if ($this->getLinkUrl()): ?>
|
| 36 |
</a>
|
| 37 |
<?php endif ?>
|
app/design/frontend/blank/default/template/callouts/right_col.phtml
CHANGED
|
@@ -26,6 +26,6 @@
|
|
| 26 |
?>
|
| 27 |
<div class="block block-banner">
|
| 28 |
<div class="block-content">
|
| 29 |
-
<img src="<?php echo $this->getSkinUrl('images/media/col_right_callout.jpg') ?>"
|
| 30 |
</div>
|
| 31 |
</div>
|
| 26 |
?>
|
| 27 |
<div class="block block-banner">
|
| 28 |
<div class="block-content">
|
| 29 |
+
<img src="<?php echo $this->getSkinUrl('images/media/col_right_callout.jpg') ?>" alt="<?php echo __('Keep your eyes open for our special Back to School items and save A LOT!') ?>" title="<?php echo __('Keep your eyes open for our special Back to School items and save A LOT!') ?>" />
|
| 30 |
</div>
|
| 31 |
</div>
|
app/design/frontend/blank/default/template/catalog/category/view.phtml
CHANGED
|
@@ -84,7 +84,7 @@
|
|
| 84 |
<h2><?php echo $_helper->categoryAttribute($_category, $this->htmlEscape($this->getCurrentCategory()->getName()), 'name') ?></h2>
|
| 85 |
</div>
|
| 86 |
<?php if($_imgUrl): ?>
|
| 87 |
-
<?php echo $
|
| 88 |
<?php endif; ?>
|
| 89 |
<?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
|
| 90 |
<p class="category-description"><?php echo $_helper->categoryAttribute($_category, $_description, 'description') ?></p>
|
| 84 |
<h2><?php echo $_helper->categoryAttribute($_category, $this->htmlEscape($this->getCurrentCategory()->getName()), 'name') ?></h2>
|
| 85 |
</div>
|
| 86 |
<?php if($_imgUrl): ?>
|
| 87 |
+
<?php echo $_imgHtml ?>
|
| 88 |
<?php endif; ?>
|
| 89 |
<?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
|
| 90 |
<p class="category-description"><?php echo $_helper->categoryAttribute($_category, $_description, 'description') ?></p>
|
app/design/frontend/blank/default/template/catalog/product/list.phtml
CHANGED
|
@@ -45,8 +45,8 @@
|
|
| 45 |
<?php foreach ($_productCollection as $_product): ?>
|
| 46 |
<li class="item<?php if( ++$_iterator == sizeof($_productCollection) ): ?> last<?php endif; ?>">
|
| 47 |
<?php // Product Image ?>
|
| 48 |
-
<a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($
|
| 49 |
-
<img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135, 135); ?>" width="135" height="135" alt="<?php echo $this->htmlEscape($
|
| 50 |
|
| 51 |
<?php // Product description ?>
|
| 52 |
<div class="product-shop">
|
|
@@ -89,8 +89,8 @@
|
|
| 89 |
<tr>
|
| 90 |
<?php endif ?>
|
| 91 |
<td>
|
| 92 |
-
<a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($
|
| 93 |
-
<img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135, 135); ?>" width="135" height="135" alt="<?php echo $this->htmlEscape($
|
| 94 |
<h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>"><?php echo $this->htmlEscape($_product->getName()) ?></a></h3>
|
| 95 |
<?php if($_product->getRatingSummary()): ?>
|
| 96 |
<?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
|
| 45 |
<?php foreach ($_productCollection as $_product): ?>
|
| 46 |
<li class="item<?php if( ++$_iterator == sizeof($_productCollection) ): ?> last<?php endif; ?>">
|
| 47 |
<?php // Product Image ?>
|
| 48 |
+
<a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($this->getImageLabel($_product, 'small_image')) ?>">
|
| 49 |
+
<img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135, 135); ?>" width="135" height="135" alt="<?php echo $this->htmlEscape($this->getImageLabel($_product, 'small_image')) ?>" title="<?php echo $this->htmlEscape($this->getImageLabel($_product, 'small_image')) ?>" /></a>
|
| 50 |
|
| 51 |
<?php // Product description ?>
|
| 52 |
<div class="product-shop">
|
| 89 |
<tr>
|
| 90 |
<?php endif ?>
|
| 91 |
<td>
|
| 92 |
+
<a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($this->getImageLabel($_product, 'small_image')) ?>">
|
| 93 |
+
<img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135, 135); ?>" width="135" height="135" alt="<?php echo $this->htmlEscape($this->getImageLabel($_product, 'small_image')) ?>" title="<?php echo $this->htmlEscape($this->getImageLabel($_product, 'small_image')) ?>" /></a>
|
| 94 |
<h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>"><?php echo $this->htmlEscape($_product->getName()) ?></a></h3>
|
| 95 |
<?php if($_product->getRatingSummary()): ?>
|
| 96 |
<?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
|
app/design/frontend/blank/default/template/catalog/product/price.phtml
CHANGED
|
@@ -36,65 +36,277 @@
|
|
| 36 |
<?php $_product = $this->getProduct() ?>
|
| 37 |
<?php $_id = $_product->getId() ?>
|
| 38 |
|
|
|
|
|
|
|
| 39 |
<?php $simplePricesTax = ($this->helper('tax')->displayPriceIncludingTax() || $this->helper('tax')->displayBothPrices()); ?>
|
| 40 |
|
| 41 |
<?php $_minimalPriceValue = $_product->getMinimalPrice() ?>
|
| 42 |
<?php $_minimalPrice = $this->helper('tax')->getPrice($_product, $_minimalPriceValue, $simplePricesTax) ?>
|
| 43 |
|
| 44 |
<?php if (!$_product->isGrouped()): ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 45 |
|
| 46 |
<div class="price-box">
|
| 47 |
<?php $_price = $this->helper('tax')->getPrice($_product, $_product->getPrice()) ?>
|
| 48 |
<?php $_regularPrice = $this->helper('tax')->getPrice($_product, $_product->getPrice(), $simplePricesTax) ?>
|
| 49 |
<?php $_finalPrice = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice()) ?>
|
| 50 |
<?php $_finalPriceInclTax = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice(), true) ?>
|
| 51 |
-
|
| 52 |
<?php if ($_finalPrice == $_price): ?>
|
| 53 |
-
|
| 54 |
<?php if ($this->helper('tax')->displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?>
|
| 55 |
-
|
| 56 |
-
<span class="
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
<span class="
|
| 61 |
-
|
| 62 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 63 |
<?php else: ?>
|
| 64 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
<?php endif; ?>
|
| 66 |
-
|
| 67 |
<?php else: /* if ($_finalPrice == $_price): */ ?>
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 72 |
|
| 73 |
-
<?php if ($this->helper('tax')->displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?>
|
| 74 |
<p class="special-price">
|
| 75 |
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 76 |
<span class="price-excluding-tax">
|
| 77 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 78 |
-
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
|
| 79 |
</span>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 80 |
<span class="price-including-tax">
|
| 81 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 82 |
-
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
|
| 83 |
</span>
|
| 84 |
</p>
|
| 85 |
-
<?php
|
| 86 |
-
|
| 87 |
-
|
| 88 |
-
|
| 89 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 90 |
<?php endif; ?>
|
| 91 |
|
| 92 |
<?php endif; /* if ($_finalPrice == $_price): */ ?>
|
| 93 |
|
| 94 |
<?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_product->getFinalPrice()): ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 95 |
<a href="<?php echo $_product->getProductUrl(); ?>" class="minimal-price-link">
|
| 96 |
<span class="label"><?php echo $this->__('As low as:') ?></span>
|
| 97 |
-
<span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($
|
| 98 |
</a>
|
| 99 |
<?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?>
|
| 100 |
</div>
|
|
@@ -106,6 +318,7 @@
|
|
| 106 |
?>
|
| 107 |
<?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
|
| 108 |
<div class="price-box">
|
|
|
|
| 109 |
<span class="label"><?php echo $this->__('Starting at:') ?></span>
|
| 110 |
<?php if ($this->helper('tax')->displayBothPrices() && ($_exclTax !== $_inclTax)): ?>
|
| 111 |
<span class="price-excluding-tax">
|
|
@@ -125,6 +338,7 @@
|
|
| 125 |
?>
|
| 126 |
<span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_showPrice, true, false) ?></span>
|
| 127 |
<?php endif; ?>
|
|
|
|
| 128 |
</div>
|
| 129 |
<?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice): */ ?>
|
| 130 |
<?php endif; /* if (!$_product->isGrouped()): */ ?>
|
| 36 |
<?php $_product = $this->getProduct() ?>
|
| 37 |
<?php $_id = $_product->getId() ?>
|
| 38 |
|
| 39 |
+
<?php $_weeeSeparator = ''; ?>
|
| 40 |
+
|
| 41 |
<?php $simplePricesTax = ($this->helper('tax')->displayPriceIncludingTax() || $this->helper('tax')->displayBothPrices()); ?>
|
| 42 |
|
| 43 |
<?php $_minimalPriceValue = $_product->getMinimalPrice() ?>
|
| 44 |
<?php $_minimalPrice = $this->helper('tax')->getPrice($_product, $_minimalPriceValue, $simplePricesTax) ?>
|
| 45 |
|
| 46 |
<?php if (!$_product->isGrouped()): ?>
|
| 47 |
+
<?php $_weeeTaxAmount = Mage::helper('weee')->getAmountForDisplay($_product); ?>
|
| 48 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))): ?>
|
| 49 |
+
<?php $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product); ?>
|
| 50 |
+
<?php $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product); ?>
|
| 51 |
+
<?php endif; ?>
|
| 52 |
|
| 53 |
<div class="price-box">
|
| 54 |
<?php $_price = $this->helper('tax')->getPrice($_product, $_product->getPrice()) ?>
|
| 55 |
<?php $_regularPrice = $this->helper('tax')->getPrice($_product, $_product->getPrice(), $simplePricesTax) ?>
|
| 56 |
<?php $_finalPrice = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice()) ?>
|
| 57 |
<?php $_finalPriceInclTax = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice(), true) ?>
|
| 58 |
+
<?php $_weeeDisplayType = Mage::helper('weee')->getPriceDisplayType(); ?>
|
| 59 |
<?php if ($_finalPrice == $_price): ?>
|
|
|
|
| 60 |
<?php if ($this->helper('tax')->displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?>
|
| 61 |
+
<?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
|
| 62 |
+
<span class="price-excluding-tax">
|
| 63 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 64 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,false) ?></span>
|
| 65 |
+
</span>
|
| 66 |
+
<span class="price-including-tax">
|
| 67 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 68 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
|
| 69 |
+
</span>
|
| 70 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
|
| 71 |
+
<span class="price-excluding-tax">
|
| 72 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 73 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,false) ?></span>
|
| 74 |
+
</span>
|
| 75 |
+
<span class="price-including-tax">
|
| 76 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 77 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
|
| 78 |
+
<br />
|
| 79 |
+
<span class="weee">(<small>
|
| 80 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 81 |
+
<?php echo $_weeeSeparator; ?>
|
| 82 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
|
| 83 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 84 |
+
<?php endforeach; ?>
|
| 85 |
+
</small>)</span>
|
| 86 |
+
</span>
|
| 87 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
|
| 88 |
+
<span class="price-excluding-tax">
|
| 89 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 90 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,false) ?></span>
|
| 91 |
+
</span>
|
| 92 |
+
<span class="price-including-tax">
|
| 93 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 94 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
|
| 95 |
+
<br />
|
| 96 |
+
<span class="weee">(<small>
|
| 97 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 98 |
+
<?php echo $_weeeSeparator; ?>
|
| 99 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
|
| 100 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 101 |
+
<?php endforeach; ?>
|
| 102 |
+
</small>)</span>
|
| 103 |
+
</span>
|
| 104 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
|
| 105 |
+
<span class="price-excluding-tax">
|
| 106 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 107 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price,true,false) ?></span>
|
| 108 |
+
</span>
|
| 109 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 110 |
+
<span class="weee">
|
| 111 |
+
<small>
|
| 112 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
|
| 113 |
+
</small>
|
| 114 |
+
</span>
|
| 115 |
+
<br />
|
| 116 |
+
<?php endforeach; ?>
|
| 117 |
+
<span class="price-including-tax">
|
| 118 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 119 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
|
| 120 |
+
</span>
|
| 121 |
+
<?php else: ?>
|
| 122 |
+
<span class="price-excluding-tax">
|
| 123 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 124 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price,true,false) ?></span>
|
| 125 |
+
</span>
|
| 126 |
+
<span class="price-including-tax">
|
| 127 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 128 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
|
| 129 |
+
</span>
|
| 130 |
+
<?php endif; ?>
|
| 131 |
<?php else: ?>
|
| 132 |
+
<?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
|
| 133 |
+
<span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,true) ?></span>
|
| 134 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
|
| 135 |
+
<span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,true) ?></span>
|
| 136 |
+
<br />
|
| 137 |
+
<span class="weee">(<small>
|
| 138 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 139 |
+
<?php echo $_weeeSeparator; ?>
|
| 140 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
|
| 141 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 142 |
+
<?php endforeach; ?>
|
| 143 |
+
</small>)</span>
|
| 144 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
|
| 145 |
+
<span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,true) ?></span>
|
| 146 |
+
<br />
|
| 147 |
+
<span class="weee">(<small>
|
| 148 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 149 |
+
<?php echo $_weeeSeparator; ?>
|
| 150 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
|
| 151 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 152 |
+
<?php endforeach; ?>
|
| 153 |
+
</small>)</span>
|
| 154 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
|
| 155 |
+
<span class="regular-price"><?php echo Mage::helper('core')->currency($_price,true,true) ?></span><br />
|
| 156 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 157 |
+
<span class="weee">
|
| 158 |
+
<small>
|
| 159 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
|
| 160 |
+
</small>
|
| 161 |
+
</span>
|
| 162 |
+
<br />
|
| 163 |
+
<?php endforeach; ?>
|
| 164 |
+
<span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,true) ?></span>
|
| 165 |
+
<?php else: ?>
|
| 166 |
+
<span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price,true,true) ?></span>
|
| 167 |
+
<?php endif; ?>
|
| 168 |
<?php endif; ?>
|
|
|
|
| 169 |
<?php else: /* if ($_finalPrice == $_price): */ ?>
|
| 170 |
+
<?php $_originalWeeeTaxAmount = Mage::helper('weee')->getOriginalAmount($_product); ?>
|
| 171 |
+
|
| 172 |
+
<?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
|
| 173 |
+
<p class="old-price">
|
| 174 |
+
<span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
|
| 175 |
+
<span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?></span>
|
| 176 |
+
</p>
|
| 177 |
+
|
| 178 |
+
<?php if ($this->helper('tax')->displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?>
|
| 179 |
+
<p class="special-price">
|
| 180 |
+
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 181 |
+
<span class="price-excluding-tax">
|
| 182 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 183 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice+$_weeeTaxAmount,true,false) ?></span>
|
| 184 |
+
</span>
|
| 185 |
+
<span class="price-including-tax">
|
| 186 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 187 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
|
| 188 |
+
</span>
|
| 189 |
+
</p>
|
| 190 |
+
<?php else: ?>
|
| 191 |
+
<p class="special-price">
|
| 192 |
+
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 193 |
+
<span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice+$_weeeTaxAmount,true,false) ?></span>
|
| 194 |
+
</p>
|
| 195 |
+
<?php endif; ?>
|
| 196 |
+
|
| 197 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
|
| 198 |
+
<p class="old-price">
|
| 199 |
+
<span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
|
| 200 |
+
<span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?></span>
|
| 201 |
+
</p>
|
| 202 |
|
|
|
|
| 203 |
<p class="special-price">
|
| 204 |
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 205 |
<span class="price-excluding-tax">
|
| 206 |
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 207 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice+$_weeeTaxAmount,true,false) ?></span>
|
| 208 |
</span>
|
| 209 |
+
<br />
|
| 210 |
+
<span class="weee">(<small>
|
| 211 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 212 |
+
<?php echo $_weeeSeparator; ?>
|
| 213 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
|
| 214 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 215 |
+
<?php endforeach; ?>
|
| 216 |
+
</small>)</span>
|
| 217 |
<span class="price-including-tax">
|
| 218 |
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 219 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
|
| 220 |
</span>
|
| 221 |
</p>
|
| 222 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
|
| 223 |
+
<p class="old-price">
|
| 224 |
+
<span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
|
| 225 |
+
<span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?></span>
|
| 226 |
+
</p>
|
| 227 |
+
|
| 228 |
+
<p class="special-price">
|
| 229 |
+
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 230 |
+
<span class="price-excluding-tax">
|
| 231 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 232 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice+$_weeeTaxAmount,true,false) ?></span>
|
| 233 |
+
</span>
|
| 234 |
+
<br />
|
| 235 |
+
<span class="weee">(<small>
|
| 236 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 237 |
+
<?php echo $_weeeSeparator; ?>
|
| 238 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
|
| 239 |
+
<?php $_weeeSeparator = ' + '; ?>
|
| 240 |
+
<?php endforeach; ?>
|
| 241 |
+
</small>)</span>
|
| 242 |
+
<span class="price-including-tax">
|
| 243 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 244 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
|
| 245 |
+
</span>
|
| 246 |
+
</p>
|
| 247 |
+
<?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
|
| 248 |
+
<p class="old-price">
|
| 249 |
+
<span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
|
| 250 |
+
<span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice,true,false) ?></span>
|
| 251 |
+
</p>
|
| 252 |
+
|
| 253 |
+
<p class="special-price">
|
| 254 |
+
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 255 |
+
<span class="price-excluding-tax">
|
| 256 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 257 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
|
| 258 |
+
</span>
|
| 259 |
+
<?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
|
| 260 |
+
<span class="weee">
|
| 261 |
+
<small>
|
| 262 |
+
<?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
|
| 263 |
+
</small>
|
| 264 |
+
</span>
|
| 265 |
+
<br />
|
| 266 |
+
<?php endforeach; ?>
|
| 267 |
+
<span class="price-including-tax">
|
| 268 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 269 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
|
| 270 |
+
</span>
|
| 271 |
+
</p>
|
| 272 |
+
<?php else: // excl. ?>
|
| 273 |
+
<p class="old-price">
|
| 274 |
+
<span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
|
| 275 |
+
<span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice,true,false) ?></span>
|
| 276 |
+
</p>
|
| 277 |
+
|
| 278 |
+
<?php if ($this->helper('tax')->displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?>
|
| 279 |
+
<p class="special-price">
|
| 280 |
+
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 281 |
+
<span class="price-excluding-tax">
|
| 282 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
|
| 283 |
+
<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
|
| 284 |
+
</span>
|
| 285 |
+
<span class="price-including-tax">
|
| 286 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
|
| 287 |
+
<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
|
| 288 |
+
</span>
|
| 289 |
+
</p>
|
| 290 |
+
<?php else: ?>
|
| 291 |
+
<p class="special-price">
|
| 292 |
+
<span class="price-label"><?php echo $this->__('Special Price:') ?></span>
|
| 293 |
+
<span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
|
| 294 |
+
</p>
|
| 295 |
+
<?php endif; ?>
|
| 296 |
<?php endif; ?>
|
| 297 |
|
| 298 |
<?php endif; /* if ($_finalPrice == $_price): */ ?>
|
| 299 |
|
| 300 |
<?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_product->getFinalPrice()): ?>
|
| 301 |
+
|
| 302 |
+
<?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
|
| 303 |
+
<?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))): ?>
|
| 304 |
+
<?php $_minimalPriceDisplayValue = $_minimalPrice+$_weeeTaxAmount; ?>
|
| 305 |
+
<?php endif; ?>
|
| 306 |
+
|
| 307 |
<a href="<?php echo $_product->getProductUrl(); ?>" class="minimal-price-link">
|
| 308 |
<span class="label"><?php echo $this->__('As low as:') ?></span>
|
| 309 |
+
<span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_minimalPriceDisplayValue,true,false) ?></span>
|
| 310 |
</a>
|
| 311 |
<?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?>
|
| 312 |
</div>
|
| 318 |
?>
|
| 319 |
<?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
|
| 320 |
<div class="price-box">
|
| 321 |
+
<p class="minimal-price">
|
| 322 |
<span class="label"><?php echo $this->__('Starting at:') ?></span>
|
| 323 |
<?php if ($this->helper('tax')->displayBothPrices() && ($_exclTax !== $_inclTax)): ?>
|
| 324 |
<span class="price-excluding-tax">
|
| 338 |
?>
|
| 339 |
<span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_showPrice, true, false) ?></span>
|
| 340 |
<?php endif; ?>
|
| 341 |
+
</p>
|
| 342 |
</div>
|
| 343 |
<?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice): */ ?>
|
| 344 |
<?php endif; /* if (!$_product->isGrouped()): */ ?>
|
app/design/frontend/blank/default/template/catalog/product/view/media.phtml
CHANGED
|
@@ -37,7 +37,7 @@
|
|
| 37 |
<?php if ($_product->getImage() != 'no_selection' && $_product->getImage()): ?>
|
| 38 |
<p class="product-image product-image-zoom">
|
| 39 |
<?php
|
| 40 |
-
$_img = '<img id="image" src="'.$this->helper('catalog/image')->init($_product, 'image').'" alt="'.$this->htmlEscape($
|
| 41 |
echo $_helper->productAttribute($_product, $_img, 'image');
|
| 42 |
?>
|
| 43 |
</p>
|
|
@@ -59,7 +59,7 @@
|
|
| 59 |
<?php else: ?>
|
| 60 |
<p class="product-image">
|
| 61 |
<?php
|
| 62 |
-
$_img = '<img src="'.$this->helper('catalog/image')->init($_product, 'image')->resize(265).'" alt="'.$this->htmlEscape($_product->
|
| 63 |
echo $_helper->productAttribute($_product, $_img, 'image');
|
| 64 |
?>
|
| 65 |
</p>
|
| 37 |
<?php if ($_product->getImage() != 'no_selection' && $_product->getImage()): ?>
|
| 38 |
<p class="product-image product-image-zoom">
|
| 39 |
<?php
|
| 40 |
+
$_img = '<img id="image" src="'.$this->helper('catalog/image')->init($_product, 'image').'" alt="'.$this->htmlEscape($this->getImageLabel()).'" title="'.$this->htmlEscape($this->getImageLabel()).'" />';
|
| 41 |
echo $_helper->productAttribute($_product, $_img, 'image');
|
| 42 |
?>
|
| 43 |
</p>
|
| 59 |
<?php else: ?>
|
| 60 |
<p class="product-image">
|
| 61 |
<?php
|
| 62 |
+
$_img = '<img src="'.$this->helper('catalog/image')->init($_product, 'image')->resize(265).'" alt="'.$this->htmlEscape($_product->getImageLabel()).'" title="'.$this->htmlEscape($_product->getImageLabel()).'" />';
|
| 63 |
echo $_helper->productAttribute($_product, $_img, 'image');
|
| 64 |
?>
|
| 65 |
</p>
|
app/design/frontend/blank/default/template/catalog/product/view/tierprices.phtml
CHANGED
|
@@ -31,19 +31,150 @@
|
|
| 31 |
*/
|
| 32 |
$_product = $this->getProduct();
|
| 33 |
$_tierPrices = $this->getTierPrices();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
?>
|
| 35 |
<?php if (count($_tierPrices) > 0): ?>
|
| 36 |
-
<ul class="
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
<?php foreach ($_tierPrices as $_price): ?>
|
| 38 |
<?php if ($this->helper('tax')->displayBothPrices() && $_price['formated_price'] != $_price['formated_price_incl_tax']): ?>
|
| 39 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
<?php else: ?>
|
| 41 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 42 |
<?php endif; ?>
|
| 43 |
-
<?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
|
| 44 |
-
|| ($_product->getPrice() != $_product->getFinalPrice() && $_product->getFinalPrice() > $_price['price'])): ?>
|
| 45 |
-
<?php echo $this->__('and') ?> <strong class="benefit"><?php echo $this->__('save')?> <?php echo $_price['savePercent']?>%
|
| 46 |
-
<?php endif ?></strong>
|
| 47 |
</li>
|
| 48 |
<?php endforeach ?>
|
| 49 |
</ul>
|
| 31 |
*/
|
| 32 |
$_product = $this->getProduct();
|
| 33 |
$_tierPrices = $this->getTierPrices();
|
| 34 |
+
$_finalPriceInclTax = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice(), true);
|
| 35 |
+
|
| 36 |
+
$_weeeTaxAmount = Mage::helper('weee')->getAmountForDisplay($_product);
|
| 37 |
+
if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
|
| 38 |
+
$_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
|
| 39 |
+
}
|
| 40 |
+
|
| 41 |
?>
|
| 42 |
<?php if (count($_tierPrices) > 0): ?>
|
| 43 |
+
<ul class="<?php echo ($this->getInGrouped() ? 'product-pricing-grouped' : 'product-pricing'); ?>">
|
| 44 |
+
<?php if ($this->getInGrouped()): ?>
|
| 45 |
+
<?php $_tierPrices = $this->getTierPrices($_product); ?>
|
| 46 |
+
<?php endif; ?>
|
| 47 |
+
<?php Mage::helper('weee')->processTierPrices($_product, $_tierPrices); ?>
|
| 48 |
+
|
| 49 |
<?php foreach ($_tierPrices as $_price): ?>
|
| 50 |
<?php if ($this->helper('tax')->displayBothPrices() && $_price['formated_price'] != $_price['formated_price_incl_tax']): ?>
|
| 51 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, 0)): ?>
|
| 52 |
+
<li><?php echo $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']) ?>
|
| 53 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 1)): ?>
|
| 54 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
|
| 55 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 56 |
+
(<small>
|
| 57 |
+
<?php echo $this->__('%1$s incl tax.', $_price['formated_price_incl_weee']); ?>
|
| 58 |
+
<?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 59 |
+
<?php echo $separator; ?>
|
| 60 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
|
| 61 |
+
<?php endforeach; ?>
|
| 62 |
+
</small>)
|
| 63 |
+
<?php endif; ?>
|
| 64 |
+
<?php echo $this->__('each') ?>
|
| 65 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 4)): ?>
|
| 66 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
|
| 67 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 68 |
+
(<small>
|
| 69 |
+
<?php echo $this->__('%1$s incl tax.', $_price['formated_price_incl_weee']); ?>
|
| 70 |
+
<?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 71 |
+
<?php echo $separator; ?>
|
| 72 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
|
| 73 |
+
<?php endforeach; ?>
|
| 74 |
+
</small>)
|
| 75 |
+
<?php endif; ?>
|
| 76 |
+
<?php echo $this->__('each') ?>
|
| 77 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 2)): ?>
|
| 78 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price']); ?>
|
| 79 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 80 |
+
(<small>
|
| 81 |
+
<?php foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 82 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
|
| 83 |
+
<?php endforeach; ?>
|
| 84 |
+
<?php echo $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee']); ?>
|
| 85 |
+
</small>)
|
| 86 |
+
<?php endif; ?>
|
| 87 |
+
<?php echo $this->__('each') ?>
|
| 88 |
+
<?php else: ?>
|
| 89 |
+
<li><?php echo $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']) ?>
|
| 90 |
+
<?php endif; ?>
|
| 91 |
<?php else: ?>
|
| 92 |
+
<?php if ($this->helper('tax')->displayPriceIncludingTax()): ?>
|
| 93 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, 0)): ?>
|
| 94 |
+
<li><?php echo $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_weee']) ?>
|
| 95 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 1)): ?>
|
| 96 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
|
| 97 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 98 |
+
(</small>
|
| 99 |
+
<?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 100 |
+
<?php echo $separator; ?>
|
| 101 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
|
| 102 |
+
<?php $separator = ' + '; endforeach; ?>
|
| 103 |
+
<small>)
|
| 104 |
+
<?php endif; ?>
|
| 105 |
+
<?php echo $this->__('each') ?>
|
| 106 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 4)): ?>
|
| 107 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
|
| 108 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 109 |
+
(</small>
|
| 110 |
+
<?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 111 |
+
<?php echo $separator; ?>
|
| 112 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
|
| 113 |
+
<?php $separator = ' + '; endforeach; ?>
|
| 114 |
+
<small>)
|
| 115 |
+
<?php endif; ?>
|
| 116 |
+
<?php echo $this->__('each') ?>
|
| 117 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 2)): ?>
|
| 118 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_tax']); ?>
|
| 119 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 120 |
+
(<small>
|
| 121 |
+
<?php foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 122 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
|
| 123 |
+
<?php endforeach; ?>
|
| 124 |
+
<?php echo $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee']); ?>
|
| 125 |
+
</small>)
|
| 126 |
+
<?php endif; ?>
|
| 127 |
+
<?php echo $this->__('each') ?>
|
| 128 |
+
<?php else: ?>
|
| 129 |
+
<li><?php echo $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_tax']) ?>
|
| 130 |
+
<?php endif; ?>
|
| 131 |
+
<?php else: ?>
|
| 132 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_product, 0)): ?>
|
| 133 |
+
<li><?php echo $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_weee_only']) ?>
|
| 134 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 1)): ?>
|
| 135 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
|
| 136 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 137 |
+
(<small>
|
| 138 |
+
<?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 139 |
+
<?php echo $separator; ?>
|
| 140 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
|
| 141 |
+
<?php $separator = ' + '; endforeach; ?>
|
| 142 |
+
</small>)
|
| 143 |
+
<?php endif; ?>
|
| 144 |
+
<?php echo $this->__('each') ?>
|
| 145 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 4)): ?>
|
| 146 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
|
| 147 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 148 |
+
(<small>
|
| 149 |
+
<?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 150 |
+
<?php echo $separator; ?>
|
| 151 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
|
| 152 |
+
<?php $separator = ' + '; endforeach; ?>
|
| 153 |
+
</small>)
|
| 154 |
+
<?php endif; ?>
|
| 155 |
+
<?php echo $this->__('each') ?>
|
| 156 |
+
<?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 2)): ?>
|
| 157 |
+
<li><?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price']); ?>
|
| 158 |
+
<?php if ($_weeeTaxAttributes): ?>
|
| 159 |
+
(<small>
|
| 160 |
+
<?php foreach ($_weeeTaxAttributes as $_attribute): ?>
|
| 161 |
+
<?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
|
| 162 |
+
<?php endforeach; ?>
|
| 163 |
+
<?php echo $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee_only']); ?>
|
| 164 |
+
</small>)
|
| 165 |
+
<?php endif; ?>
|
| 166 |
+
<?php echo $this->__('each') ?>
|
| 167 |
+
<?php else: ?>
|
| 168 |
+
<li><?php echo $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price']) ?>
|
| 169 |
+
<?php endif; ?>
|
| 170 |
+
<?php endif; ?>
|
| 171 |
+
<?php endif; ?>
|
| 172 |
+
<?php if (!$this->getInGrouped()): ?>
|
| 173 |
+
<?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
|
| 174 |
+
|| ($_product->getPrice() != $_product->getFinalPrice() && $_product->getFinalPrice() > $_price['price'])): ?>
|
| 175 |
+
<?php echo $this->__('and') ?> <strong class="benefit"><?php echo $this->__('save')?> <?php echo $_price['savePercent']?>%
|
| 176 |
+
<?php endif ?></strong>
|
| 177 |
<?php endif; ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 178 |
</li>
|
| 179 |
<?php endforeach ?>
|
| 180 |
</ul>
|
app/design/frontend/blank/default/template/catalogsearch/advanced/form.phtml
CHANGED
|
@@ -37,7 +37,7 @@
|
|
| 37 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 38 |
<form action="<?php echo $this->getSearchPostUrl() ?>" method="get" id="form-validate">
|
| 39 |
<fieldset class="group-select">
|
| 40 |
-
<h3
|
| 41 |
<ul id="advanced-search-list">
|
| 42 |
<?php foreach ($this->getSearchableAttributes() as $_attribute): ?>
|
| 43 |
<?php $_code = $_attribute->getAttributeCode() ?>
|
| 37 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 38 |
<form action="<?php echo $this->getSearchPostUrl() ?>" method="get" id="form-validate">
|
| 39 |
<fieldset class="group-select">
|
| 40 |
+
<h3><?php echo $this->__('Search Settings') ?></h3>
|
| 41 |
<ul id="advanced-search-list">
|
| 42 |
<?php foreach ($this->getSearchableAttributes() as $_attribute): ?>
|
| 43 |
<?php $_code = $_attribute->getAttributeCode() ?>
|
app/design/frontend/blank/default/template/checkout/cart/item/default.phtml
CHANGED
|
@@ -61,12 +61,95 @@
|
|
| 61 |
<?php endif ?>
|
| 62 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 63 |
<td class="a-right">
|
| 64 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
</td>
|
| 66 |
<?php endif; ?>
|
| 67 |
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 68 |
-
<td>
|
| 69 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 70 |
</td>
|
| 71 |
<?php endif; ?>
|
| 72 |
<td class="a-center">
|
|
@@ -74,12 +157,95 @@
|
|
| 74 |
</td>
|
| 75 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 76 |
<td class="a-right">
|
| 77 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 78 |
</td>
|
| 79 |
<?php endif; ?>
|
| 80 |
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 81 |
-
<td>
|
| 82 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 83 |
</td>
|
| 84 |
<?php endif; ?>
|
| 85 |
</tr>
|
| 61 |
<?php endif ?>
|
| 62 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 63 |
<td class="a-right">
|
| 64 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 65 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 66 |
+
<?php else: ?>
|
| 67 |
+
<div class="cart-price">
|
| 68 |
+
<?php endif; ?>
|
| 69 |
+
|
| 70 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 71 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
|
| 72 |
+
<?php else: ?>
|
| 73 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?>
|
| 74 |
+
<?php endif; ?>
|
| 75 |
+
|
| 76 |
+
</div>
|
| 77 |
+
|
| 78 |
+
|
| 79 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 80 |
+
|
| 81 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
|
| 82 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 83 |
+
<small>
|
| 84 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 85 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
|
| 86 |
+
<?php endforeach; ?>
|
| 87 |
+
</small>
|
| 88 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 89 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 90 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
|
| 91 |
+
<?php endforeach; ?>
|
| 92 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 93 |
+
<small>
|
| 94 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 95 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
|
| 96 |
+
<?php endforeach; ?>
|
| 97 |
+
</small>
|
| 98 |
+
<?php endif; ?>
|
| 99 |
+
</div>
|
| 100 |
+
|
| 101 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 102 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 103 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
|
| 104 |
+
</div>
|
| 105 |
+
<?php endif; ?>
|
| 106 |
+
<?php endif; ?>
|
| 107 |
</td>
|
| 108 |
<?php endif; ?>
|
| 109 |
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 110 |
+
<td class="a-right">
|
| 111 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 112 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 113 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 114 |
+
<?php else: ?>
|
| 115 |
+
<div class="cart-price">
|
| 116 |
+
<?php endif; ?>
|
| 117 |
+
|
| 118 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 119 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 120 |
+
<?php else: ?>
|
| 121 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 122 |
+
<?php endif; ?>
|
| 123 |
+
|
| 124 |
+
</div>
|
| 125 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 126 |
+
|
| 127 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
|
| 128 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 129 |
+
<small>
|
| 130 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 131 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
|
| 132 |
+
<?php endforeach; ?>
|
| 133 |
+
</small>
|
| 134 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 135 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 136 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
|
| 137 |
+
<?php endforeach; ?>
|
| 138 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 139 |
+
<small>
|
| 140 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 141 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
|
| 142 |
+
<?php endforeach; ?>
|
| 143 |
+
</small>
|
| 144 |
+
<?php endif; ?>
|
| 145 |
+
</div>
|
| 146 |
+
|
| 147 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 148 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 149 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
| 150 |
+
</div>
|
| 151 |
+
<?php endif; ?>
|
| 152 |
+
<?php endif; ?>
|
| 153 |
</td>
|
| 154 |
<?php endif; ?>
|
| 155 |
<td class="a-center">
|
| 157 |
</td>
|
| 158 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 159 |
<td class="a-right">
|
| 160 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 161 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 162 |
+
<?php else: ?>
|
| 163 |
+
<div class="cart-price">
|
| 164 |
+
<?php endif; ?>
|
| 165 |
+
|
| 166 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 167 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 168 |
+
<?php else: ?>
|
| 169 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?>
|
| 170 |
+
<?php endif; ?>
|
| 171 |
+
|
| 172 |
+
</div>
|
| 173 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 174 |
+
|
| 175 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
|
| 176 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 177 |
+
<small>
|
| 178 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 179 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 180 |
+
<?php endforeach; ?>
|
| 181 |
+
</small>
|
| 182 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 183 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 184 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 185 |
+
<?php endforeach; ?>
|
| 186 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 187 |
+
<small>
|
| 188 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 189 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 190 |
+
<?php endforeach; ?>
|
| 191 |
+
</small>
|
| 192 |
+
<?php endif; ?>
|
| 193 |
+
</div>
|
| 194 |
+
|
| 195 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 196 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 197 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 198 |
+
</div>
|
| 199 |
+
<?php endif; ?>
|
| 200 |
+
<?php endif; ?>
|
| 201 |
</td>
|
| 202 |
<?php endif; ?>
|
| 203 |
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 204 |
+
<td class="a-right">
|
| 205 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 206 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 207 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 208 |
+
<?php else: ?>
|
| 209 |
+
<div class="cart-price">
|
| 210 |
+
<?php endif; ?>
|
| 211 |
+
|
| 212 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 213 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 214 |
+
<?php else: ?>
|
| 215 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 216 |
+
<?php endif; ?>
|
| 217 |
+
|
| 218 |
+
</div>
|
| 219 |
+
|
| 220 |
+
|
| 221 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 222 |
+
|
| 223 |
+
<div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
|
| 224 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 225 |
+
<small>
|
| 226 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 227 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 228 |
+
<?php endforeach; ?>
|
| 229 |
+
</small>
|
| 230 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 231 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 232 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 233 |
+
<?php endforeach; ?>
|
| 234 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 235 |
+
<small>
|
| 236 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 237 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 238 |
+
<?php endforeach; ?>
|
| 239 |
+
</small>
|
| 240 |
+
<?php endif; ?>
|
| 241 |
+
</div>
|
| 242 |
+
|
| 243 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 244 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 245 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 246 |
+
</div>
|
| 247 |
+
<?php endif; ?>
|
| 248 |
+
<?php endif; ?>
|
| 249 |
</td>
|
| 250 |
<?php endif; ?>
|
| 251 |
</tr>
|
app/design/frontend/blank/default/template/checkout/cart/sidebar/default.phtml
CHANGED
|
@@ -32,14 +32,86 @@
|
|
| 32 |
<h4><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->getProductName() ?></a></h4>
|
| 33 |
<strong><?php echo $this->getQty() ?></strong> x
|
| 34 |
|
| 35 |
-
<?php $_excl = $_item->getCalculationPrice() ? $_item->getCalculationPrice() : $_item->getPrice(); ?>
|
| 36 |
-
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 37 |
-
<?php if ($this->helper('tax')->displayCartPriceInclTax()): $_excl = $_incl; endif; ?>
|
| 38 |
|
| 39 |
-
|
| 40 |
-
|
| 41 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 42 |
<?php endif; ?>
|
|
|
|
| 43 |
<?php if ($_options = $this->getOptionList()):?>
|
| 44 |
<div class="truncated">
|
| 45 |
<div class="truncated_full_value">
|
| 32 |
<h4><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->getProductName() ?></a></h4>
|
| 33 |
<strong><?php echo $this->getQty() ?></strong> x
|
| 34 |
|
|
|
|
|
|
|
|
|
|
| 35 |
|
| 36 |
+
|
| 37 |
+
|
| 38 |
+
|
| 39 |
+
|
| 40 |
+
|
| 41 |
+
|
| 42 |
+
|
| 43 |
+
|
| 44 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 45 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 46 |
+
<?php echo $this->__('Excl. Tax'); ?>:
|
| 47 |
+
<?php endif; ?>
|
| 48 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 49 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
|
| 50 |
+
<?php else: ?>
|
| 51 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?>
|
| 52 |
+
<?php endif; ?>
|
| 53 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 54 |
+
<br />
|
| 55 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 56 |
+
<small>
|
| 57 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 58 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
|
| 59 |
+
<?php endforeach; ?>
|
| 60 |
+
</small>
|
| 61 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 62 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 63 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
|
| 64 |
+
<?php endforeach; ?>
|
| 65 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
|
| 66 |
+
<small>
|
| 67 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 68 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
|
| 69 |
+
<?php endforeach; ?>
|
| 70 |
+
</small>
|
| 71 |
+
<?php endif; ?>
|
| 72 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 73 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
|
| 74 |
+
<?php endif; ?>
|
| 75 |
+
<?php endif; ?>
|
| 76 |
+
<?php endif; ?>
|
| 77 |
+
|
| 78 |
+
|
| 79 |
+
|
| 80 |
+
|
| 81 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 82 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 83 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 84 |
+
<br /><?php echo $this->__('Incl. Tax'); ?>:
|
| 85 |
+
<?php endif; ?>
|
| 86 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
|
| 87 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 88 |
+
<?php else: ?>
|
| 89 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 90 |
+
<?php endif; ?>
|
| 91 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 92 |
+
<br />
|
| 93 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
|
| 94 |
+
<small>
|
| 95 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 96 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
|
| 97 |
+
<?php endforeach; ?>
|
| 98 |
+
</small>
|
| 99 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 100 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 101 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
|
| 102 |
+
<?php endforeach; ?>
|
| 103 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
|
| 104 |
+
<small>
|
| 105 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 106 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
|
| 107 |
+
<?php endforeach; ?>
|
| 108 |
+
</small>
|
| 109 |
+
<?php endif; ?>
|
| 110 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
|
| 111 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
| 112 |
+
<?php endif; ?>
|
| 113 |
<?php endif; ?>
|
| 114 |
+
<?php endif; ?>
|
| 115 |
<?php if ($_options = $this->getOptionList()):?>
|
| 116 |
<div class="truncated">
|
| 117 |
<div class="truncated_full_value">
|
app/design/frontend/blank/default/template/checkout/multishipping/billing.phtml
CHANGED
|
@@ -39,7 +39,7 @@
|
|
| 39 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="multishipping-billing-form">
|
| 40 |
<fieldset class="col2-set multiple-checkout">
|
| 41 |
<div class="col-1 narrow">
|
| 42 |
-
<h3><?php echo $this->__('Billing Address') ?> <span class="separator">|</span> <a href="<?php echo $this->getSelectAddressUrl() ?>"><?php echo $this->__('
|
| 43 |
<?php $_address=$this->getAddress() ?>
|
| 44 |
<address><?php echo $_address->format('html') ?></address>
|
| 45 |
</div>
|
| 39 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="multishipping-billing-form">
|
| 40 |
<fieldset class="col2-set multiple-checkout">
|
| 41 |
<div class="col-1 narrow">
|
| 42 |
+
<h3><?php echo $this->__('Billing Address') ?> <span class="separator">|</span> <a href="<?php echo $this->getSelectAddressUrl() ?>"><?php echo $this->__('Change') ?></a></h3>
|
| 43 |
<?php $_address=$this->getAddress() ?>
|
| 44 |
<address><?php echo $_address->format('html') ?></address>
|
| 45 |
</div>
|
app/design/frontend/blank/default/template/checkout/multishipping/overview.phtml
CHANGED
|
@@ -34,13 +34,13 @@
|
|
| 34 |
<h3><?php echo $this->__('Billing Information') ?></h3>
|
| 35 |
<div class="col-1">
|
| 36 |
<?php $_address=$this->getBillingAddress() ?>
|
| 37 |
-
<h4><?php echo $this->__('Billing Address') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingAddressUrl($_address) ?>"><?php echo $this->__('
|
| 38 |
<address>
|
| 39 |
<?php echo $_address->format('html') ?>
|
| 40 |
</address>
|
| 41 |
</div>
|
| 42 |
<div class="col-2">
|
| 43 |
-
<h4><?php echo $this->__('Payment Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingUrl() ?>"><?php echo $this->__('
|
| 44 |
<input type="hidden" name="payment[cc_number]" value="<?php echo $this->htmlEscape($this->getPayment()->getCcNumber())?>" />
|
| 45 |
<input type="hidden" name="payment[cc_cid]" value="<?php echo $this->htmlEscape($this->getPayment()->getCcCid())?>" />
|
| 46 |
<?php echo $this->getPaymentHtml() ?>
|
|
@@ -52,11 +52,11 @@
|
|
| 52 |
<div class="col2-set">
|
| 53 |
<h4><?php echo $this->__('Address %s of %s', ($_index+1), $this->getShippingAddressCount()) ?></h4>
|
| 54 |
<div class="col-1 narrow">
|
| 55 |
-
<h5><?php echo $this->__('Shipping to') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditShippingAddressUrl($_address) ?>"><?php echo $this->__('
|
| 56 |
<address>
|
| 57 |
<?php echo $_address->format('html') ?>
|
| 58 |
</address>
|
| 59 |
-
<h5><?php echo $this->__('Shipping Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditShippingUrl() ?>"><?php echo $this->__('
|
| 60 |
<?php if($_rate=$this->getShippingAddressRate($_address)): ?>
|
| 61 |
<p>
|
| 62 |
<?php echo $_rate->getCarrierTitle() ?> (<?php echo $_rate->getMethodTitle() ?>)
|
| 34 |
<h3><?php echo $this->__('Billing Information') ?></h3>
|
| 35 |
<div class="col-1">
|
| 36 |
<?php $_address=$this->getBillingAddress() ?>
|
| 37 |
+
<h4><?php echo $this->__('Billing Address') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingAddressUrl($_address) ?>"><?php echo $this->__('Change') ?></a></h4>
|
| 38 |
<address>
|
| 39 |
<?php echo $_address->format('html') ?>
|
| 40 |
</address>
|
| 41 |
</div>
|
| 42 |
<div class="col-2">
|
| 43 |
+
<h4><?php echo $this->__('Payment Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingUrl() ?>"><?php echo $this->__('Change') ?></a></h4>
|
| 44 |
<input type="hidden" name="payment[cc_number]" value="<?php echo $this->htmlEscape($this->getPayment()->getCcNumber())?>" />
|
| 45 |
<input type="hidden" name="payment[cc_cid]" value="<?php echo $this->htmlEscape($this->getPayment()->getCcCid())?>" />
|
| 46 |
<?php echo $this->getPaymentHtml() ?>
|
| 52 |
<div class="col2-set">
|
| 53 |
<h4><?php echo $this->__('Address %s of %s', ($_index+1), $this->getShippingAddressCount()) ?></h4>
|
| 54 |
<div class="col-1 narrow">
|
| 55 |
+
<h5><?php echo $this->__('Shipping to') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditShippingAddressUrl($_address) ?>"><?php echo $this->__('Change') ?></a></h5>
|
| 56 |
<address>
|
| 57 |
<?php echo $_address->format('html') ?>
|
| 58 |
</address>
|
| 59 |
+
<h5><?php echo $this->__('Shipping Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditShippingUrl() ?>"><?php echo $this->__('Change') ?></a></h5>
|
| 60 |
<?php if($_rate=$this->getShippingAddressRate($_address)): ?>
|
| 61 |
<p>
|
| 62 |
<?php echo $_rate->getCarrierTitle() ?> (<?php echo $_rate->getMethodTitle() ?>)
|
app/design/frontend/blank/default/template/checkout/multishipping/shipping.phtml
CHANGED
|
@@ -41,7 +41,7 @@
|
|
| 41 |
<h3><?php echo $this->__('Address %s of %s', ($_index+1), $this->getAddressCount()) ?></h3>
|
| 42 |
<div class="col2-set">
|
| 43 |
<div class="col-1 narrow">
|
| 44 |
-
<h4><?php echo $this->__('Shipping to') ?> <span class="separator">|</span> <a href="<?php echo $this->getAddressEditUrl($_address) ?>"><?php echo $this->__('
|
| 45 |
<address><?php echo $_address->format('html') ?></address>
|
| 46 |
<h4><?php echo $this->__('Shipping Method') ?></h4>
|
| 47 |
<?php if (!($_shippingRateGroups = $this->getShippingRates($_address))): ?>
|
| 41 |
<h3><?php echo $this->__('Address %s of %s', ($_index+1), $this->getAddressCount()) ?></h3>
|
| 42 |
<div class="col2-set">
|
| 43 |
<div class="col-1 narrow">
|
| 44 |
+
<h4><?php echo $this->__('Shipping to') ?> <span class="separator">|</span> <a href="<?php echo $this->getAddressEditUrl($_address) ?>"><?php echo $this->__('Change') ?></a></h4>
|
| 45 |
<address><?php echo $_address->format('html') ?></address>
|
| 46 |
<h4><?php echo $this->__('Shipping Method') ?></h4>
|
| 47 |
<?php if (!($_shippingRateGroups = $this->getShippingRates($_address))): ?>
|
app/design/frontend/blank/default/template/checkout/multishipping/success.phtml
CHANGED
|
@@ -40,6 +40,7 @@
|
|
| 40 |
<a href="<?php echo $this->getViewOrderUrl($orderId) ?>"><?php echo $incrementId ?></a>
|
| 41 |
<?php endforeach; ?>
|
| 42 |
<?php endif; ?>
|
|
|
|
| 43 |
<div class="buttons-set">
|
| 44 |
<button class="button" onclick="setLocation('<?php echo $this->getContinueUrl() ?>')"><span><?php echo $this->__('Continue Shopping') ?></span></button>
|
| 45 |
</div>
|
| 40 |
<a href="<?php echo $this->getViewOrderUrl($orderId) ?>"><?php echo $incrementId ?></a>
|
| 41 |
<?php endforeach; ?>
|
| 42 |
<?php endif; ?>
|
| 43 |
+
<?php echo $this->getChildHtml() ?>
|
| 44 |
<div class="buttons-set">
|
| 45 |
<button class="button" onclick="setLocation('<?php echo $this->getContinueUrl() ?>')"><span><?php echo $this->__('Continue Shopping') ?></span></button>
|
| 46 |
</div>
|
app/design/frontend/blank/default/template/checkout/onepage/billing.phtml
CHANGED
|
@@ -115,7 +115,7 @@
|
|
| 115 |
<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
|
| 116 |
<li><input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="billing:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /> <label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
|
| 117 |
<?php else:?>
|
| 118 |
-
<li><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
|
| 119 |
<?php endif; ?>
|
| 120 |
</ul>
|
| 121 |
</fieldset>
|
| 115 |
<?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
|
| 116 |
<li><input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="billing:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /> <label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
|
| 117 |
<?php else:?>
|
| 118 |
+
<li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
|
| 119 |
<?php endif; ?>
|
| 120 |
</ul>
|
| 121 |
</fieldset>
|
app/design/frontend/blank/default/template/checkout/onepage/progress.phtml
CHANGED
|
@@ -33,7 +33,7 @@
|
|
| 33 |
<?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
|
| 34 |
<?php if($this->getCheckout()->getStepData('billing', 'complete')): ?>
|
| 35 |
<dt class="complete">
|
| 36 |
-
<?php echo $this->__('Billing Address') ?> <span class="separator">|</span> <a href="#billing" onclick="checkout.accordion.openSection('opc-billing'); return false;"><?php echo $this->__('
|
| 37 |
</dt>
|
| 38 |
<dd class="complete">
|
| 39 |
<address><?php echo $this->getBilling()->format('html') ?></address>
|
|
@@ -48,7 +48,7 @@
|
|
| 48 |
<?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
|
| 49 |
<?php if($this->getCheckout()->getStepData('shipping', 'complete')): ?>
|
| 50 |
<dt class="complete">
|
| 51 |
-
<?php echo $this->__('Shipping Address') ?> <span class="separator">|</span> <a href="#payment" onclick="checkout.accordion.openSection('opc-shipping');return false;"><?php echo $this->__('
|
| 52 |
</dt>
|
| 53 |
<dd class="complete">
|
| 54 |
<address><?php echo $this->getShipping()->format('html') ?></address>
|
|
@@ -63,7 +63,7 @@
|
|
| 63 |
<?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
|
| 64 |
<?php if($this->getCheckout()->getStepData('shipping_method', 'complete')): ?>
|
| 65 |
<dt class="complete">
|
| 66 |
-
<?php echo $this->__('Shipping Method') ?> <span class="separator">|</span> <a href="#shipping_method" onclick="checkout.accordion.openSection('opc-shipping_method'); return false;"><?php echo $this->__('
|
| 67 |
</dt>
|
| 68 |
<dd class="complete">
|
| 69 |
<?php if ($this->getShippingMethod()): ?>
|
|
@@ -94,7 +94,7 @@
|
|
| 94 |
<?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
|
| 95 |
<?php if($this->getCheckout()->getStepData('payment', 'complete')): ?>
|
| 96 |
<dt class="complete">
|
| 97 |
-
<?php echo $this->__('Payment Method') ?> <span class="separator">|</span> <a href="#payment" onclick="checkout.accordion.openSection('opc-payment'); return false;"><?php echo $this->__('
|
| 98 |
</dt>
|
| 99 |
<dd class="complete">
|
| 100 |
<?php echo $this->getPaymentHtml() ?>
|
| 33 |
<?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
|
| 34 |
<?php if($this->getCheckout()->getStepData('billing', 'complete')): ?>
|
| 35 |
<dt class="complete">
|
| 36 |
+
<?php echo $this->__('Billing Address') ?> <span class="separator">|</span> <a href="#billing" onclick="checkout.accordion.openSection('opc-billing'); return false;"><?php echo $this->__('Change') ?></a>
|
| 37 |
</dt>
|
| 38 |
<dd class="complete">
|
| 39 |
<address><?php echo $this->getBilling()->format('html') ?></address>
|
| 48 |
<?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
|
| 49 |
<?php if($this->getCheckout()->getStepData('shipping', 'complete')): ?>
|
| 50 |
<dt class="complete">
|
| 51 |
+
<?php echo $this->__('Shipping Address') ?> <span class="separator">|</span> <a href="#payment" onclick="checkout.accordion.openSection('opc-shipping');return false;"><?php echo $this->__('Change') ?></a>
|
| 52 |
</dt>
|
| 53 |
<dd class="complete">
|
| 54 |
<address><?php echo $this->getShipping()->format('html') ?></address>
|
| 63 |
<?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
|
| 64 |
<?php if($this->getCheckout()->getStepData('shipping_method', 'complete')): ?>
|
| 65 |
<dt class="complete">
|
| 66 |
+
<?php echo $this->__('Shipping Method') ?> <span class="separator">|</span> <a href="#shipping_method" onclick="checkout.accordion.openSection('opc-shipping_method'); return false;"><?php echo $this->__('Change') ?></a>
|
| 67 |
</dt>
|
| 68 |
<dd class="complete">
|
| 69 |
<?php if ($this->getShippingMethod()): ?>
|
| 94 |
<?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
|
| 95 |
<?php if($this->getCheckout()->getStepData('payment', 'complete')): ?>
|
| 96 |
<dt class="complete">
|
| 97 |
+
<?php echo $this->__('Payment Method') ?> <span class="separator">|</span> <a href="#payment" onclick="checkout.accordion.openSection('opc-payment'); return false;"><?php echo $this->__('Change') ?></a>
|
| 98 |
</dt>
|
| 99 |
<dd class="complete">
|
| 100 |
<?php echo $this->getPaymentHtml() ?>
|
app/design/frontend/blank/default/template/checkout/onepage/review/item.phtml
CHANGED
|
@@ -47,16 +47,190 @@
|
|
| 47 |
<?php endif;?>
|
| 48 |
</td>
|
| 49 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 50 |
-
<td class="a-right"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
<?php endif; ?>
|
| 52 |
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 53 |
-
<td
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 54 |
<?php endif; ?>
|
| 55 |
<td class="a-center"><?php echo $_item->getQty() ?></td>
|
| 56 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 57 |
-
<td class="a-right"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 58 |
<?php endif; ?>
|
| 59 |
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 60 |
-
<td
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 61 |
<?php endif; ?>
|
| 62 |
</tr>
|
| 47 |
<?php endif;?>
|
| 48 |
</td>
|
| 49 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 50 |
+
<td class="a-right">
|
| 51 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 52 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 53 |
+
<?php else: ?>
|
| 54 |
+
<div class="cart-price">
|
| 55 |
+
<?php endif; ?>
|
| 56 |
+
|
| 57 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 58 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
|
| 59 |
+
<?php else: ?>
|
| 60 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?>
|
| 61 |
+
<?php endif; ?>
|
| 62 |
+
|
| 63 |
+
</div>
|
| 64 |
+
|
| 65 |
+
|
| 66 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 67 |
+
|
| 68 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
|
| 69 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 70 |
+
<small>
|
| 71 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 72 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
|
| 73 |
+
<?php endforeach; ?>
|
| 74 |
+
</small>
|
| 75 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 76 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 77 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
|
| 78 |
+
<?php endforeach; ?>
|
| 79 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 80 |
+
<small>
|
| 81 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 82 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
|
| 83 |
+
<?php endforeach; ?>
|
| 84 |
+
</small>
|
| 85 |
+
<?php endif; ?>
|
| 86 |
+
</div>
|
| 87 |
+
|
| 88 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 89 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 90 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
|
| 91 |
+
</div>
|
| 92 |
+
<?php endif; ?>
|
| 93 |
+
<?php endif; ?>
|
| 94 |
+
</td>
|
| 95 |
<?php endif; ?>
|
| 96 |
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 97 |
+
<td class="a-right">
|
| 98 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
| 99 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 100 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 101 |
+
<?php else: ?>
|
| 102 |
+
<div class="cart-price">
|
| 103 |
+
<?php endif; ?>
|
| 104 |
+
|
| 105 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 106 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
| 107 |
+
<?php else: ?>
|
| 108 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
|
| 109 |
+
<?php endif; ?>
|
| 110 |
+
|
| 111 |
+
</div>
|
| 112 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 113 |
+
|
| 114 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
|
| 115 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 116 |
+
<small>
|
| 117 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 118 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
|
| 119 |
+
<?php endforeach; ?>
|
| 120 |
+
</small>
|
| 121 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 122 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 123 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
|
| 124 |
+
<?php endforeach; ?>
|
| 125 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 126 |
+
<small>
|
| 127 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 128 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
|
| 129 |
+
<?php endforeach; ?>
|
| 130 |
+
</small>
|
| 131 |
+
<?php endif; ?>
|
| 132 |
+
</div>
|
| 133 |
+
|
| 134 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 135 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 136 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
| 137 |
+
</div>
|
| 138 |
+
<?php endif; ?>
|
| 139 |
+
<?php endif; ?>
|
| 140 |
+
</td>
|
| 141 |
<?php endif; ?>
|
| 142 |
<td class="a-center"><?php echo $_item->getQty() ?></td>
|
| 143 |
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 144 |
+
<td class="a-right">
|
| 145 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 146 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 147 |
+
<?php else: ?>
|
| 148 |
+
<div class="cart-price">
|
| 149 |
+
<?php endif; ?>
|
| 150 |
+
|
| 151 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 152 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 153 |
+
<?php else: ?>
|
| 154 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?>
|
| 155 |
+
<?php endif; ?>
|
| 156 |
+
|
| 157 |
+
</div>
|
| 158 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 159 |
+
|
| 160 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
|
| 161 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 162 |
+
<small>
|
| 163 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 164 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 165 |
+
<?php endforeach; ?>
|
| 166 |
+
</small>
|
| 167 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 168 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 169 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 170 |
+
<?php endforeach; ?>
|
| 171 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 172 |
+
<small>
|
| 173 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 174 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 175 |
+
<?php endforeach; ?>
|
| 176 |
+
</small>
|
| 177 |
+
<?php endif; ?>
|
| 178 |
+
</div>
|
| 179 |
+
|
| 180 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 181 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 182 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 183 |
+
</div>
|
| 184 |
+
<?php endif; ?>
|
| 185 |
+
<?php endif; ?>
|
| 186 |
+
</td>
|
| 187 |
<?php endif; ?>
|
| 188 |
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 189 |
+
<td class="a-right">
|
| 190 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 191 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 192 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 193 |
+
<?php else: ?>
|
| 194 |
+
<div class="cart-price">
|
| 195 |
+
<?php endif; ?>
|
| 196 |
+
|
| 197 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 198 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 199 |
+
<?php else: ?>
|
| 200 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 201 |
+
<?php endif; ?>
|
| 202 |
+
|
| 203 |
+
</div>
|
| 204 |
+
|
| 205 |
+
|
| 206 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 207 |
+
|
| 208 |
+
<div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
|
| 209 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 210 |
+
<small>
|
| 211 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 212 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 213 |
+
<?php endforeach; ?>
|
| 214 |
+
</small>
|
| 215 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 216 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 217 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 218 |
+
<?php endforeach; ?>
|
| 219 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 220 |
+
<small>
|
| 221 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 222 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 223 |
+
<?php endforeach; ?>
|
| 224 |
+
</small>
|
| 225 |
+
<?php endif; ?>
|
| 226 |
+
</div>
|
| 227 |
+
|
| 228 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
| 229 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 230 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 231 |
+
</div>
|
| 232 |
+
<?php endif; ?>
|
| 233 |
+
<?php endif; ?>
|
| 234 |
+
</td>
|
| 235 |
<?php endif; ?>
|
| 236 |
</tr>
|
app/design/frontend/blank/default/template/checkout/success.phtml
CHANGED
|
@@ -36,7 +36,10 @@
|
|
| 36 |
<?php endif;?>
|
| 37 |
<p><?php echo $this->__('You will receive an order confirmation email with details of your order and a link to track its progress.') ?></p>
|
| 38 |
<?php if ($this->canPrint()) :?>
|
| 39 |
-
<p
|
|
|
|
|
|
|
|
|
|
| 40 |
<?php endif;?>
|
| 41 |
<div class="buttons-set">
|
| 42 |
<button type="button" class="button" onclick="window.location='<?php echo $this->getUrl() ?>'"><span><?php echo $this->__('Continue Shopping') ?></span></button>
|
| 36 |
<?php endif;?>
|
| 37 |
<p><?php echo $this->__('You will receive an order confirmation email with details of your order and a link to track its progress.') ?></p>
|
| 38 |
<?php if ($this->canPrint()) :?>
|
| 39 |
+
<p>
|
| 40 |
+
<?php echo $this->__('Click <a href="%s" onclick="this.target=\'_blank\'">here to print</a> a copy of your order confirmation.', $this->getPrintUrl()) ?>
|
| 41 |
+
<?php echo $this->getChildHtml() ?>
|
| 42 |
+
</p>
|
| 43 |
<?php endif;?>
|
| 44 |
<div class="buttons-set">
|
| 45 |
<button type="button" class="button" onclick="window.location='<?php echo $this->getUrl() ?>'"><span><?php echo $this->__('Continue Shopping') ?></span></button>
|
app/design/frontend/blank/default/template/checkout/total/tax.phtml
CHANGED
|
@@ -25,9 +25,10 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php global $taxIter; $taxIter++; ?>
|
| 28 |
-
<?php if ($this->helper('tax')->displayFullSummary()): ?>
|
| 29 |
<?php $isTop = 1; ?>
|
| 30 |
<?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
|
|
|
|
| 31 |
<?php $percent = $info['percent']; ?>
|
| 32 |
<?php $amount = $info['amount']; ?>
|
| 33 |
<?php $rates = $info['rates']; ?>
|
|
@@ -36,7 +37,11 @@
|
|
| 36 |
<?php foreach ($rates as $rate): ?>
|
| 37 |
<tr class="tax-details-<?php echo $taxIter; ?> tax-details<?php if ($isTop): echo ' tax-details-first'; endif; ?>" style="display:none;">
|
| 38 |
<td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
|
| 39 |
-
<?php echo $rate['title']; ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
</td>
|
| 41 |
<?php if ($isFirst): ?>
|
| 42 |
<td rowspan="<?php echo count($rates); ?>" class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>">
|
|
@@ -49,7 +54,7 @@
|
|
| 49 |
<?php endforeach; ?>
|
| 50 |
<?php endforeach; ?>
|
| 51 |
<?php endif;?>
|
| 52 |
-
<tr<?php if ($this->helper('tax')->displayFullSummary()): ?> class="tax-total" onclick="expandDetails(this, '.tax-details-<?php echo $taxIter;?>')"<?php endif; ?>>
|
| 53 |
<td class="a-right" colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>">
|
| 54 |
<?php if ($this->helper('tax')->displayFullSummary()): ?>
|
| 55 |
<div class="tax-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php global $taxIter; $taxIter++; ?>
|
| 28 |
+
<?php if ($this->helper('tax')->displayFullSummary() && $this->getTotal()->getValue()!=0): ?>
|
| 29 |
<?php $isTop = 1; ?>
|
| 30 |
<?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
|
| 31 |
+
<?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
|
| 32 |
<?php $percent = $info['percent']; ?>
|
| 33 |
<?php $amount = $info['amount']; ?>
|
| 34 |
<?php $rates = $info['rates']; ?>
|
| 37 |
<?php foreach ($rates as $rate): ?>
|
| 38 |
<tr class="tax-details-<?php echo $taxIter; ?> tax-details<?php if ($isTop): echo ' tax-details-first'; endif; ?>" style="display:none;">
|
| 39 |
<td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
|
| 40 |
+
<?php echo $rate['title']; ?>
|
| 41 |
+
<?php if ($rate['percent']): ?>
|
| 42 |
+
(<?php echo $rate['percent']; ?>%)
|
| 43 |
+
<?php endif; ?>
|
| 44 |
+
<br />
|
| 45 |
</td>
|
| 46 |
<?php if ($isFirst): ?>
|
| 47 |
<td rowspan="<?php echo count($rates); ?>" class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>">
|
| 54 |
<?php endforeach; ?>
|
| 55 |
<?php endforeach; ?>
|
| 56 |
<?php endif;?>
|
| 57 |
+
<tr<?php if ($this->helper('tax')->displayFullSummary() && $this->getTotal()->getValue()!=0): ?> class="tax-total" onclick="expandDetails(this, '.tax-details-<?php echo $taxIter;?>')"<?php endif; ?>>
|
| 58 |
<td class="a-right" colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>">
|
| 59 |
<?php if ($this->helper('tax')->displayFullSummary()): ?>
|
| 60 |
<div class="tax-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
|
app/design/frontend/blank/default/template/contacts/form.phtml
CHANGED
|
@@ -30,7 +30,7 @@
|
|
| 30 |
</div>
|
| 31 |
<form action="<?php echo $this->getFormAction(); ?>" id="contactForm" method="post">
|
| 32 |
<fieldset class="group-select">
|
| 33 |
-
<h3
|
| 34 |
<ul>
|
| 35 |
<li>
|
| 36 |
<div class="input-box">
|
|
@@ -51,7 +51,7 @@
|
|
| 51 |
</li>
|
| 52 |
<li>
|
| 53 |
<label for="comment"><?php echo Mage::helper('contacts')->__('Comment') ?></label><br />
|
| 54 |
-
<textarea name="comment" id="comment" title="<?php echo Mage::helper('contacts')->__('Comment') ?>" class="input-text" style="height:150px;" cols="5" rows="3"></textarea>
|
| 55 |
</li>
|
| 56 |
</ul>
|
| 57 |
</fieldset>
|
| 30 |
</div>
|
| 31 |
<form action="<?php echo $this->getFormAction(); ?>" id="contactForm" method="post">
|
| 32 |
<fieldset class="group-select">
|
| 33 |
+
<h3><?php echo Mage::helper('contacts')->__('Contact Information') ?></h3>
|
| 34 |
<ul>
|
| 35 |
<li>
|
| 36 |
<div class="input-box">
|
| 51 |
</li>
|
| 52 |
<li>
|
| 53 |
<label for="comment"><?php echo Mage::helper('contacts')->__('Comment') ?></label><br />
|
| 54 |
+
<textarea name="comment" id="comment" title="<?php echo Mage::helper('contacts')->__('Comment') ?>" class="required-entry input-text" style="height:150px;" cols="5" rows="3"></textarea>
|
| 55 |
</li>
|
| 56 |
</ul>
|
| 57 |
</fieldset>
|
app/design/frontend/blank/default/template/core/formkey.phtml
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
app/design/frontend/blank/default/template/customer/address/edit.phtml
CHANGED
|
@@ -38,10 +38,11 @@
|
|
| 38 |
<?php endif; ?>
|
| 39 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 40 |
<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
|
|
|
|
| 41 |
<fieldset class="group-select">
|
| 42 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
| 43 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
| 44 |
-
<h3
|
| 45 |
<ul>
|
| 46 |
<li>
|
| 47 |
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getCustomer())->toHtml() ?>
|
|
@@ -63,7 +64,7 @@
|
|
| 63 |
</ul>
|
| 64 |
</fieldset>
|
| 65 |
<fieldset class="group-select">
|
| 66 |
-
<h3
|
| 67 |
<ul>
|
| 68 |
<li>
|
| 69 |
<label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
|
| 38 |
<?php endif; ?>
|
| 39 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 40 |
<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
|
| 41 |
+
<?php echo $this->getBlockHtml('formkey')?>
|
| 42 |
<fieldset class="group-select">
|
| 43 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
| 44 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
| 45 |
+
<h3><?php echo $this->__('Contact Information') ?></h3>
|
| 46 |
<ul>
|
| 47 |
<li>
|
| 48 |
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getCustomer())->toHtml() ?>
|
| 64 |
</ul>
|
| 65 |
</fieldset>
|
| 66 |
<fieldset class="group-select">
|
| 67 |
+
<h3><?php echo $this->__('Address') ?></h3>
|
| 68 |
<ul>
|
| 69 |
<li>
|
| 70 |
<label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
|
app/design/frontend/blank/default/template/customer/form/address.phtml
CHANGED
|
@@ -34,7 +34,7 @@
|
|
| 34 |
<fieldset class="group-select">
|
| 35 |
<input type="hidden" name="address_id" value="<?php echo $data->getAddressId() ?>" />
|
| 36 |
<input type="hidden" name="customer_id" id="address_id" value="<?php echo $data->getCustomerId() ?>" />
|
| 37 |
-
<h3
|
| 38 |
<ul>
|
| 39 |
<li>
|
| 40 |
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($data)->toHtml() ?>
|
|
@@ -48,7 +48,7 @@
|
|
| 48 |
</ul>
|
| 49 |
</fieldset>
|
| 50 |
<fieldset class="group-select">
|
| 51 |
-
<h3
|
| 52 |
<ul>
|
| 53 |
<li>
|
| 54 |
<label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
|
| 34 |
<fieldset class="group-select">
|
| 35 |
<input type="hidden" name="address_id" value="<?php echo $data->getAddressId() ?>" />
|
| 36 |
<input type="hidden" name="customer_id" id="address_id" value="<?php echo $data->getCustomerId() ?>" />
|
| 37 |
+
<h3><?php echo $this->__('Personal Information') ?></h3>
|
| 38 |
<ul>
|
| 39 |
<li>
|
| 40 |
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($data)->toHtml() ?>
|
| 48 |
</ul>
|
| 49 |
</fieldset>
|
| 50 |
<fieldset class="group-select">
|
| 51 |
+
<h3><?php echo $this->__('Address') ?></h3>
|
| 52 |
<ul>
|
| 53 |
<li>
|
| 54 |
<label for="street_1"><?php echo $this->__('Street Address') ?> <span class="required">*</span></label><br />
|
app/design/frontend/blank/default/template/customer/form/edit.phtml
CHANGED
|
@@ -29,8 +29,9 @@
|
|
| 29 |
</div>
|
| 30 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 31 |
<form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate">
|
|
|
|
| 32 |
<fieldset class="group-select">
|
| 33 |
-
<h3
|
| 34 |
<ul>
|
| 35 |
<li>
|
| 36 |
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getCustomer())->toHtml() ?>
|
| 29 |
</div>
|
| 30 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 31 |
<form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate">
|
| 32 |
+
<?php echo $this->getBlockHtml('formkey')?>
|
| 33 |
<fieldset class="group-select">
|
| 34 |
+
<h3><?php echo $this->__('Account Information') ?></h3>
|
| 35 |
<ul>
|
| 36 |
<li>
|
| 37 |
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getCustomer())->toHtml() ?>
|
app/design/frontend/blank/default/template/customer/form/newsletter.phtml
CHANGED
|
@@ -29,6 +29,7 @@
|
|
| 29 |
</div>
|
| 30 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 31 |
<form action="<?php echo $this->getAction() ?>" method="post" id="form-validate">
|
|
|
|
| 32 |
<p><input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo $this->__('General Subscription') ?>"<?php if($this->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" /> <label for="subscription"><?php echo $this->__('General Subscription') ?></label></p>
|
| 33 |
<div class="buttons-set">
|
| 34 |
<a href="<?php echo $this->getBackUrl() ?>" class="back-link">« <?php echo $this->__('Back') ?></a>
|
| 29 |
</div>
|
| 30 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 31 |
<form action="<?php echo $this->getAction() ?>" method="post" id="form-validate">
|
| 32 |
+
<?php echo $this->getBlockHtml('formkey')?>
|
| 33 |
<p><input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo $this->__('General Subscription') ?>"<?php if($this->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" /> <label for="subscription"><?php echo $this->__('General Subscription') ?></label></p>
|
| 34 |
<div class="buttons-set">
|
| 35 |
<a href="<?php echo $this->getBackUrl() ?>" class="back-link">« <?php echo $this->__('Back') ?></a>
|
app/design/frontend/blank/default/template/customer/form/register.phtml
CHANGED
|
@@ -39,7 +39,7 @@
|
|
| 39 |
<fieldset class="group-select">
|
| 40 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
| 41 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
| 42 |
-
<h3
|
| 43 |
<ul>
|
| 44 |
<li>
|
| 45 |
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->toHtml() ?>
|
|
@@ -69,7 +69,7 @@
|
|
| 69 |
<?php if($this->getShowAddressFields()): ?>
|
| 70 |
<fieldset class="group-select">
|
| 71 |
<input type="hidden" name="create_address" value="1" />
|
| 72 |
-
<h3
|
| 73 |
<ul>
|
| 74 |
<li>
|
| 75 |
<div class="input-box">
|
|
@@ -122,7 +122,7 @@
|
|
| 122 |
</fieldset>
|
| 123 |
<?php endif; ?>
|
| 124 |
<fieldset class="group-select">
|
| 125 |
-
<h3
|
| 126 |
<ul>
|
| 127 |
<li>
|
| 128 |
<div class="input-box">
|
| 39 |
<fieldset class="group-select">
|
| 40 |
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
|
| 41 |
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
|
| 42 |
+
<h3><?php echo $this->__('Personal Information') ?></h3>
|
| 43 |
<ul>
|
| 44 |
<li>
|
| 45 |
<?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getFormData())->toHtml() ?>
|
| 69 |
<?php if($this->getShowAddressFields()): ?>
|
| 70 |
<fieldset class="group-select">
|
| 71 |
<input type="hidden" name="create_address" value="1" />
|
| 72 |
+
<h3><?php echo $this->__('Address Information') ?></h3>
|
| 73 |
<ul>
|
| 74 |
<li>
|
| 75 |
<div class="input-box">
|
| 122 |
</fieldset>
|
| 123 |
<?php endif; ?>
|
| 124 |
<fieldset class="group-select">
|
| 125 |
+
<h3><?php echo $this->__('Login Information') ?></h3>
|
| 126 |
<ul>
|
| 127 |
<li>
|
| 128 |
<div class="input-box">
|
app/design/frontend/blank/default/template/customer/widget/dob.phtml
CHANGED
|
@@ -50,7 +50,7 @@ NOTE: Regarding styles - if we leave it this way, we'll move it to boxes.css
|
|
| 50 |
<?php echo $this->__('Date of Birth') ?>
|
| 51 |
<?php if ($this->isRequired()):?><span class="required">*</span><?php endif; ?>
|
| 52 |
</label>
|
| 53 |
-
|
| 54 |
<div class="input-box dob-day">
|
| 55 |
<input type="text" id="<?php echo $this->getFieldId('day')?>" name="<?php echo $this->getFieldName('day')?>" value="<?php echo $this->getDay() ?>" title="<?php echo $this->__('Day') ?>" class="input-text validate-custom" <?php echo $this->getFieldParams() ?> />
|
| 56 |
<label for="<?php echo $this->getFieldId('day')?>"><?php echo $this->__('DD') ?></label>
|
|
@@ -69,11 +69,11 @@ NOTE: Regarding styles - if we leave it this way, we'll move it to boxes.css
|
|
| 69 |
<div class="dob-full" style="display:none;">
|
| 70 |
<input type="hidden" id="<?php echo $this->getFieldId('dob')?>" name="<?php echo $this->getFieldName('dob')?>" />
|
| 71 |
</div>
|
| 72 |
-
|
| 73 |
<div class="validation-advice" style="opacity: 0.999999; display:none;"></div>
|
| 74 |
</div>
|
| 75 |
<script type="text/javascript">
|
| 76 |
//<![CDATA[
|
| 77 |
-
var customer_dob = new Varien.DOB('.customer-dob', <?php echo $this->isRequired() ? 'true' : 'false' ?>);
|
| 78 |
//]]>
|
| 79 |
</script>
|
| 50 |
<?php echo $this->__('Date of Birth') ?>
|
| 51 |
<?php if ($this->isRequired()):?><span class="required">*</span><?php endif; ?>
|
| 52 |
</label>
|
| 53 |
+
|
| 54 |
<div class="input-box dob-day">
|
| 55 |
<input type="text" id="<?php echo $this->getFieldId('day')?>" name="<?php echo $this->getFieldName('day')?>" value="<?php echo $this->getDay() ?>" title="<?php echo $this->__('Day') ?>" class="input-text validate-custom" <?php echo $this->getFieldParams() ?> />
|
| 56 |
<label for="<?php echo $this->getFieldId('day')?>"><?php echo $this->__('DD') ?></label>
|
| 69 |
<div class="dob-full" style="display:none;">
|
| 70 |
<input type="hidden" id="<?php echo $this->getFieldId('dob')?>" name="<?php echo $this->getFieldName('dob')?>" />
|
| 71 |
</div>
|
| 72 |
+
|
| 73 |
<div class="validation-advice" style="opacity: 0.999999; display:none;"></div>
|
| 74 |
</div>
|
| 75 |
<script type="text/javascript">
|
| 76 |
//<![CDATA[
|
| 77 |
+
var customer_dob = new Varien.DOB('.customer-dob', <?php echo $this->isRequired() ? 'true' : 'false' ?>, '<?php echo $this->getDateFormat() ?>');
|
| 78 |
//]]>
|
| 79 |
</script>
|
app/design/frontend/blank/default/template/downloadable/catalog/product/links.phtml
ADDED
|
@@ -0,0 +1,111 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
|
| 28 |
+
/**
|
| 29 |
+
* Downloadable product links
|
| 30 |
+
*
|
| 31 |
+
* @see Mage_Downloadable_Block_Catalog_Product_Links
|
| 32 |
+
*/
|
| 33 |
+
?>
|
| 34 |
+
<?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately() ?>
|
| 35 |
+
<?php if ($this->getProduct()->isSaleable() && $this->hasLinks()):?>
|
| 36 |
+
<dl>
|
| 37 |
+
<?php $_links = $this->getLinks(); ?>
|
| 38 |
+
<?php $_isRequired = $this->getLinkSelectionRequired(); ?>
|
| 39 |
+
<dt><label><?php echo $this->getLinksTitle() ?><?php if ($_isRequired): ?><span class="required"> *</span><?php endif; ?></label></dt>
|
| 40 |
+
<dd<?php /* if ($_option->decoratedIsLast){?> class="last"<?php } */ ?>>
|
| 41 |
+
<ul id="downloadable-links-list" class="options-list">
|
| 42 |
+
<?php foreach ($_links as $_link): ?>
|
| 43 |
+
<li>
|
| 44 |
+
<?php if ($_linksPurchasedSeparately): ?>
|
| 45 |
+
<input type="checkbox" class="checkbox<?php if($_isRequired):?> validate-one-required-by-name<?php endif; ?> product-downloadable-link" onclick="dConfig.reloadPrice()" name="links[]" id="links_<?php echo $_link->getId() ?>" value="<?php echo $_link->getId() ?>" />
|
| 46 |
+
<?php endif; ?>
|
| 47 |
+
<span class="label">
|
| 48 |
+
<label for="links_<?php echo $_link->getId() ?>">
|
| 49 |
+
<?php echo $_link->getTitle() ?>
|
| 50 |
+
</label>
|
| 51 |
+
<?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
|
| 52 |
+
(<a href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo Mage::helper('downloadable')->__('sample') ?></a>)
|
| 53 |
+
<?php endif; ?>
|
| 54 |
+
<?php if ($_linksPurchasedSeparately): ?>
|
| 55 |
+
<?php echo $this->getFormattedLinkPrice($_link); ?>
|
| 56 |
+
<?php endif; ?>
|
| 57 |
+
</span>
|
| 58 |
+
<?php if ($_isRequired): ?>
|
| 59 |
+
<script type="text/javascript">
|
| 60 |
+
$('links_<?php echo $_link->getId() ?>').advaiceContainer = 'links-advice-container';
|
| 61 |
+
$('links_<?php echo $_link->getId() ?>').callbackFunction = 'validateDownloadableCallback';
|
| 62 |
+
</script>
|
| 63 |
+
<?php endif; ?>
|
| 64 |
+
</li>
|
| 65 |
+
<?php endforeach; ?>
|
| 66 |
+
</ul>
|
| 67 |
+
|
| 68 |
+
<?php if ($_isRequired): ?>
|
| 69 |
+
<span id="links-advice-container"></span>
|
| 70 |
+
<?php endif;?>
|
| 71 |
+
</dd>
|
| 72 |
+
</dl>
|
| 73 |
+
<script type="text/javascript">
|
| 74 |
+
Product.Downloadable = Class.create();
|
| 75 |
+
Product.Downloadable.prototype = {
|
| 76 |
+
config : {},
|
| 77 |
+
initialize : function(config){
|
| 78 |
+
this.config = config;
|
| 79 |
+
this.reloadPrice();
|
| 80 |
+
},
|
| 81 |
+
reloadPrice : function(){
|
| 82 |
+
var price = 0;
|
| 83 |
+
config = this.config;
|
| 84 |
+
$$('.product-downloadable-link').each(function(elm){
|
| 85 |
+
if (config[elm.value] && elm.checked) {
|
| 86 |
+
price += parseFloat(config[elm.value]);
|
| 87 |
+
}
|
| 88 |
+
});
|
| 89 |
+
try {
|
| 90 |
+
optionsPrice.changePrice('downloadable', price);
|
| 91 |
+
optionsPrice.reload();
|
| 92 |
+
} catch (e) {
|
| 93 |
+
|
| 94 |
+
}
|
| 95 |
+
}
|
| 96 |
+
};
|
| 97 |
+
|
| 98 |
+
function validateDownloadableCallback(elmId, result) {
|
| 99 |
+
var container = $('downloadable-links-list');
|
| 100 |
+
if (result == 'failed') {
|
| 101 |
+
container.removeClassName('validation-passed');
|
| 102 |
+
container.addClassName('validation-failed');
|
| 103 |
+
} else {
|
| 104 |
+
container.removeClassName('validation-failed');
|
| 105 |
+
container.addClassName('validation-passed');
|
| 106 |
+
}
|
| 107 |
+
}
|
| 108 |
+
|
| 109 |
+
var dConfig = new Product.Downloadable(<?php echo $this->getJsonConfig() ?>);
|
| 110 |
+
</script>
|
| 111 |
+
<?php endif;?>
|
app/design/frontend/blank/default/template/downloadable/catalog/product/samples.phtml
ADDED
|
@@ -0,0 +1,45 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
|
| 28 |
+
/**
|
| 29 |
+
* Downloadable product links
|
| 30 |
+
*
|
| 31 |
+
* @see Mage_Downloadable_Block_Catalog_Product_Samples
|
| 32 |
+
*/
|
| 33 |
+
?>
|
| 34 |
+
|
| 35 |
+
<?php if ($this->hasSamples()): ?>
|
| 36 |
+
<dl class="item-options">
|
| 37 |
+
<dt><?php echo $this->getSamplesTitle() ?></dt>
|
| 38 |
+
<?php $_samples = $this->getSamples() ?>
|
| 39 |
+
<?php foreach ($_samples as $_sample): ?>
|
| 40 |
+
<dd>
|
| 41 |
+
<a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $_sample->getTitle() ?></a>
|
| 42 |
+
</dd>
|
| 43 |
+
<?php endforeach; ?>
|
| 44 |
+
</dl>
|
| 45 |
+
<?php endif; ?>
|
app/design/frontend/blank/default/template/downloadable/catalog/product/type.phtml
ADDED
|
@@ -0,0 +1,45 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
|
| 27 |
+
|
| 28 |
+
/**
|
| 29 |
+
* Downloadable product type
|
| 30 |
+
*
|
| 31 |
+
* @see Mage_Downloadable_Block_Catalog_Product_View_Type
|
| 32 |
+
*/
|
| 33 |
+
?>
|
| 34 |
+
|
| 35 |
+
<?php $_product = $this->getProduct() ?>
|
| 36 |
+
|
| 37 |
+
<?php if($_product->isSaleable()): ?>
|
| 38 |
+
<p class="availability"><?php echo $this->__('Availability: In stock.') ?></p>
|
| 39 |
+
<?php else: ?>
|
| 40 |
+
<p class="availability"><?php echo $this->__('Availability: Out of stock.') ?></p>
|
| 41 |
+
<?php endif; ?>
|
| 42 |
+
|
| 43 |
+
<?php echo $this->getPriceHtml($_product) ?>
|
| 44 |
+
|
| 45 |
+
<?php echo $this->getChildHtml('samples') ?>
|
app/design/frontend/blank/default/template/downloadable/checkout/cart/item/default.phtml
ADDED
|
@@ -0,0 +1,103 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage_Downloadable
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem()?>
|
| 28 |
+
<tr>
|
| 29 |
+
<td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" width="16" height="16" alt="<?php $this->__('Remove item')?>" /></a></td>
|
| 30 |
+
<td><a href="<?php echo $this->getProductUrl() ?>"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" width="75" /></a></td>
|
| 31 |
+
<td class="attributes-col">
|
| 32 |
+
<h4 class="title"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->getProductName() ?></a></h4>
|
| 33 |
+
|
| 34 |
+
<!-- item custom options -->
|
| 35 |
+
<?php if ($_options = $this->getOptionList()):?>
|
| 36 |
+
<dl class="item-options">
|
| 37 |
+
<?php foreach ($_options as $_option) : ?>
|
| 38 |
+
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option['value']) ?>
|
| 39 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 40 |
+
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
|
| 41 |
+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
|
| 42 |
+
<div class="truncated_full_value">
|
| 43 |
+
<dl class="item-options">
|
| 44 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 45 |
+
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
|
| 46 |
+
</dl>
|
| 47 |
+
</div>
|
| 48 |
+
<?php endif; ?>
|
| 49 |
+
</dd>
|
| 50 |
+
<?php endforeach; ?>
|
| 51 |
+
</dl>
|
| 52 |
+
<?php endif;?>
|
| 53 |
+
<!-- / -->
|
| 54 |
+
|
| 55 |
+
|
| 56 |
+
<!-- downloadable -->
|
| 57 |
+
<?php if ($links = $this->getLinks()): ?>
|
| 58 |
+
<dl class="item-options">
|
| 59 |
+
<dt><?php echo $this->getLinksTitle() ?></dt>
|
| 60 |
+
<?php foreach ($links as $link): ?>
|
| 61 |
+
<dd><?php echo $link->getTitle() ?></dd>
|
| 62 |
+
<?php endforeach; ?>
|
| 63 |
+
</dl>
|
| 64 |
+
<?php endif; ?>
|
| 65 |
+
<!-- EOF downloadable -->
|
| 66 |
+
|
| 67 |
+
<?php if ($messages = $this->getMessages()): ?>
|
| 68 |
+
<?php foreach ($messages as $message): ?>
|
| 69 |
+
<div class="shopping-cart-item-message <?php echo $message['type'] ?>">
|
| 70 |
+
* <?php echo $message['text'] ?>
|
| 71 |
+
</div>
|
| 72 |
+
<?php endforeach; ?>
|
| 73 |
+
<?php endif; ?>
|
| 74 |
+
</td>
|
| 75 |
+
<?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
|
| 76 |
+
<td class="a-center">
|
| 77 |
+
<input type="checkbox" value="1" name="cart[<?php echo $_item->getId() ?>][wishlist]" />
|
| 78 |
+
</td>
|
| 79 |
+
<?php endif ?>
|
| 80 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 81 |
+
<td class="a-right">
|
| 82 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?>
|
| 83 |
+
</td>
|
| 84 |
+
<?php endif; ?>
|
| 85 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 86 |
+
<td class="a-right">
|
| 87 |
+
<?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
|
| 88 |
+
</td>
|
| 89 |
+
<?php endif; ?>
|
| 90 |
+
<td class="a-center">
|
| 91 |
+
<input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" class="input-text qty" maxlength="8" />
|
| 92 |
+
</td>
|
| 93 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 94 |
+
<td class="a-right">
|
| 95 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?>
|
| 96 |
+
</td>
|
| 97 |
+
<?php endif; ?>
|
| 98 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 99 |
+
<td class="a-right">
|
| 100 |
+
<?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
|
| 101 |
+
</td>
|
| 102 |
+
<?php endif; ?>
|
| 103 |
+
</tr>
|
app/design/frontend/blank/default/template/downloadable/checkout/multishipping/item/downloadable.phtml
ADDED
|
@@ -0,0 +1,57 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<h4 class="title"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->getProductName() ?></a></h4>
|
| 28 |
+
<!-- item custom options -->
|
| 29 |
+
<?php if ($_options = $this->getOptionList()):?>
|
| 30 |
+
<dl class="item-options">
|
| 31 |
+
<?php foreach ($_options as $_option) : ?>
|
| 32 |
+
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option['value']) ?>
|
| 33 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 34 |
+
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
|
| 35 |
+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
|
| 36 |
+
<div class="truncated_full_value">
|
| 37 |
+
<dl class="item-options">
|
| 38 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 39 |
+
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
|
| 40 |
+
</dl>
|
| 41 |
+
</div>
|
| 42 |
+
<?php endif; ?>
|
| 43 |
+
</dd>
|
| 44 |
+
<?php endforeach; ?>
|
| 45 |
+
</dl>
|
| 46 |
+
<?php endif;?>
|
| 47 |
+
<!-- / -->
|
| 48 |
+
<!-- downloadable -->
|
| 49 |
+
<?php if ($links = $this->getLinks()): ?>
|
| 50 |
+
<dl class="item-options">
|
| 51 |
+
<dt><?php echo $this->getLinksTitle() ?></dt>
|
| 52 |
+
<?php foreach ($links as $link): ?>
|
| 53 |
+
<dd><?php echo $link->getTitle() ?></dd>
|
| 54 |
+
<?php endforeach; ?>
|
| 55 |
+
</dl>
|
| 56 |
+
<?php endif; ?>
|
| 57 |
+
<!-- EOF downloadable -->
|
app/design/frontend/blank/default/template/downloadable/checkout/onepage/review/item.phtml
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage_Downloadable
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem()?>
|
| 28 |
+
<tr>
|
| 29 |
+
<td class="attributes-col"><h4 class="title"><?php echo $this->htmlEscape($this->getProductName()) ?></h4>
|
| 30 |
+
<!-- item custom options -->
|
| 31 |
+
<?php if ($_options = $this->getOptionList()):?>
|
| 32 |
+
<dl class="item-options">
|
| 33 |
+
<?php foreach ($_options as $_option) : ?>
|
| 34 |
+
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option['value']) ?>
|
| 35 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 36 |
+
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
|
| 37 |
+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
|
| 38 |
+
<div class="truncated_full_value">
|
| 39 |
+
<dl class="item-options">
|
| 40 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 41 |
+
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
|
| 42 |
+
</dl>
|
| 43 |
+
</div>
|
| 44 |
+
<?php endif; ?>
|
| 45 |
+
</dd>
|
| 46 |
+
<?php endforeach; ?>
|
| 47 |
+
</dl>
|
| 48 |
+
<?php endif;?>
|
| 49 |
+
<?php if ($links = $this->getLinks()): ?>
|
| 50 |
+
<dl class="item-options">
|
| 51 |
+
<dt><?php echo $this->getLinksTitle() ?></dt>
|
| 52 |
+
<?php foreach ($links as $link): ?>
|
| 53 |
+
<dd><?php echo $link->getTitle() ?></dd>
|
| 54 |
+
<?php endforeach; ?>
|
| 55 |
+
</dl>
|
| 56 |
+
<?php endif; ?>
|
| 57 |
+
<!-- EOF downloadable -->
|
| 58 |
+
</td>
|
| 59 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 60 |
+
<td class="a-right"><?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?></td>
|
| 61 |
+
<?php endif; ?>
|
| 62 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 63 |
+
<td class="a-right"><?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?></td>
|
| 64 |
+
<?php endif; ?>
|
| 65 |
+
<td class="a-center"><?php echo $_item->getQty() ?></td>
|
| 66 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 67 |
+
<td class="a-right"><?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?></td>
|
| 68 |
+
<?php endif; ?>
|
| 69 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
| 70 |
+
<td class="a-right"><?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?></td>
|
| 71 |
+
<?php endif; ?>
|
| 72 |
+
</tr>
|
app/design/frontend/blank/default/template/downloadable/checkout/success.phtml
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage_Downloadable
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php if ($this->getOrderHasDownloadable()): ?>
|
| 28 |
+
<?php echo Mage::helper('downloadable')->__('Go to <a href="%s">My Downloadable Products</a>', $this->getDownloadableProductsUrl()) ?>
|
| 29 |
+
<?php endif; ?>
|
app/design/frontend/blank/default/template/downloadable/customer/products/list.phtml
ADDED
|
@@ -0,0 +1,62 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage_Downloadable
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php
|
| 28 |
+
/**
|
| 29 |
+
* @see Mage_Downloadable_Block_Customer_Products_List
|
| 30 |
+
*/
|
| 31 |
+
?>
|
| 32 |
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 33 |
+
<?php $_items = $this->getItems(); ?>
|
| 34 |
+
<div class="page-head">
|
| 35 |
+
<h3><?php echo Mage::helper('downloadable')->__('My Downloadable Products') ?></h3>
|
| 36 |
+
</div>
|
| 37 |
+
<?php echo $this->getChildHtml('pager'); ?>
|
| 38 |
+
<table cellspacing="0" class="data-table" id="my-downloadable-products-table">
|
| 39 |
+
<thead>
|
| 40 |
+
<tr>
|
| 41 |
+
<th><?php echo Mage::helper('downloadable')->__('Order #') ?></th>
|
| 42 |
+
<th><?php echo Mage::helper('downloadable')->__('Date') ?></th>
|
| 43 |
+
<th><?php echo Mage::helper('downloadable')->__('Title') ?></th>
|
| 44 |
+
<th><?php echo Mage::helper('downloadable')->__('Status') ?></th>
|
| 45 |
+
<th><?php echo Mage::helper('downloadable')->__('Remaining Downloads') ?></th>
|
| 46 |
+
</tr>
|
| 47 |
+
</thead>
|
| 48 |
+
<tbody>
|
| 49 |
+
<?php $_odd = ''; ?>
|
| 50 |
+
<?php foreach ($_items as $_item): ?>
|
| 51 |
+
<tr>
|
| 52 |
+
<td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('downloadable')->__('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
|
| 53 |
+
<td><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
|
| 54 |
+
<td><?php echo $_item->getPurchased()->getProductName() ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('downloadable')->__('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $_item->getLinkTitle() ?></a></td>
|
| 55 |
+
<td><em><?php echo ucfirst($_item->getStatus()) ?></em></td>
|
| 56 |
+
<td><?php echo $this->getRemainingDownloads($_item) ?></td>
|
| 57 |
+
</tr>
|
| 58 |
+
<?php endforeach; ?>
|
| 59 |
+
</tbody>
|
| 60 |
+
</table>
|
| 61 |
+
<script type="text/javascript">decorateTable('my-downloadable-products-table')</script>
|
| 62 |
+
<?php echo $this->getChildHtml('pager'); ?>
|
app/design/frontend/blank/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml
ADDED
|
@@ -0,0 +1,128 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrder(); ?>
|
| 29 |
+
<tr>
|
| 30 |
+
<td align="left" valign="top" style="padding:3px 9px">
|
| 31 |
+
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
| 32 |
+
<?php if ($this->getItemOptions()): ?>
|
| 33 |
+
<dl style="margin:0; padding:0;">
|
| 34 |
+
<?php foreach ($this->getItemOptions() as $option): ?>
|
| 35 |
+
<dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
|
| 36 |
+
<dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
|
| 37 |
+
<?php endforeach; ?>
|
| 38 |
+
</dl>
|
| 39 |
+
<?php endif; ?>
|
| 40 |
+
<?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
|
| 41 |
+
<dl style="margin:0; padding:0;">
|
| 42 |
+
<dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
|
| 43 |
+
<?php foreach ($links as $link): ?>
|
| 44 |
+
<dd style="margin:0; padding:0 0 0 9px;"><?php echo $link->getLinkTitle() ?></dd>
|
| 45 |
+
<?php endforeach; ?>
|
| 46 |
+
</dl>
|
| 47 |
+
<?php endif; ?>
|
| 48 |
+
<?php echo $_item->getDescription() ?>
|
| 49 |
+
</td>
|
| 50 |
+
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 51 |
+
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
|
| 52 |
+
<td align="right" valign="top" style="padding:3px 9px">
|
| 53 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 54 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 55 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 56 |
+
<?php endif; ?>
|
| 57 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 58 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 59 |
+
<?php else: ?>
|
| 60 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 61 |
+
<?php endif; ?>
|
| 62 |
+
|
| 63 |
+
|
| 64 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 65 |
+
<br />
|
| 66 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 67 |
+
<small>
|
| 68 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 69 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 70 |
+
<?php endforeach; ?>
|
| 71 |
+
</small>
|
| 72 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 73 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 74 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 75 |
+
<?php endforeach; ?>
|
| 76 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 77 |
+
<small>
|
| 78 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 79 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 80 |
+
<?php endforeach; ?>
|
| 81 |
+
</small>
|
| 82 |
+
<?php endif; ?>
|
| 83 |
+
|
| 84 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 85 |
+
<br />
|
| 86 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 87 |
+
<?php endif; ?>
|
| 88 |
+
<?php endif; ?>
|
| 89 |
+
<?php endif; ?>
|
| 90 |
+
|
| 91 |
+
|
| 92 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 93 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 94 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 95 |
+
<?php endif; ?>
|
| 96 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 97 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 98 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 99 |
+
<?php else: ?>
|
| 100 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 101 |
+
<?php endif; ?>
|
| 102 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 103 |
+
<br />
|
| 104 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 105 |
+
<small>
|
| 106 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 107 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 108 |
+
<?php endforeach; ?>
|
| 109 |
+
</small>
|
| 110 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 111 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 112 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 113 |
+
<?php endforeach; ?>
|
| 114 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 115 |
+
<small>
|
| 116 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 117 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 118 |
+
<?php endforeach; ?>
|
| 119 |
+
</small>
|
| 120 |
+
<?php endif; ?>
|
| 121 |
+
|
| 122 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 123 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 124 |
+
<?php endif; ?>
|
| 125 |
+
<?php endif; ?>
|
| 126 |
+
<?php endif; ?>
|
| 127 |
+
</td>
|
| 128 |
+
</tr>
|
app/design/frontend/blank/default/template/downloadable/email/order/items/invoice/downloadable.phtml
ADDED
|
@@ -0,0 +1,131 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrder(); ?>
|
| 29 |
+
<tr>
|
| 30 |
+
<td align="left" valign="top" style="padding:3px 9px">
|
| 31 |
+
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
| 32 |
+
<?php if ($this->getItemOptions()): ?>
|
| 33 |
+
<dl style="margin:0; padding:0;">
|
| 34 |
+
<?php foreach ($this->getItemOptions() as $option): ?>
|
| 35 |
+
<dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
|
| 36 |
+
<dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
|
| 37 |
+
<?php endforeach; ?>
|
| 38 |
+
</dl>
|
| 39 |
+
<?php endif; ?>
|
| 40 |
+
<?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
|
| 41 |
+
<dl style="margin:0; padding:0;">
|
| 42 |
+
<dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
|
| 43 |
+
<?php foreach ($links as $link): ?>
|
| 44 |
+
<dd style="margin:0; padding:0 0 0 9px;">
|
| 45 |
+
<?php echo $link->getLinkTitle() ?>
|
| 46 |
+
(<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>" style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
|
| 47 |
+
</dd>
|
| 48 |
+
<?php endforeach; ?>
|
| 49 |
+
</dl>
|
| 50 |
+
<?php endif; ?>
|
| 51 |
+
<?php echo $_item->getDescription() ?>
|
| 52 |
+
</td>
|
| 53 |
+
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 54 |
+
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
|
| 55 |
+
<td align="right" valign="top" style="padding:3px 9px">
|
| 56 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 57 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 58 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 59 |
+
<?php endif; ?>
|
| 60 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 61 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 62 |
+
<?php else: ?>
|
| 63 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 64 |
+
<?php endif; ?>
|
| 65 |
+
|
| 66 |
+
|
| 67 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 68 |
+
<br />
|
| 69 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 70 |
+
<small>
|
| 71 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 72 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 73 |
+
<?php endforeach; ?>
|
| 74 |
+
</small>
|
| 75 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 76 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 77 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 78 |
+
<?php endforeach; ?>
|
| 79 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 80 |
+
<small>
|
| 81 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 82 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 83 |
+
<?php endforeach; ?>
|
| 84 |
+
</small>
|
| 85 |
+
<?php endif; ?>
|
| 86 |
+
|
| 87 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 88 |
+
<br />
|
| 89 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 90 |
+
<?php endif; ?>
|
| 91 |
+
<?php endif; ?>
|
| 92 |
+
<?php endif; ?>
|
| 93 |
+
|
| 94 |
+
|
| 95 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 96 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 97 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 98 |
+
<?php endif; ?>
|
| 99 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 100 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 101 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 102 |
+
<?php else: ?>
|
| 103 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 104 |
+
<?php endif; ?>
|
| 105 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 106 |
+
<br />
|
| 107 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 108 |
+
<small>
|
| 109 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 110 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 111 |
+
<?php endforeach; ?>
|
| 112 |
+
</small>
|
| 113 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 114 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 115 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 116 |
+
<?php endforeach; ?>
|
| 117 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 118 |
+
<small>
|
| 119 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 120 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 121 |
+
<?php endforeach; ?>
|
| 122 |
+
</small>
|
| 123 |
+
<?php endif; ?>
|
| 124 |
+
|
| 125 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 126 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 127 |
+
<?php endif; ?>
|
| 128 |
+
<?php endif; ?>
|
| 129 |
+
<?php endif; ?>
|
| 130 |
+
</td>
|
| 131 |
+
</tr>
|
app/design/frontend/blank/default/template/downloadable/email/order/items/order/downloadable.phtml
ADDED
|
@@ -0,0 +1,137 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrder() ?>
|
| 29 |
+
<tr>
|
| 30 |
+
<td align="left" valign="top" style="padding:3px 9px">
|
| 31 |
+
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
| 32 |
+
<?php if ($this->getItemOptions()): ?>
|
| 33 |
+
<dl style="margin:0; padding:0;">
|
| 34 |
+
<?php foreach ($this->getItemOptions() as $option): ?>
|
| 35 |
+
<dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
|
| 36 |
+
<dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
|
| 37 |
+
<?php endforeach; ?>
|
| 38 |
+
</dl>
|
| 39 |
+
<?php endif; ?>
|
| 40 |
+
<?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
|
| 41 |
+
<dl style="margin:0; padding:0;">
|
| 42 |
+
<dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
|
| 43 |
+
<?php foreach ($links as $link): ?>
|
| 44 |
+
<dd style="margin:0; padding:0 0 0 9px;">
|
| 45 |
+
<?php echo $link->getLinkTitle() ?>
|
| 46 |
+
(<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>" style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
|
| 47 |
+
</dd>
|
| 48 |
+
<?php endforeach; ?>
|
| 49 |
+
</dl>
|
| 50 |
+
<?php endif; ?>
|
| 51 |
+
<?php echo $_item->getDescription() ?>
|
| 52 |
+
<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
|
| 53 |
+
<br/><strong><?php echo $this->__('Gift Message') ?></strong>
|
| 54 |
+
<br/><?php echo $this->__('From:'); ?> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?>
|
| 55 |
+
<br/><?php echo $this->__('To:'); ?> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?>
|
| 56 |
+
<br/><?php echo $this->__('Message:'); ?><br/> <?php echo $this->htmlEscape($_giftMessage->getMessage()) ?>
|
| 57 |
+
<?php endif; ?>
|
| 58 |
+
</td>
|
| 59 |
+
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 60 |
+
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
|
| 61 |
+
<td align="right" valign="top" style="padding:3px 9px">
|
| 62 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 63 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 64 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 65 |
+
<?php endif; ?>
|
| 66 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 67 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 68 |
+
<?php else: ?>
|
| 69 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 70 |
+
<?php endif; ?>
|
| 71 |
+
|
| 72 |
+
|
| 73 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 74 |
+
<br />
|
| 75 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 76 |
+
<small>
|
| 77 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 78 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 79 |
+
<?php endforeach; ?>
|
| 80 |
+
</small>
|
| 81 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 82 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 83 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 84 |
+
<?php endforeach; ?>
|
| 85 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 86 |
+
<small>
|
| 87 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 88 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 89 |
+
<?php endforeach; ?>
|
| 90 |
+
</small>
|
| 91 |
+
<?php endif; ?>
|
| 92 |
+
|
| 93 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 94 |
+
<br />
|
| 95 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 96 |
+
<?php endif; ?>
|
| 97 |
+
<?php endif; ?>
|
| 98 |
+
<?php endif; ?>
|
| 99 |
+
|
| 100 |
+
|
| 101 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 102 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 103 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 104 |
+
<?php endif; ?>
|
| 105 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 106 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 107 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 108 |
+
<?php else: ?>
|
| 109 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 110 |
+
<?php endif; ?>
|
| 111 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 112 |
+
<br />
|
| 113 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 114 |
+
<small>
|
| 115 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 116 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 117 |
+
<?php endforeach; ?>
|
| 118 |
+
</small>
|
| 119 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 120 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 121 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 122 |
+
<?php endforeach; ?>
|
| 123 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 124 |
+
<small>
|
| 125 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 126 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 127 |
+
<?php endforeach; ?>
|
| 128 |
+
</small>
|
| 129 |
+
<?php endif; ?>
|
| 130 |
+
|
| 131 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 132 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 133 |
+
<?php endif; ?>
|
| 134 |
+
<?php endif; ?>
|
| 135 |
+
<?php endif; ?>
|
| 136 |
+
</td>
|
| 137 |
+
</tr>
|
app/design/frontend/blank/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
ADDED
|
@@ -0,0 +1,113 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
|
| 29 |
+
<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
|
| 30 |
+
<td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
|
| 31 |
+
<?php if($_options = $this->getItemOptions()): ?>
|
| 32 |
+
<dl class="item-options">
|
| 33 |
+
<?php foreach ($_options as $_option) : ?>
|
| 34 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 35 |
+
<?php if (!$this->getPrintStatus()): ?>
|
| 36 |
+
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option['value']) ?>
|
| 37 |
+
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
|
| 38 |
+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
|
| 39 |
+
<div class="truncated_full_value">
|
| 40 |
+
<dl class="item-options">
|
| 41 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 42 |
+
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
|
| 43 |
+
</dl>
|
| 44 |
+
</div>
|
| 45 |
+
<?php endif; ?>
|
| 46 |
+
</dd>
|
| 47 |
+
<?php else: ?>
|
| 48 |
+
<dd><?php echo $this->htmlEscape($_option['value']) ?></dd>
|
| 49 |
+
<?php endif; ?>
|
| 50 |
+
<?php endforeach; ?>
|
| 51 |
+
</dl>
|
| 52 |
+
<?php endif; ?>
|
| 53 |
+
|
| 54 |
+
<!-- downloadable -->
|
| 55 |
+
<?php if ($links = $this->getLinks()): ?>
|
| 56 |
+
<dl class="item-options">
|
| 57 |
+
<dt><?php echo $this->getLinksTitle() ?></dt>
|
| 58 |
+
<?php foreach ($links->getPurchasedItems() as $link): ?>
|
| 59 |
+
<dd><?php echo $link->getLinkTitle() ?></dd>
|
| 60 |
+
<?php endforeach; ?>
|
| 61 |
+
</dt>
|
| 62 |
+
</dl>
|
| 63 |
+
<?php endif; ?>
|
| 64 |
+
<!-- EOF downloadable -->
|
| 65 |
+
|
| 66 |
+
<?php echo $_item->getDescription() ?>
|
| 67 |
+
<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
|
| 68 |
+
<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
|
| 69 |
+
<?php endif; ?>
|
| 70 |
+
</td>
|
| 71 |
+
<td><?php echo Mage::helper('core/string')->splitInjection($this->getSku()) ?></td>
|
| 72 |
+
<td class="a-right nowrap">
|
| 73 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 74 |
+
<span class="price-excl-tax">
|
| 75 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 76 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 77 |
+
<?php endif; ?>
|
| 78 |
+
<?php echo $_order->formatPrice($_item->getPrice()) ?>
|
| 79 |
+
</span>
|
| 80 |
+
<?php endif; ?>
|
| 81 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 82 |
+
<span class="price-incl-tax">
|
| 83 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 84 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 85 |
+
<?php endif; ?>
|
| 86 |
+
<?php echo $_order->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
|
| 87 |
+
</span>
|
| 88 |
+
<?php endif; ?>
|
| 89 |
+
</td>
|
| 90 |
+
<td class="a-center"><?php echo $_item->getQty()*1 ?></td>
|
| 91 |
+
<td class="a-right nowrap">
|
| 92 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 93 |
+
<span class="price-excl-tax">
|
| 94 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 95 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 96 |
+
<?php endif; ?>
|
| 97 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 98 |
+
</span>
|
| 99 |
+
<?php endif; ?>
|
| 100 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 101 |
+
<span class="price-incl-tax">
|
| 102 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 103 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 104 |
+
<?php endif; ?>
|
| 105 |
+
<?php echo $_order->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
|
| 106 |
+
</span>
|
| 107 |
+
<?php endif; ?>
|
| 108 |
+
</td>
|
| 109 |
+
<td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
|
| 110 |
+
<td class="last a-right">
|
| 111 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()) ?>
|
| 112 |
+
</td>
|
| 113 |
+
</tr>
|
app/design/frontend/blank/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
ADDED
|
@@ -0,0 +1,110 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
|
| 29 |
+
<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
|
| 30 |
+
<td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
|
| 31 |
+
<?php if($_options = $this->getItemOptions()): ?>
|
| 32 |
+
<dl class="item-options">
|
| 33 |
+
<?php foreach ($_options as $_option) : ?>
|
| 34 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 35 |
+
<?php if (!$this->getPrintStatus()): ?>
|
| 36 |
+
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option['value']) ?>
|
| 37 |
+
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
|
| 38 |
+
<?php echo $_formatedOptionValue['value'] ?>
|
| 39 |
+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
|
| 40 |
+
<div class="truncated_full_value">
|
| 41 |
+
<dl class="item-options">
|
| 42 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 43 |
+
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
|
| 44 |
+
</dl>
|
| 45 |
+
</div>
|
| 46 |
+
<?php endif; ?>
|
| 47 |
+
</dd>
|
| 48 |
+
<?php else: ?>
|
| 49 |
+
<dd><?php echo $this->htmlEscape($_option['value']) ?></dd>
|
| 50 |
+
<?php endif; ?>
|
| 51 |
+
<?php endforeach; ?>
|
| 52 |
+
</dl>
|
| 53 |
+
<?php endif; ?>
|
| 54 |
+
|
| 55 |
+
<!-- downloadable -->
|
| 56 |
+
<?php if ($links = $this->getLinks()): ?>
|
| 57 |
+
<dl class="item-options">
|
| 58 |
+
<dt><?php echo $this->getLinksTitle() ?></dt>
|
| 59 |
+
<?php foreach ($links->getPurchasedItems() as $link): ?>
|
| 60 |
+
<dd><?php echo $link->getLinkTitle() ?></dd>
|
| 61 |
+
<?php endforeach; ?>
|
| 62 |
+
</dt>
|
| 63 |
+
</dl>
|
| 64 |
+
<?php endif; ?>
|
| 65 |
+
<!-- EOF downloadable -->
|
| 66 |
+
|
| 67 |
+
<?php echo $_item->getDescription() ?>
|
| 68 |
+
<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
|
| 69 |
+
<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
|
| 70 |
+
<?php endif; ?>
|
| 71 |
+
</td>
|
| 72 |
+
<td><?php echo Mage::helper('core/string')->splitInjection($this->getSku()) ?></td>
|
| 73 |
+
<td class="a-right nowrap">
|
| 74 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 75 |
+
<span class="price-excl-tax">
|
| 76 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 77 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 78 |
+
<?php endif; ?>
|
| 79 |
+
<?php echo $_order->formatPrice($_item->getPrice()) ?>
|
| 80 |
+
</span>
|
| 81 |
+
<?php endif; ?>
|
| 82 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 83 |
+
<span class="price-incl-tax">
|
| 84 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 85 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 86 |
+
<?php endif; ?>
|
| 87 |
+
<?php echo $_order->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
|
| 88 |
+
</span>
|
| 89 |
+
<?php endif; ?>
|
| 90 |
+
</td>
|
| 91 |
+
<td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
|
| 92 |
+
<td class="a-right nowrap">
|
| 93 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 94 |
+
<span class="price-excl-tax">
|
| 95 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 96 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 97 |
+
<?php endif; ?>
|
| 98 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 99 |
+
</span>
|
| 100 |
+
<?php endif; ?>
|
| 101 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 102 |
+
<span class="price-incl-tax">
|
| 103 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 104 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 105 |
+
<?php endif; ?>
|
| 106 |
+
<?php echo $_order->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
|
| 107 |
+
</span>
|
| 108 |
+
<?php endif; ?>
|
| 109 |
+
</td>
|
| 110 |
+
</tr>
|
app/design/frontend/blank/default/template/downloadable/sales/order/items/renderer.phtml
ADDED
|
@@ -0,0 +1,130 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage_Downloadable
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
|
| 29 |
+
<td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
|
| 30 |
+
<?php if($_options = $this->getItemOptions()): ?>
|
| 31 |
+
<dl class="item-options">
|
| 32 |
+
<?php foreach ($_options as $_option) : ?>
|
| 33 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 34 |
+
<?php if (!$this->getPrintStatus()): ?>
|
| 35 |
+
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option['value']) ?>
|
| 36 |
+
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
|
| 37 |
+
<?php echo $_formatedOptionValue['value'] ?>
|
| 38 |
+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
|
| 39 |
+
<div class="truncated_full_value">
|
| 40 |
+
<dl class="item-options">
|
| 41 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 42 |
+
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
|
| 43 |
+
</dl>
|
| 44 |
+
</div>
|
| 45 |
+
<?php endif; ?>
|
| 46 |
+
</dd>
|
| 47 |
+
<?php else: ?>
|
| 48 |
+
<dd><?php echo $this->htmlEscape($_option['value']) ?></dd>
|
| 49 |
+
<?php endif; ?>
|
| 50 |
+
<?php endforeach; ?>
|
| 51 |
+
</dl>
|
| 52 |
+
<?php endif; ?>
|
| 53 |
+
|
| 54 |
+
<!-- downloadable -->
|
| 55 |
+
<dl class="item-options">
|
| 56 |
+
<dt>Links</dt>
|
| 57 |
+
<dd>Track #1</dd>
|
| 58 |
+
<dd>Track #2</dd>
|
| 59 |
+
<dd>Track #3</dd>
|
| 60 |
+
</dt>
|
| 61 |
+
</dl>
|
| 62 |
+
<!-- EOF downloadable -->
|
| 63 |
+
|
| 64 |
+
<?php echo $_item->getDescription() ?>
|
| 65 |
+
<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
|
| 66 |
+
<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
|
| 67 |
+
<?php endif; ?>
|
| 68 |
+
</td>
|
| 69 |
+
<td><?php echo Mage::helper('core/string')->splitInjection($this->getSku()) ?></td>
|
| 70 |
+
<td class="a-right nowrap">
|
| 71 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 72 |
+
<span class="price-excl-tax">
|
| 73 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 74 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 75 |
+
<?php endif; ?>
|
| 76 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 77 |
+
</span>
|
| 78 |
+
<?php endif; ?>
|
| 79 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 80 |
+
<span class="price-incl-tax">
|
| 81 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 82 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 83 |
+
<?php endif; ?>
|
| 84 |
+
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($this->getItem())); ?>
|
| 85 |
+
</span>
|
| 86 |
+
<?php endif; ?>
|
| 87 |
+
</td>
|
| 88 |
+
<td class="a-right nowrap">
|
| 89 |
+
<span class="nobr">
|
| 90 |
+
<?php if ($this->getItem()->getQtyOrdered() > 0): ?>
|
| 91 |
+
<?php echo $this->__('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
|
| 92 |
+
<?php endif; ?>
|
| 93 |
+
<?php if ($this->getItem()->getQtyShipped() > 0): ?>
|
| 94 |
+
<?php echo $this->__('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
|
| 95 |
+
<?php endif; ?>
|
| 96 |
+
<?php if ($this->getItem()->getQtyCanceled() > 0): ?>
|
| 97 |
+
<?php echo $this->__('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
|
| 98 |
+
<?php endif; ?>
|
| 99 |
+
<?php if ($this->getItem()->getQtyRefunded() > 0): ?>
|
| 100 |
+
<?php echo $this->__('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
|
| 101 |
+
<?php endif; ?>
|
| 102 |
+
</span>
|
| 103 |
+
</td>
|
| 104 |
+
<td class="a-right nowrap">
|
| 105 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 106 |
+
<span class="price-excl-tax">
|
| 107 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 108 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 109 |
+
<?php endif; ?>
|
| 110 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 111 |
+
</span>
|
| 112 |
+
<?php endif; ?>
|
| 113 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 114 |
+
<span class="price-incl-tax">
|
| 115 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 116 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 117 |
+
<?php endif; ?>
|
| 118 |
+
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?>
|
| 119 |
+
</span>
|
| 120 |
+
<?php endif; ?>
|
| 121 |
+
</td>
|
| 122 |
+
<!--
|
| 123 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 124 |
+
<th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
|
| 125 |
+
<?php endif; ?>
|
| 126 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 127 |
+
<th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?></th>
|
| 128 |
+
<?php endif; ?>
|
| 129 |
+
-->
|
| 130 |
+
</tr>
|
app/design/frontend/blank/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
ADDED
|
@@ -0,0 +1,132 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Academic Free License (AFL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE_AFL.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/afl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* DISCLAIMER
|
| 16 |
+
*
|
| 17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 18 |
+
* versions in the future. If you wish to customize Magento for your
|
| 19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
| 20 |
+
*
|
| 21 |
+
* @category design_default
|
| 22 |
+
* @package Mage_Downloadable
|
| 23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 24 |
+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
| 25 |
+
*/
|
| 26 |
+
?>
|
| 27 |
+
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
|
| 29 |
+
<td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
|
| 30 |
+
<?php if($_options = $this->getItemOptions()): ?>
|
| 31 |
+
<dl class="item-options">
|
| 32 |
+
<?php foreach ($_options as $_option) : ?>
|
| 33 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 34 |
+
<?php if (!$this->getPrintStatus()): ?>
|
| 35 |
+
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option['value']) ?>
|
| 36 |
+
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
|
| 37 |
+
<?php echo $_formatedOptionValue['value'] ?>
|
| 38 |
+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
|
| 39 |
+
<div class="truncated_full_value">
|
| 40 |
+
<dl class="item-options">
|
| 41 |
+
<dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
|
| 42 |
+
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
|
| 43 |
+
</dl>
|
| 44 |
+
</div>
|
| 45 |
+
<?php endif; ?>
|
| 46 |
+
</dd>
|
| 47 |
+
<?php else: ?>
|
| 48 |
+
<dd><?php echo $this->htmlEscape($_option['value']) ?></dd>
|
| 49 |
+
<?php endif; ?>
|
| 50 |
+
<?php endforeach; ?>
|
| 51 |
+
</dl>
|
| 52 |
+
<?php endif; ?>
|
| 53 |
+
|
| 54 |
+
<!-- downloadable -->
|
| 55 |
+
<?php if ($links = $this->getLinks()): ?>
|
| 56 |
+
<dl class="item-options">
|
| 57 |
+
<dt><?php echo $this->getLinksTitle() ?></dt>
|
| 58 |
+
<?php foreach ($links->getPurchasedItems() as $link): ?>
|
| 59 |
+
<dd><?php echo $link->getLinkTitle() ?></dd>
|
| 60 |
+
<?php endforeach; ?>
|
| 61 |
+
</dt>
|
| 62 |
+
</dl>
|
| 63 |
+
<?php endif; ?>
|
| 64 |
+
<!-- EOF downloadable -->
|
| 65 |
+
|
| 66 |
+
<?php echo $_item->getDescription() ?>
|
| 67 |
+
<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
|
| 68 |
+
<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
|
| 69 |
+
<?php endif; ?>
|
| 70 |
+
</td>
|
| 71 |
+
<td><?php echo Mage::helper('core/string')->splitInjection($this->getSku()) ?></td>
|
| 72 |
+
<td class="a-right nowrap">
|
| 73 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 74 |
+
<span class="price-excl-tax">
|
| 75 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 76 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 77 |
+
<?php endif; ?>
|
| 78 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 79 |
+
</span>
|
| 80 |
+
<?php endif; ?>
|
| 81 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 82 |
+
<span class="price-incl-tax">
|
| 83 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 84 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 85 |
+
<?php endif; ?>
|
| 86 |
+
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($this->getItem())); ?>
|
| 87 |
+
</span>
|
| 88 |
+
<?php endif; ?>
|
| 89 |
+
</td>
|
| 90 |
+
<td class="a-right nowrap">
|
| 91 |
+
<span class="nobr">
|
| 92 |
+
<?php if ($this->getItem()->getQtyOrdered() > 0): ?>
|
| 93 |
+
<?php echo $this->__('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
|
| 94 |
+
<?php endif; ?>
|
| 95 |
+
<?php if ($this->getItem()->getQtyShipped() > 0): ?>
|
| 96 |
+
<?php echo $this->__('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
|
| 97 |
+
<?php endif; ?>
|
| 98 |
+
<?php if ($this->getItem()->getQtyCanceled() > 0): ?>
|
| 99 |
+
<?php echo $this->__('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
|
| 100 |
+
<?php endif; ?>
|
| 101 |
+
<?php if ($this->getItem()->getQtyRefunded() > 0): ?>
|
| 102 |
+
<?php echo $this->__('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
|
| 103 |
+
<?php endif; ?>
|
| 104 |
+
</span>
|
| 105 |
+
</td>
|
| 106 |
+
<td class="a-right nowrap">
|
| 107 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 108 |
+
<span class="price-excl-tax">
|
| 109 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 110 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 111 |
+
<?php endif; ?>
|
| 112 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 113 |
+
</span>
|
| 114 |
+
<?php endif; ?>
|
| 115 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 116 |
+
<span class="price-incl-tax">
|
| 117 |
+
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 118 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 119 |
+
<?php endif; ?>
|
| 120 |
+
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?>
|
| 121 |
+
</span>
|
| 122 |
+
<?php endif; ?>
|
| 123 |
+
</td>
|
| 124 |
+
<!--
|
| 125 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 126 |
+
<th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
|
| 127 |
+
<?php endif; ?>
|
| 128 |
+
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 129 |
+
<th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?></th>
|
| 130 |
+
<?php endif; ?>
|
| 131 |
+
-->
|
| 132 |
+
</tr>
|
app/design/frontend/blank/default/template/email/order/items/creditmemo/default.phtml
CHANGED
|
@@ -25,6 +25,7 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem() ?>
|
|
|
|
| 28 |
<tr>
|
| 29 |
<td align="left" valign="top" style="padding:3px 9px">
|
| 30 |
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
|
@@ -41,13 +42,79 @@
|
|
| 41 |
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 42 |
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
|
| 43 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 44 |
-
<?php if ($this->helper('tax')->
|
| 45 |
-
<?php
|
| 46 |
-
|
| 47 |
-
<?php
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
<?php endif; ?>
|
| 52 |
</td>
|
| 53 |
</tr>
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrder(); ?>
|
| 29 |
<tr>
|
| 30 |
<td align="left" valign="top" style="padding:3px 9px">
|
| 31 |
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
| 42 |
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 43 |
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
|
| 44 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 45 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 46 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 47 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 48 |
+
<?php endif; ?>
|
| 49 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 50 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 51 |
+
<?php else: ?>
|
| 52 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 53 |
+
<?php endif; ?>
|
| 54 |
+
|
| 55 |
+
|
| 56 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 57 |
+
<br />
|
| 58 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 59 |
+
<small>
|
| 60 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 61 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 62 |
+
<?php endforeach; ?>
|
| 63 |
+
</small>
|
| 64 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 65 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 66 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 67 |
+
<?php endforeach; ?>
|
| 68 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 69 |
+
<small>
|
| 70 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 71 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 72 |
+
<?php endforeach; ?>
|
| 73 |
+
</small>
|
| 74 |
+
<?php endif; ?>
|
| 75 |
+
|
| 76 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 77 |
+
<br />
|
| 78 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 79 |
+
<?php endif; ?>
|
| 80 |
+
<?php endif; ?>
|
| 81 |
+
<?php endif; ?>
|
| 82 |
+
|
| 83 |
+
|
| 84 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 85 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 86 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 87 |
+
<?php endif; ?>
|
| 88 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 89 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 90 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 91 |
+
<?php else: ?>
|
| 92 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 93 |
+
<?php endif; ?>
|
| 94 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 95 |
+
<br />
|
| 96 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 97 |
+
<small>
|
| 98 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 99 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 100 |
+
<?php endforeach; ?>
|
| 101 |
+
</small>
|
| 102 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 103 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 104 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 105 |
+
<?php endforeach; ?>
|
| 106 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 107 |
+
<small>
|
| 108 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 109 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 110 |
+
<?php endforeach; ?>
|
| 111 |
+
</small>
|
| 112 |
+
<?php endif; ?>
|
| 113 |
+
|
| 114 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 115 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 116 |
+
<?php endif; ?>
|
| 117 |
+
<?php endif; ?>
|
| 118 |
<?php endif; ?>
|
| 119 |
</td>
|
| 120 |
</tr>
|
app/design/frontend/blank/default/template/email/order/items/invoice/default.phtml
CHANGED
|
@@ -25,6 +25,7 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem() ?>
|
|
|
|
| 28 |
<tr>
|
| 29 |
<td align="left" valign="top" style="padding:3px 9px">
|
| 30 |
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
|
@@ -41,13 +42,79 @@
|
|
| 41 |
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 42 |
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
|
| 43 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 44 |
-
<?php if ($this->helper('tax')->
|
| 45 |
-
<?php
|
| 46 |
-
|
| 47 |
-
<?php
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
<?php endif; ?>
|
| 52 |
</td>
|
| 53 |
</tr>
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrder(); ?>
|
| 29 |
<tr>
|
| 30 |
<td align="left" valign="top" style="padding:3px 9px">
|
| 31 |
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
| 42 |
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 43 |
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
|
| 44 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 45 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 46 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 47 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 48 |
+
<?php endif; ?>
|
| 49 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 50 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 51 |
+
<?php else: ?>
|
| 52 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 53 |
+
<?php endif; ?>
|
| 54 |
+
|
| 55 |
+
|
| 56 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 57 |
+
<br />
|
| 58 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 59 |
+
<small>
|
| 60 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 61 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 62 |
+
<?php endforeach; ?>
|
| 63 |
+
</small>
|
| 64 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 65 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 66 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 67 |
+
<?php endforeach; ?>
|
| 68 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 69 |
+
<small>
|
| 70 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 71 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 72 |
+
<?php endforeach; ?>
|
| 73 |
+
</small>
|
| 74 |
+
<?php endif; ?>
|
| 75 |
+
|
| 76 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 77 |
+
<br />
|
| 78 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 79 |
+
<?php endif; ?>
|
| 80 |
+
<?php endif; ?>
|
| 81 |
+
<?php endif; ?>
|
| 82 |
+
|
| 83 |
+
|
| 84 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 85 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 86 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 87 |
+
<?php endif; ?>
|
| 88 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 89 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 90 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 91 |
+
<?php else: ?>
|
| 92 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 93 |
+
<?php endif; ?>
|
| 94 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 95 |
+
<br />
|
| 96 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 97 |
+
<small>
|
| 98 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 99 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 100 |
+
<?php endforeach; ?>
|
| 101 |
+
</small>
|
| 102 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 103 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 104 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 105 |
+
<?php endforeach; ?>
|
| 106 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 107 |
+
<small>
|
| 108 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 109 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 110 |
+
<?php endforeach; ?>
|
| 111 |
+
</small>
|
| 112 |
+
<?php endif; ?>
|
| 113 |
+
|
| 114 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 115 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 116 |
+
<?php endif; ?>
|
| 117 |
+
<?php endif; ?>
|
| 118 |
<?php endif; ?>
|
| 119 |
</td>
|
| 120 |
</tr>
|
app/design/frontend/blank/default/template/email/order/items/order/default.phtml
CHANGED
|
@@ -25,6 +25,7 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem() ?>
|
|
|
|
| 28 |
<tr>
|
| 29 |
<td align="left" valign="top" style="padding:3px 9px">
|
| 30 |
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
|
@@ -47,13 +48,79 @@
|
|
| 47 |
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 48 |
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
|
| 49 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 50 |
-
<?php if ($this->helper('tax')->
|
| 51 |
-
<?php
|
| 52 |
-
|
| 53 |
-
<?php
|
| 54 |
-
|
| 55 |
-
|
| 56 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 57 |
<?php endif; ?>
|
| 58 |
</td>
|
| 59 |
</tr>
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php $_item = $this->getItem() ?>
|
| 28 |
+
<?php $_order = $this->getItem()->getOrder() ?>
|
| 29 |
<tr>
|
| 30 |
<td align="left" valign="top" style="padding:3px 9px">
|
| 31 |
<strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
|
| 48 |
<td align="left" valign="top" style="padding:3px 9px"><?php echo $this->getSku($_item) ?></td>
|
| 49 |
<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
|
| 50 |
<td align="right" valign="top" style="padding:3px 9px">
|
| 51 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 52 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 53 |
+
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
|
| 54 |
+
<?php endif; ?>
|
| 55 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 56 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
| 57 |
+
<?php else: ?>
|
| 58 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 59 |
+
<?php endif; ?>
|
| 60 |
+
|
| 61 |
+
|
| 62 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 63 |
+
<br />
|
| 64 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 65 |
+
<small>
|
| 66 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 67 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 68 |
+
<?php endforeach; ?>
|
| 69 |
+
</small>
|
| 70 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 71 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 72 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 73 |
+
<?php endforeach; ?>
|
| 74 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 75 |
+
<small>
|
| 76 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 77 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 78 |
+
<?php endforeach; ?>
|
| 79 |
+
</small>
|
| 80 |
+
<?php endif; ?>
|
| 81 |
+
|
| 82 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 83 |
+
<br />
|
| 84 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
| 85 |
+
<?php endif; ?>
|
| 86 |
+
<?php endif; ?>
|
| 87 |
+
<?php endif; ?>
|
| 88 |
+
|
| 89 |
+
|
| 90 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 91 |
+
<?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
|
| 92 |
+
<br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
|
| 93 |
+
<?php endif; ?>
|
| 94 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
| 95 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
|
| 96 |
+
<?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
| 97 |
+
<?php else: ?>
|
| 98 |
+
<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
| 99 |
+
<?php endif; ?>
|
| 100 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
| 101 |
+
<br />
|
| 102 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
|
| 103 |
+
<small>
|
| 104 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 105 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
| 106 |
+
<?php endforeach; ?>
|
| 107 |
+
</small>
|
| 108 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 109 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 110 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
| 111 |
+
<?php endforeach; ?>
|
| 112 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
|
| 113 |
+
<small>
|
| 114 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
| 115 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
| 116 |
+
<?php endforeach; ?>
|
| 117 |
+
</small>
|
| 118 |
+
<?php endif; ?>
|
| 119 |
+
|
| 120 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
|
| 121 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 122 |
+
<?php endif; ?>
|
| 123 |
+
<?php endif; ?>
|
| 124 |
<?php endif; ?>
|
| 125 |
</td>
|
| 126 |
</tr>
|
app/design/frontend/blank/default/template/googlecheckout/link.phtml
CHANGED
|
@@ -25,10 +25,14 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<li>
|
|
|
|
|
|
|
|
|
|
| 28 |
<form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if($this->getIsActiveAanalytics()):?> onsubmit="setUrchinInputCode(pageTracker)"<?php endif;?>>
|
| 29 |
<fieldset>
|
| 30 |
<input type="hidden" name="analyticsdata" value="" />
|
| 31 |
-
<input type="image" src="<?php echo $this->htmlEscape($this->getImageUrl())?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" />
|
| 32 |
</fieldset>
|
| 33 |
</form>
|
|
|
|
| 34 |
</li>
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<li>
|
| 28 |
+
<?php if ($this->getIsDisabled()): ?>
|
| 29 |
+
<img src="<?php echo $this->htmlEscape($this->getImageUrl())?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" />
|
| 30 |
+
<?php else: ?>
|
| 31 |
<form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if($this->getIsActiveAanalytics()):?> onsubmit="setUrchinInputCode(pageTracker)"<?php endif;?>>
|
| 32 |
<fieldset>
|
| 33 |
<input type="hidden" name="analyticsdata" value="" />
|
| 34 |
+
<input type="image" src="<?php echo $this->htmlEscape($this->getImageUrl())?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" <? echo $this->getIsDisabled()?'disabled="disabled"':'' ?> />
|
| 35 |
</fieldset>
|
| 36 |
</form>
|
| 37 |
+
<?php endif; ?>
|
| 38 |
</li>
|
app/design/frontend/blank/default/template/page/html/head.phtml
CHANGED
|
@@ -40,3 +40,4 @@
|
|
| 40 |
<?php echo $this->getCssJsHtml() ?>
|
| 41 |
<?php echo $this->getChildHtml() ?>
|
| 42 |
<?php echo $this->helper('core/js')->getTranslatorScript() ?>
|
|
|
| 40 |
<?php echo $this->getCssJsHtml() ?>
|
| 41 |
<?php echo $this->getChildHtml() ?>
|
| 42 |
<?php echo $this->helper('core/js')->getTranslatorScript() ?>
|
| 43 |
+
<?php echo $this->getIncludes() ?>
|
app/design/frontend/blank/default/template/paypal/express/review.phtml
CHANGED
|
@@ -104,14 +104,14 @@
|
|
| 104 |
<br />
|
| 105 |
|
| 106 |
<form method="post" action="<?php echo $this->getUrl('paypal/express/saveOrder') ?>">
|
| 107 |
-
<
|
|
|
|
|
|
|
|
|
|
| 108 |
<span id="review-please-wait" class="please-wait" style="display:none;">
|
| 109 |
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
|
| 110 |
</span>
|
| 111 |
-
|
| 112 |
-
<button type="button" class="button" id="review-button" onclick="return saveOrder();"><span><?php echo $this->__('Place an Order') ?></span></button>
|
| 113 |
-
</span>
|
| 114 |
-
</p>
|
| 115 |
</form>
|
| 116 |
<script type="text/javascript">
|
| 117 |
//<![CDATA[
|
| 104 |
<br />
|
| 105 |
|
| 106 |
<form method="post" action="<?php echo $this->getUrl('paypal/express/saveOrder') ?>">
|
| 107 |
+
<fieldset>
|
| 108 |
+
<span id="review-buttons-container">
|
| 109 |
+
<button type="submit" class="button" id="review-button" onclick="return saveOrder();" value="<?php echo $this->__('Place an Order') ?>"><span><?php echo $this->__('Place an Order') ?></span></button>
|
| 110 |
+
</span>
|
| 111 |
<span id="review-please-wait" class="please-wait" style="display:none;">
|
| 112 |
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
|
| 113 |
</span>
|
| 114 |
+
</fieldset>
|
|
|
|
|
|
|
|
|
|
| 115 |
</form>
|
| 116 |
<script type="text/javascript">
|
| 117 |
//<![CDATA[
|
app/design/frontend/blank/default/template/paypal/express/review/details.phtml
CHANGED
|
@@ -26,9 +26,9 @@
|
|
| 26 |
?>
|
| 27 |
<table id="details-table" class="data-table">
|
| 28 |
<col />
|
| 29 |
-
<col width="
|
| 30 |
-
<col width="
|
| 31 |
-
<col width="
|
| 32 |
<thead>
|
| 33 |
<tr>
|
| 34 |
<th><?php echo $this->__('Product Name') ?></th>
|
|
@@ -37,12 +37,20 @@
|
|
| 37 |
<th><?php echo $this->__('Subtotal') ?></th>
|
| 38 |
</tr>
|
| 39 |
</thead>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
<tbody>
|
| 41 |
<?php foreach ($this->getItems() as $_item): ?>
|
| 42 |
<?php if ($_item->getParentItem()) continue ?>
|
| 43 |
<tr>
|
| 44 |
<td>
|
| 45 |
-
|
| 46 |
<?php echo $_item->getProduct()->getDescription() ?>
|
| 47 |
</td>
|
| 48 |
<td><?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()); ?></td>
|
|
@@ -51,12 +59,4 @@
|
|
| 51 |
</tr>
|
| 52 |
<?php endforeach; ?>
|
| 53 |
</tbody>
|
| 54 |
-
<tfoot>
|
| 55 |
-
<?php foreach ($this->getTotals() as $_total): ?>
|
| 56 |
-
<tr>
|
| 57 |
-
<td colspan="3"><?php echo $_total->getTitle() ?></td>
|
| 58 |
-
<td><?php echo $this->helper('checkout')->formatPrice($_total->getValue()) ?></td>
|
| 59 |
-
</tr>
|
| 60 |
-
<?php endforeach; ?>
|
| 61 |
-
</tfoot>
|
| 62 |
</table>
|
| 26 |
?>
|
| 27 |
<table id="details-table" class="data-table">
|
| 28 |
<col />
|
| 29 |
+
<col width="1" />
|
| 30 |
+
<col width="1" />
|
| 31 |
+
<col width="1" />
|
| 32 |
<thead>
|
| 33 |
<tr>
|
| 34 |
<th><?php echo $this->__('Product Name') ?></th>
|
| 37 |
<th><?php echo $this->__('Subtotal') ?></th>
|
| 38 |
</tr>
|
| 39 |
</thead>
|
| 40 |
+
<tfoot>
|
| 41 |
+
<?php foreach ($this->getTotals() as $_total): ?>
|
| 42 |
+
<tr>
|
| 43 |
+
<th colspan="3"><?php echo $_total->getTitle() ?></th>
|
| 44 |
+
<td><?php echo $this->helper('checkout')->formatPrice($_total->getValue()) ?></td>
|
| 45 |
+
</tr>
|
| 46 |
+
<?php endforeach; ?>
|
| 47 |
+
</tfoot>
|
| 48 |
<tbody>
|
| 49 |
<?php foreach ($this->getItems() as $_item): ?>
|
| 50 |
<?php if ($_item->getParentItem()) continue ?>
|
| 51 |
<tr>
|
| 52 |
<td>
|
| 53 |
+
<?php echo $_item->getProduct()->getName() ?>
|
| 54 |
<?php echo $_item->getProduct()->getDescription() ?>
|
| 55 |
</td>
|
| 56 |
<td><?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()); ?></td>
|
| 59 |
</tr>
|
| 60 |
<?php endforeach; ?>
|
| 61 |
</tbody>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 62 |
</table>
|
app/design/frontend/blank/default/template/sales/order/creditmemo/items/renderer/default.phtml
CHANGED
|
@@ -60,17 +60,115 @@
|
|
| 60 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 61 |
<span class="price-excl-tax">
|
| 62 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 63 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 64 |
<?php endif; ?>
|
| 65 |
-
<?php echo $_order->formatPrice($_item->getPrice()) ?>
|
| 66 |
</span>
|
|
|
|
| 67 |
<?php endif; ?>
|
| 68 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 69 |
<span class="price-incl-tax">
|
| 70 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 71 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 72 |
<?php endif; ?>
|
| 73 |
-
<?php echo $_order->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
|
| 74 |
</span>
|
| 75 |
<?php endif; ?>
|
| 76 |
</td>
|
|
@@ -79,22 +177,122 @@
|
|
| 79 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 80 |
<span class="price-excl-tax">
|
| 81 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 82 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 83 |
<?php endif; ?>
|
| 84 |
-
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 85 |
</span>
|
|
|
|
| 86 |
<?php endif; ?>
|
| 87 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 88 |
<span class="price-incl-tax">
|
| 89 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 90 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 91 |
<?php endif; ?>
|
| 92 |
-
|
|
|
|
|
|
|
| 93 |
</span>
|
| 94 |
<?php endif; ?>
|
| 95 |
</td>
|
| 96 |
<td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
|
| 97 |
<td class="last a-right">
|
| 98 |
-
<?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()) ?>
|
| 99 |
</td>
|
| 100 |
</tr>
|
| 60 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 61 |
<span class="price-excl-tax">
|
| 62 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 63 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 64 |
+
<div class="cart-price">
|
| 65 |
+
<?php endif; ?>
|
| 66 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 67 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 68 |
+
</div>
|
| 69 |
+
<?php endif; ?>
|
| 70 |
+
<?php endif; ?>
|
| 71 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 72 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 73 |
+
<?php else: ?>
|
| 74 |
+
<div class="cart-price">
|
| 75 |
+
<?php endif; ?>
|
| 76 |
+
|
| 77 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 78 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
|
| 79 |
+
<?php else: ?>
|
| 80 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 81 |
+
<?php endif; ?>
|
| 82 |
+
|
| 83 |
+
</div>
|
| 84 |
+
|
| 85 |
+
|
| 86 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 87 |
+
|
| 88 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 89 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 90 |
+
<small>
|
| 91 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 92 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 93 |
+
<?php endforeach; ?>
|
| 94 |
+
</small>
|
| 95 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 96 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 97 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 98 |
+
<?php endforeach; ?>
|
| 99 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 100 |
+
<small>
|
| 101 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 102 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 103 |
+
<?php endforeach; ?>
|
| 104 |
+
</small>
|
| 105 |
+
<?php endif; ?>
|
| 106 |
+
</div>
|
| 107 |
+
|
| 108 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 109 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 110 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
|
| 111 |
+
</div>
|
| 112 |
+
<?php endif; ?>
|
| 113 |
<?php endif; ?>
|
|
|
|
| 114 |
</span>
|
| 115 |
+
<br /><br />
|
| 116 |
<?php endif; ?>
|
| 117 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 118 |
<span class="price-incl-tax">
|
| 119 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 120 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 121 |
+
<div class="cart-price">
|
| 122 |
+
<?php endif; ?>
|
| 123 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 124 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 125 |
+
</div>
|
| 126 |
+
<?php endif; ?>
|
| 127 |
+
<?php endif; ?>
|
| 128 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
|
| 129 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 130 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 131 |
+
<?php else: ?>
|
| 132 |
+
<div class="cart-price">
|
| 133 |
+
<?php endif; ?>
|
| 134 |
+
|
| 135 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 136 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
|
| 137 |
+
<?php else: ?>
|
| 138 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
|
| 139 |
+
<?php endif; ?>
|
| 140 |
+
|
| 141 |
+
</div>
|
| 142 |
+
|
| 143 |
+
|
| 144 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 145 |
+
|
| 146 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 147 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 148 |
+
<small>
|
| 149 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 150 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 151 |
+
<?php endforeach; ?>
|
| 152 |
+
</small>
|
| 153 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 154 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 155 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 156 |
+
<?php endforeach; ?>
|
| 157 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 158 |
+
<small>
|
| 159 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 160 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 161 |
+
<?php endforeach; ?>
|
| 162 |
+
</small>
|
| 163 |
+
<?php endif; ?>
|
| 164 |
+
</div>
|
| 165 |
+
|
| 166 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 167 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 168 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
|
| 169 |
+
</div>
|
| 170 |
+
<?php endif; ?>
|
| 171 |
<?php endif; ?>
|
|
|
|
| 172 |
</span>
|
| 173 |
<?php endif; ?>
|
| 174 |
</td>
|
| 177 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 178 |
<span class="price-excl-tax">
|
| 179 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 180 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 181 |
+
<div class="cart-price">
|
| 182 |
+
<?php endif; ?>
|
| 183 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 184 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 185 |
+
</div>
|
| 186 |
+
<?php endif; ?>
|
| 187 |
+
<?php endif; ?>
|
| 188 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 189 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 190 |
+
<?php else: ?>
|
| 191 |
+
<div class="cart-price">
|
| 192 |
+
<?php endif; ?>
|
| 193 |
+
|
| 194 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 195 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
|
| 196 |
+
<?php else: ?>
|
| 197 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 198 |
+
<?php endif; ?>
|
| 199 |
+
|
| 200 |
+
</div>
|
| 201 |
+
|
| 202 |
+
|
| 203 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 204 |
+
|
| 205 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 206 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 207 |
+
<small>
|
| 208 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 209 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 210 |
+
<?php endforeach; ?>
|
| 211 |
+
</small>
|
| 212 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 213 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 214 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 215 |
+
<?php endforeach; ?>
|
| 216 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 217 |
+
<small>
|
| 218 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 219 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 220 |
+
<?php endforeach; ?>
|
| 221 |
+
</small>
|
| 222 |
+
<?php endif; ?>
|
| 223 |
+
</div>
|
| 224 |
+
|
| 225 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 226 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 227 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
|
| 228 |
+
</div>
|
| 229 |
+
<?php endif; ?>
|
| 230 |
<?php endif; ?>
|
|
|
|
| 231 |
</span>
|
| 232 |
+
<br /><br />
|
| 233 |
<?php endif; ?>
|
| 234 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 235 |
<span class="price-incl-tax">
|
| 236 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 237 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 238 |
+
<div class="cart-price">
|
| 239 |
+
<?php endif; ?>
|
| 240 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 241 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 242 |
+
</div>
|
| 243 |
+
<?php endif; ?>
|
| 244 |
+
<?php endif; ?>
|
| 245 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
|
| 246 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 247 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 248 |
+
<?php else: ?>
|
| 249 |
+
<div class="cart-price">
|
| 250 |
+
<?php endif; ?>
|
| 251 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 252 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
|
| 253 |
+
<?php else: ?>
|
| 254 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
|
| 255 |
+
<?php endif; ?>
|
| 256 |
+
|
| 257 |
+
</div>
|
| 258 |
+
|
| 259 |
+
|
| 260 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 261 |
+
|
| 262 |
+
<div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 263 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 264 |
+
<small>
|
| 265 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 266 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 267 |
+
<?php endforeach; ?>
|
| 268 |
+
</small>
|
| 269 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 270 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 271 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 272 |
+
<?php endforeach; ?>
|
| 273 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 274 |
+
<small>
|
| 275 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 276 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 277 |
+
<?php endforeach; ?>
|
| 278 |
+
</small>
|
| 279 |
+
<?php endif; ?>
|
| 280 |
+
</div>
|
| 281 |
+
|
| 282 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 283 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 284 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 285 |
+
</div>
|
| 286 |
+
<?php endif; ?>
|
| 287 |
<?php endif; ?>
|
| 288 |
+
|
| 289 |
+
|
| 290 |
+
|
| 291 |
</span>
|
| 292 |
<?php endif; ?>
|
| 293 |
</td>
|
| 294 |
<td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
|
| 295 |
<td class="last a-right">
|
| 296 |
+
<?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
|
| 297 |
</td>
|
| 298 |
</tr>
|
app/design/frontend/blank/default/template/sales/order/invoice/items/renderer/default.phtml
CHANGED
|
@@ -61,17 +61,115 @@
|
|
| 61 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 62 |
<span class="price-excl-tax">
|
| 63 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 64 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
<?php endif; ?>
|
| 66 |
-
<?php echo $_order->formatPrice($_item->getPrice()) ?>
|
| 67 |
</span>
|
|
|
|
| 68 |
<?php endif; ?>
|
| 69 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 70 |
<span class="price-incl-tax">
|
| 71 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 72 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 73 |
<?php endif; ?>
|
| 74 |
-
<?php echo $_order->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
|
| 75 |
</span>
|
| 76 |
<?php endif; ?>
|
| 77 |
</td>
|
|
@@ -80,17 +178,117 @@
|
|
| 80 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 81 |
<span class="price-excl-tax">
|
| 82 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 83 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 84 |
<?php endif; ?>
|
| 85 |
-
<?php echo $_order->formatPrice($_item->getRowTotal()) ?>
|
| 86 |
</span>
|
|
|
|
| 87 |
<?php endif; ?>
|
| 88 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 89 |
<span class="price-incl-tax">
|
| 90 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 91 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 92 |
<?php endif; ?>
|
| 93 |
-
|
|
|
|
|
|
|
| 94 |
</span>
|
| 95 |
<?php endif; ?>
|
| 96 |
</td>
|
| 61 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 62 |
<span class="price-excl-tax">
|
| 63 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 64 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 65 |
+
<div class="cart-price">
|
| 66 |
+
<?php endif; ?>
|
| 67 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 68 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 69 |
+
</div>
|
| 70 |
+
<?php endif; ?>
|
| 71 |
+
<?php endif; ?>
|
| 72 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 73 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 74 |
+
<?php else: ?>
|
| 75 |
+
<div class="cart-price">
|
| 76 |
+
<?php endif; ?>
|
| 77 |
+
|
| 78 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 79 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
|
| 80 |
+
<?php else: ?>
|
| 81 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 82 |
+
<?php endif; ?>
|
| 83 |
+
|
| 84 |
+
</div>
|
| 85 |
+
|
| 86 |
+
|
| 87 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 88 |
+
|
| 89 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 90 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 91 |
+
<small>
|
| 92 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 93 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 94 |
+
<?php endforeach; ?>
|
| 95 |
+
</small>
|
| 96 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 97 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 98 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 99 |
+
<?php endforeach; ?>
|
| 100 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 101 |
+
<small>
|
| 102 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 103 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 104 |
+
<?php endforeach; ?>
|
| 105 |
+
</small>
|
| 106 |
+
<?php endif; ?>
|
| 107 |
+
</div>
|
| 108 |
+
|
| 109 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 110 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 111 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
|
| 112 |
+
</div>
|
| 113 |
+
<?php endif; ?>
|
| 114 |
<?php endif; ?>
|
|
|
|
| 115 |
</span>
|
| 116 |
+
<br /><br />
|
| 117 |
<?php endif; ?>
|
| 118 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 119 |
<span class="price-incl-tax">
|
| 120 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 121 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 122 |
+
<div class="cart-price">
|
| 123 |
+
<?php endif; ?>
|
| 124 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 125 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 126 |
+
</div>
|
| 127 |
+
<?php endif; ?>
|
| 128 |
+
<?php endif; ?>
|
| 129 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
|
| 130 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 131 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 132 |
+
<?php else: ?>
|
| 133 |
+
<div class="cart-price">
|
| 134 |
+
<?php endif; ?>
|
| 135 |
+
|
| 136 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 137 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
|
| 138 |
+
<?php else: ?>
|
| 139 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
|
| 140 |
+
<?php endif; ?>
|
| 141 |
+
|
| 142 |
+
</div>
|
| 143 |
+
|
| 144 |
+
|
| 145 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 146 |
+
|
| 147 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 148 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 149 |
+
<small>
|
| 150 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 151 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 152 |
+
<?php endforeach; ?>
|
| 153 |
+
</small>
|
| 154 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 155 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 156 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 157 |
+
<?php endforeach; ?>
|
| 158 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 159 |
+
<small>
|
| 160 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 161 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 162 |
+
<?php endforeach; ?>
|
| 163 |
+
</small>
|
| 164 |
+
<?php endif; ?>
|
| 165 |
+
</div>
|
| 166 |
+
|
| 167 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 168 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 169 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
|
| 170 |
+
</div>
|
| 171 |
+
<?php endif; ?>
|
| 172 |
<?php endif; ?>
|
|
|
|
| 173 |
</span>
|
| 174 |
<?php endif; ?>
|
| 175 |
</td>
|
| 178 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 179 |
<span class="price-excl-tax">
|
| 180 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 181 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 182 |
+
<div class="cart-price">
|
| 183 |
+
<?php endif; ?>
|
| 184 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 185 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 186 |
+
</div>
|
| 187 |
+
<?php endif; ?>
|
| 188 |
+
<?php endif; ?>
|
| 189 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 190 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 191 |
+
<?php else: ?>
|
| 192 |
+
<div class="cart-price">
|
| 193 |
+
<?php endif; ?>
|
| 194 |
+
|
| 195 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 196 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
|
| 197 |
+
<?php else: ?>
|
| 198 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 199 |
+
<?php endif; ?>
|
| 200 |
+
|
| 201 |
+
</div>
|
| 202 |
+
|
| 203 |
+
|
| 204 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 205 |
+
|
| 206 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 207 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 208 |
+
<small>
|
| 209 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 210 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 211 |
+
<?php endforeach; ?>
|
| 212 |
+
</small>
|
| 213 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 214 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 215 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 216 |
+
<?php endforeach; ?>
|
| 217 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 218 |
+
<small>
|
| 219 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 220 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 221 |
+
<?php endforeach; ?>
|
| 222 |
+
</small>
|
| 223 |
+
<?php endif; ?>
|
| 224 |
+
</div>
|
| 225 |
+
|
| 226 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 227 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 228 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
|
| 229 |
+
</div>
|
| 230 |
+
<?php endif; ?>
|
| 231 |
<?php endif; ?>
|
|
|
|
| 232 |
</span>
|
| 233 |
+
<br /><br />
|
| 234 |
<?php endif; ?>
|
| 235 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 236 |
<span class="price-incl-tax">
|
| 237 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 238 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 239 |
+
<div class="cart-price">
|
| 240 |
+
<?php endif; ?>
|
| 241 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 242 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 243 |
+
</div>
|
| 244 |
+
<?php endif; ?>
|
| 245 |
+
<?php endif; ?>
|
| 246 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
|
| 247 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 248 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 249 |
+
<?php else: ?>
|
| 250 |
+
<div class="cart-price">
|
| 251 |
+
<?php endif; ?>
|
| 252 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 253 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
|
| 254 |
+
<?php else: ?>
|
| 255 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
|
| 256 |
+
<?php endif; ?>
|
| 257 |
+
|
| 258 |
+
</div>
|
| 259 |
+
|
| 260 |
+
|
| 261 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 262 |
+
|
| 263 |
+
<div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 264 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 265 |
+
<small>
|
| 266 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 267 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 268 |
+
<?php endforeach; ?>
|
| 269 |
+
</small>
|
| 270 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 271 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 272 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 273 |
+
<?php endforeach; ?>
|
| 274 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 275 |
+
<small>
|
| 276 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 277 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 278 |
+
<?php endforeach; ?>
|
| 279 |
+
</small>
|
| 280 |
+
<?php endif; ?>
|
| 281 |
+
</div>
|
| 282 |
+
|
| 283 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 284 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 285 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 286 |
+
</div>
|
| 287 |
+
<?php endif; ?>
|
| 288 |
<?php endif; ?>
|
| 289 |
+
|
| 290 |
+
|
| 291 |
+
|
| 292 |
</span>
|
| 293 |
<?php endif; ?>
|
| 294 |
</td>
|
app/design/frontend/blank/default/template/sales/order/items/renderer/default.phtml
CHANGED
|
@@ -60,17 +60,115 @@
|
|
| 60 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 61 |
<span class="price-excl-tax">
|
| 62 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 63 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 64 |
<?php endif; ?>
|
| 65 |
-
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 66 |
</span>
|
|
|
|
| 67 |
<?php endif; ?>
|
| 68 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 69 |
<span class="price-incl-tax">
|
| 70 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 71 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 72 |
<?php endif; ?>
|
| 73 |
-
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($this->getItem())); ?>
|
| 74 |
</span>
|
| 75 |
<?php endif; ?>
|
| 76 |
</td>
|
|
@@ -94,17 +192,117 @@
|
|
| 94 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 95 |
<span class="price-excl-tax">
|
| 96 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 97 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 98 |
<?php endif; ?>
|
| 99 |
-
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 100 |
</span>
|
|
|
|
| 101 |
<?php endif; ?>
|
| 102 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 103 |
<span class="price-incl-tax">
|
| 104 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 105 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 106 |
<?php endif; ?>
|
| 107 |
-
|
|
|
|
|
|
|
| 108 |
</span>
|
| 109 |
<?php endif; ?>
|
| 110 |
</td>
|
| 60 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 61 |
<span class="price-excl-tax">
|
| 62 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 63 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 64 |
+
<div class="cart-price">
|
| 65 |
+
<?php endif; ?>
|
| 66 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 67 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 68 |
+
</div>
|
| 69 |
+
<?php endif; ?>
|
| 70 |
+
<?php endif; ?>
|
| 71 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 72 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 73 |
+
<?php else: ?>
|
| 74 |
+
<div class="cart-price">
|
| 75 |
+
<?php endif; ?>
|
| 76 |
+
|
| 77 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 78 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
|
| 79 |
+
<?php else: ?>
|
| 80 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
|
| 81 |
+
<?php endif; ?>
|
| 82 |
+
|
| 83 |
+
</div>
|
| 84 |
+
|
| 85 |
+
|
| 86 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 87 |
+
|
| 88 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 89 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 90 |
+
<small>
|
| 91 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 92 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 93 |
+
<?php endforeach; ?>
|
| 94 |
+
</small>
|
| 95 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 96 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 97 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 98 |
+
<?php endforeach; ?>
|
| 99 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 100 |
+
<small>
|
| 101 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 102 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 103 |
+
<?php endforeach; ?>
|
| 104 |
+
</small>
|
| 105 |
+
<?php endif; ?>
|
| 106 |
+
</div>
|
| 107 |
+
|
| 108 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 109 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 110 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
|
| 111 |
+
</div>
|
| 112 |
+
<?php endif; ?>
|
| 113 |
<?php endif; ?>
|
|
|
|
| 114 |
</span>
|
| 115 |
+
<br /><br />
|
| 116 |
<?php endif; ?>
|
| 117 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 118 |
<span class="price-incl-tax">
|
| 119 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 120 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 121 |
+
<div class="cart-price">
|
| 122 |
+
<?php endif; ?>
|
| 123 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 124 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 125 |
+
</div>
|
| 126 |
+
<?php endif; ?>
|
| 127 |
+
<?php endif; ?>
|
| 128 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
|
| 129 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 130 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 131 |
+
<?php else: ?>
|
| 132 |
+
<div class="cart-price">
|
| 133 |
+
<?php endif; ?>
|
| 134 |
+
|
| 135 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 136 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
|
| 137 |
+
<?php else: ?>
|
| 138 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
|
| 139 |
+
<?php endif; ?>
|
| 140 |
+
|
| 141 |
+
</div>
|
| 142 |
+
|
| 143 |
+
|
| 144 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 145 |
+
|
| 146 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 147 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 148 |
+
<small>
|
| 149 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 150 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
|
| 151 |
+
<?php endforeach; ?>
|
| 152 |
+
</small>
|
| 153 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 154 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 155 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
|
| 156 |
+
<?php endforeach; ?>
|
| 157 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 158 |
+
<small>
|
| 159 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 160 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
|
| 161 |
+
<?php endforeach; ?>
|
| 162 |
+
</small>
|
| 163 |
+
<?php endif; ?>
|
| 164 |
+
</div>
|
| 165 |
+
|
| 166 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 167 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 168 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
|
| 169 |
+
</div>
|
| 170 |
+
<?php endif; ?>
|
| 171 |
<?php endif; ?>
|
|
|
|
| 172 |
</span>
|
| 173 |
<?php endif; ?>
|
| 174 |
</td>
|
| 192 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
|
| 193 |
<span class="price-excl-tax">
|
| 194 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 195 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 196 |
+
<div class="cart-price">
|
| 197 |
+
<?php endif; ?>
|
| 198 |
+
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
|
| 199 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 200 |
+
</div>
|
| 201 |
+
<?php endif; ?>
|
| 202 |
+
<?php endif; ?>
|
| 203 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 204 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 205 |
+
<?php else: ?>
|
| 206 |
+
<div class="cart-price">
|
| 207 |
+
<?php endif; ?>
|
| 208 |
+
|
| 209 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 210 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
|
| 211 |
+
<?php else: ?>
|
| 212 |
+
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
|
| 213 |
+
<?php endif; ?>
|
| 214 |
+
|
| 215 |
+
</div>
|
| 216 |
+
|
| 217 |
+
|
| 218 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 219 |
+
|
| 220 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 221 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 222 |
+
<small>
|
| 223 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 224 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 225 |
+
<?php endforeach; ?>
|
| 226 |
+
</small>
|
| 227 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 228 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 229 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 230 |
+
<?php endforeach; ?>
|
| 231 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 232 |
+
<small>
|
| 233 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 234 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 235 |
+
<?php endforeach; ?>
|
| 236 |
+
</small>
|
| 237 |
+
<?php endif; ?>
|
| 238 |
+
</div>
|
| 239 |
+
|
| 240 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 241 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 242 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
|
| 243 |
+
</div>
|
| 244 |
+
<?php endif; ?>
|
| 245 |
<?php endif; ?>
|
|
|
|
| 246 |
</span>
|
| 247 |
+
<br /><br />
|
| 248 |
<?php endif; ?>
|
| 249 |
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
|
| 250 |
<span class="price-incl-tax">
|
| 251 |
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
| 252 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 253 |
+
<div class="cart-price">
|
| 254 |
+
<?php endif; ?>
|
| 255 |
+
<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
|
| 256 |
+
<?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 257 |
+
</div>
|
| 258 |
+
<?php endif; ?>
|
| 259 |
+
<?php endif; ?>
|
| 260 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
|
| 261 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 262 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 263 |
+
<?php else: ?>
|
| 264 |
+
<div class="cart-price">
|
| 265 |
+
<?php endif; ?>
|
| 266 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 267 |
+
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
|
| 268 |
+
<?php else: ?>
|
| 269 |
+
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
|
| 270 |
+
<?php endif; ?>
|
| 271 |
+
|
| 272 |
+
</div>
|
| 273 |
+
|
| 274 |
+
|
| 275 |
+
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
|
| 276 |
+
|
| 277 |
+
<div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
|
| 278 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 279 |
+
<small>
|
| 280 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 281 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
|
| 282 |
+
<?php endforeach; ?>
|
| 283 |
+
</small>
|
| 284 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 285 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 286 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
|
| 287 |
+
<?php endforeach; ?>
|
| 288 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 289 |
+
<small>
|
| 290 |
+
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
|
| 291 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
|
| 292 |
+
<?php endforeach; ?>
|
| 293 |
+
</small>
|
| 294 |
+
<?php endif; ?>
|
| 295 |
+
</div>
|
| 296 |
+
|
| 297 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
|
| 298 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
|
| 299 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
|
| 300 |
+
</div>
|
| 301 |
+
<?php endif; ?>
|
| 302 |
<?php endif; ?>
|
| 303 |
+
|
| 304 |
+
|
| 305 |
+
|
| 306 |
</span>
|
| 307 |
<?php endif; ?>
|
| 308 |
</td>
|
app/design/frontend/blank/default/template/sales/order/print/tax.phtml
CHANGED
|
@@ -31,6 +31,7 @@
|
|
| 31 |
<?php if ($this->helper('tax')->displayFullSummary()): ?>
|
| 32 |
<?php $isTop = 1; ?>
|
| 33 |
<?php if ($_fullInfo) foreach ($_fullInfo as $info): ?>
|
|
|
|
| 34 |
<?php $percent = $info['percent']; ?>
|
| 35 |
<?php $amount = $info['amount']; ?>
|
| 36 |
<?php $rates = $info['rates']; ?>
|
|
@@ -38,9 +39,14 @@
|
|
| 38 |
|
| 39 |
<?php foreach ($rates as $rate): ?>
|
| 40 |
<tr class="tax-details-<?php echo $taxIter; ?> tax-details<?php if ($isTop): echo ' tax-details-first'; endif; ?>">
|
| 41 |
-
<td class="a-right" colspan="4"><?php echo $rate['title']; ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 42 |
<?php if ($isFirst): ?>
|
| 43 |
-
<td rowspan="<?php echo count($rates); ?>"
|
| 44 |
<?php endif; ?>
|
| 45 |
</tr>
|
| 46 |
<?php $isFirst = 0; ?>
|
| 31 |
<?php if ($this->helper('tax')->displayFullSummary()): ?>
|
| 32 |
<?php $isTop = 1; ?>
|
| 33 |
<?php if ($_fullInfo) foreach ($_fullInfo as $info): ?>
|
| 34 |
+
<?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
|
| 35 |
<?php $percent = $info['percent']; ?>
|
| 36 |
<?php $amount = $info['amount']; ?>
|
| 37 |
<?php $rates = $info['rates']; ?>
|
| 39 |
|
| 40 |
<?php foreach ($rates as $rate): ?>
|
| 41 |
<tr class="tax-details-<?php echo $taxIter; ?> tax-details<?php if ($isTop): echo ' tax-details-first'; endif; ?>">
|
| 42 |
+
<td class="a-right" colspan="4"><?php echo $rate['title']; ?>
|
| 43 |
+
<?php if ($rate['percent']): ?>
|
| 44 |
+
(<?php echo $rate['percent']; ?>%)
|
| 45 |
+
<?php endif; ?>
|
| 46 |
+
<br />
|
| 47 |
+
</td>
|
| 48 |
<?php if ($isFirst): ?>
|
| 49 |
+
<td class="a-right" rowspan="<?php echo count($rates); ?>"><?php echo $_order->formatPrice($amount); ?></td>
|
| 50 |
<?php endif; ?>
|
| 51 |
</tr>
|
| 52 |
<?php $isFirst = 0; ?>
|
app/design/frontend/blank/default/template/sales/order/tax.phtml
CHANGED
|
@@ -31,6 +31,7 @@
|
|
| 31 |
<?php if ($this->helper('tax')->displayFullSummary()): ?>
|
| 32 |
<?php $isTop = 1; ?>
|
| 33 |
<?php if ($_fullInfo) foreach ($_fullInfo as $info): ?>
|
|
|
|
| 34 |
<?php $percent = $info['percent']; ?>
|
| 35 |
<?php $amount = $info['amount']; ?>
|
| 36 |
<?php $rates = $info['rates']; ?>
|
|
@@ -39,10 +40,14 @@
|
|
| 39 |
<?php foreach ($rates as $rate): ?>
|
| 40 |
<tr class="tax-details-<?php echo $taxIter; ?> tax-details<?php if ($isTop): echo ' tax-details-first'; endif; ?>" style="display:none;">
|
| 41 |
<td class="a-right" colspan="4">
|
| 42 |
-
<?php echo $rate['title']; ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
</td>
|
| 44 |
<?php if ($isFirst): ?>
|
| 45 |
-
<td rowspan="<?php echo count($rates); ?>"
|
| 46 |
<?php echo $_order->formatPrice($amount); ?>
|
| 47 |
</td>
|
| 48 |
<?php endif; ?>
|
| 31 |
<?php if ($this->helper('tax')->displayFullSummary()): ?>
|
| 32 |
<?php $isTop = 1; ?>
|
| 33 |
<?php if ($_fullInfo) foreach ($_fullInfo as $info): ?>
|
| 34 |
+
<?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
|
| 35 |
<?php $percent = $info['percent']; ?>
|
| 36 |
<?php $amount = $info['amount']; ?>
|
| 37 |
<?php $rates = $info['rates']; ?>
|
| 40 |
<?php foreach ($rates as $rate): ?>
|
| 41 |
<tr class="tax-details-<?php echo $taxIter; ?> tax-details<?php if ($isTop): echo ' tax-details-first'; endif; ?>" style="display:none;">
|
| 42 |
<td class="a-right" colspan="4">
|
| 43 |
+
<?php echo $rate['title']; ?>
|
| 44 |
+
<?php if ($rate['percent']): ?>
|
| 45 |
+
(<?php echo $rate['percent']; ?>%)
|
| 46 |
+
<?php endif; ?>
|
| 47 |
+
<br />
|
| 48 |
</td>
|
| 49 |
<?php if ($isFirst): ?>
|
| 50 |
+
<td class="a-right" rowspan="<?php echo count($rates); ?>">
|
| 51 |
<?php echo $_order->formatPrice($amount); ?>
|
| 52 |
</td>
|
| 53 |
<?php endif; ?>
|
app/design/frontend/blank/default/template/shipping/tracking/popup.phtml
CHANGED
|
@@ -51,7 +51,7 @@
|
|
| 51 |
<?php if($track->getErrorMessage()): ?>
|
| 52 |
<tr>
|
| 53 |
<th class="label"><?php echo $this->__('Error:'); ?></th>
|
| 54 |
-
<td class="error"><?php echo $this->__('Tracking information is currently not available. Please ') ?><a href="<?php echo $this->getContactUs() ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php $this->__(' for more information or email us at '); ?><a href="<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
|
| 55 |
</tr>
|
| 56 |
<?php elseif($track->getTrackSummary()): ?>
|
| 57 |
<tr>
|
| 51 |
<?php if($track->getErrorMessage()): ?>
|
| 52 |
<tr>
|
| 53 |
<th class="label"><?php echo $this->__('Error:'); ?></th>
|
| 54 |
+
<td class="error"><?php echo $this->__('Tracking information is currently not available. Please ') ?><a href="<?php echo $this->getContactUs() ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php echo $this->__(' for more information or email us at '); ?><a href="<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
|
| 55 |
</tr>
|
| 56 |
<?php elseif($track->getTrackSummary()): ?>
|
| 57 |
<tr>
|
app/design/frontend/blank/default/template/tag/customer/edit.phtml
CHANGED
|
@@ -30,7 +30,7 @@
|
|
| 30 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 31 |
<form id="addTagForm" action="<?php echo $this->getFormAction(); ?>" method="post">
|
| 32 |
<fieldset class="group-select">
|
| 33 |
-
<h3
|
| 34 |
<p><input type="text" class="input-text required-entry" name="productTagName" value="<?php echo $this->htmlEscape($this->getTag()->getName()) ?>" /></p>
|
| 35 |
</fieldset>
|
| 36 |
<div class="buttons-set">
|
| 30 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 31 |
<form id="addTagForm" action="<?php echo $this->getFormAction(); ?>" method="post">
|
| 32 |
<fieldset class="group-select">
|
| 33 |
+
<h3><?php echo $this->__('Tag Information') ?></h3>
|
| 34 |
<p><input type="text" class="input-text required-entry" name="productTagName" value="<?php echo $this->htmlEscape($this->getTag()->getName()) ?>" /></p>
|
| 35 |
</fieldset>
|
| 36 |
<div class="buttons-set">
|
app/design/frontend/blank/default/template/tag/list.phtml
CHANGED
|
@@ -37,7 +37,7 @@
|
|
| 37 |
<?php endif; ?>
|
| 38 |
<form id="addTagForm" action="<?php echo $this->getFormAction(); ?>" method="get">
|
| 39 |
<fieldset class="form-add-tags">
|
| 40 |
-
<label for="
|
| 41 |
<div class="input-box">
|
| 42 |
<input type="text" class="input-text required-entry" name="productTagName" id="productTagName" />
|
| 43 |
</div>
|
| 37 |
<?php endif; ?>
|
| 38 |
<form id="addTagForm" action="<?php echo $this->getFormAction(); ?>" method="get">
|
| 39 |
<fieldset class="form-add-tags">
|
| 40 |
+
<label for="productTagName"><?php echo $this->__('Add Your Tags:') ?></label>
|
| 41 |
<div class="input-box">
|
| 42 |
<input type="text" class="input-text required-entry" name="productTagName" id="productTagName" />
|
| 43 |
</div>
|
app/design/frontend/blank/default/template/wishlist/sharing.phtml
CHANGED
|
@@ -29,6 +29,7 @@
|
|
| 29 |
</div>
|
| 30 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 31 |
<form action="<?php echo $this->getSendUrl() ?>" id="form-validate" method="post">
|
|
|
|
| 32 |
<fieldset class="group-select">
|
| 33 |
<h3><?php echo $this->__('Sharing Information') ?></h3>
|
| 34 |
<ul class="form-list">
|
|
@@ -61,16 +62,16 @@ Validation.addAllThese([
|
|
| 61 |
if(Validation.get('IsEmpty').test(v)) {
|
| 62 |
return true;
|
| 63 |
}
|
| 64 |
-
|
| 65 |
var valid_regexp = /^[a-z0-9\._-]{1,30}@([a-z0-9_-]{1,30}\.){1,5}[a-z]{2,4}$/i;
|
| 66 |
var emails = v.split(',');
|
| 67 |
-
|
| 68 |
for (var i=0; i<emails.length; i++) {
|
| 69 |
if(!valid_regexp.test(emails[i].strip())) {
|
| 70 |
return false;
|
| 71 |
}
|
| 72 |
}
|
| 73 |
-
|
| 74 |
return true;
|
| 75 |
}]
|
| 76 |
]);
|
| 29 |
</div>
|
| 30 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
| 31 |
<form action="<?php echo $this->getSendUrl() ?>" id="form-validate" method="post">
|
| 32 |
+
<?php echo $this->getBlockHtml('formkey')?>
|
| 33 |
<fieldset class="group-select">
|
| 34 |
<h3><?php echo $this->__('Sharing Information') ?></h3>
|
| 35 |
<ul class="form-list">
|
| 62 |
if(Validation.get('IsEmpty').test(v)) {
|
| 63 |
return true;
|
| 64 |
}
|
| 65 |
+
|
| 66 |
var valid_regexp = /^[a-z0-9\._-]{1,30}@([a-z0-9_-]{1,30}\.){1,5}[a-z]{2,4}$/i;
|
| 67 |
var emails = v.split(',');
|
| 68 |
+
|
| 69 |
for (var i=0; i<emails.length; i++) {
|
| 70 |
if(!valid_regexp.test(emails[i].strip())) {
|
| 71 |
return false;
|
| 72 |
}
|
| 73 |
}
|
| 74 |
+
|
| 75 |
return true;
|
| 76 |
}]
|
| 77 |
]);
|
app/design/frontend/blank/default/template/wishlist/view.phtml
CHANGED
|
@@ -34,6 +34,7 @@
|
|
| 34 |
|
| 35 |
<?php if($this->getWishlist()->getSize()): ?>
|
| 36 |
<form action="<?php echo $this->getUrl('*/*/update') ?>" method="post">
|
|
|
|
| 37 |
<table class="data-table" id="wishlist-table">
|
| 38 |
<col width="130" />
|
| 39 |
<col width="300" />
|
| 34 |
|
| 35 |
<?php if($this->getWishlist()->getSize()): ?>
|
| 36 |
<form action="<?php echo $this->getUrl('*/*/update') ?>" method="post">
|
| 37 |
+
<?php echo $this->getBlockHtml('formkey')?>
|
| 38 |
<table class="data-table" id="wishlist-table">
|
| 39 |
<col width="130" />
|
| 40 |
<col width="300" />
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Interface_Frontend_Blank</name>
|
| 4 |
-
<version>1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/afl-3.0.php">AFL 3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>A clean simplistic design interface that can be easily customized by professional designers</summary>
|
| 10 |
<description>A clean simplistic design interface that can be easily customized by professional designers</description>
|
| 11 |
-
<notes>1.
|
| 12 |
<authors><author><name>Magento Core Team</name><user>auto-converted</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
-
<date>2008-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="mageskin"><dir name="frontend"><dir name="blank"><dir name="default"><dir name="css"><file name="clears.css" hash="3d33e824e9fe88915a0f9f1e7f9c147d"/><file name="print.css" hash="1839347706087be0a9c2e3088e5f2f1d"/><file name="reset.css" hash="22db9066e96542f5895a31cca4a21269"/><file name="styles-ie.css" hash="e2039b3791e140d53320fb90ddce661f"/><file name="styles.css" hash="fb83bd96f8f6528b46a87e4ec331a7d4"/></dir><dir name="images"><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="media"><file name="404_callout1.jpg" hash="834e53a03e2921a2fd3c135c0c7189df"/><file name="404_callout2.jpg" hash="016984b4a1579df34147f9407098db73"/><file name="about_us_img.jpg" hash="726f36dd75b5a709a1a14acab1660188"/><file name="col_left_callout.jpg" hash="5f762006021e046f9bd536f37ea7c463"/><file name="col_right_callout.jpg" hash="dae22f37a542da272a35195ec286ec25"/></dir><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_rating.gif" hash="0a8777c815350ddf1e316a537ad0c335"/><file name="btn_google_checkout.gif" hash="843d75249ce05b5d87ca5419f37b1c3b"/><file name="btn_paypal_checkout.gif" hash="6edd61270b7b5632eafad10557129114"/><file name="btn_trash.gif" hash="bcb22f558a0eb32243a2a36645189e9f"/><file name="btn_window_close.gif" hash="c83f3cbbb2aedfc580dff78d5cfb63ed"/><file name="cvv.gif" hash="ed0f392004a405466291071a760b285d"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="icon_big_rss.png" hash="6cf70e7c52a3f3d7b833ccadb041a555"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_rss.gif" hash="e5bbc388d818c142868b4a1df0b48793"/><file name="list_remove_btn.gif" hash="6182e723aa2a253dc6cf334a3dfaaa84"/><file name="logo.gif" hash="6c1c8318d7dd57cc674f2f3cddf04344"/><file name="logo_email.gif" hash="3901817e7bdd9456699f7a267078f2ff"/><file name="logo_print.gif" hash="3901817e7bdd9456699f7a267078f2ff"/><file name="magnifier_handle.gif" hash="238fbdd7959f517db11c6f57ee4daaf4"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="pager_arrow_left.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="pager_arrow_right.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="slider_bg.gif" hash="87bc1b46d87de4f6252c7216216627c3"/><file name="slider_btn_zoom_in.gif" hash="ef0fc67f77f30827ee67f4e744b60781"/><file name="slider_btn_zoom_out.gif" hash="68b3d1c28dc5aec4f6b64d70a6996b6f"/><file name="sort_asc_arrow.gif" hash="40aa554212d6a1f60593c27d78d85fa3"/><file name="sort_desc_arrow.gif" hash="92fd194bfae4ce5ae3354e1e47d7ac7d"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir><dir name="js"><file name="bundle.js" hash="36ca714fc799f466fdd5d96dc3f2eb3e"/><file name="giftmessage.js" hash="98f056ae92e10813f0d550daae6dd944"/><file name="opcheckout.js" hash="88c8105c1a196534fdb5ebc7f216cb8c"/><file name="paypal.js" hash="4793d611370033c7daec147f135672b5"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="blank"><dir name="default"><dir name="layout"><file name="bundle.xml" hash="4f03691d578996e5241629877fb28b99"/><file name="catalog.xml" hash="359d90f692b67b46736c702be63c3506"/><file name="catalogsearch.xml" hash="987332a80d0c7e93ed238087218df2d0"/><file name="checkout.xml" hash="ee2b9f38a9dcc0d971a9204bce49cc36"/><file name="cms.xml" hash="9a4eb9fa95b1e217ab30a654e7423821"/><file name="contacts.xml" hash="e3e3eb3dcf2c276fa11d66722a0a1c62"/><file name="core.xml" hash="c4dec6b7dfa77681905a858a79707c16"/><file name="customer.xml" hash="a180537185e2e90d25f3e7efa7298b35"/><file name="directory.xml" hash="8de0204f95aa4e956a6341a1a7cfe637"/><file name="giftmessage.xml" hash="d91f058897e4ae05938b44960a87a7c0"/><file name="googleanalytics.xml" hash="72fd608e307339080bc2b0e28762644d"/><file name="googlecheckout.xml" hash="c24d4770dec193a19a72834beb1951df"/><file name="newsletter.xml" hash="06e2fa151b7034cd74268684d2050309"/><file name="page.xml" hash="edc6889fc4f4f406b0501b4533b3f455"/><file name="paypal.xml" hash="53eed662b8f4486b6a0064ba480b92e4"/><file name="paypaluk.xml" hash="e1f0523007cc3d4b523b6be24fa4e950"/><file name="poll.xml" hash="3cd2707dc21722104fc344c3d342a4b9"/><file name="productalert.xml" hash="8760bb53020762f38f2b854840017a9b"/><file name="reports.xml" hash="5a5c702eb1447187f08191d1d9a5e03d"/><file name="review.xml" hash="45b1dd918723370021ca91570f1d80eb"/><file name="rss.xml" hash="fcad94b8d76d848a2f4f558db95327b5"/><file name="sales.xml" hash="b325c89f0069ecc6845eeb4bef0f41a1"/><file name="sendfriend.xml" hash="515511b04f660095caed35c617bbab28"/><file name="shipping.xml" hash="89377704115050fe38a219c4abcf7ec6"/><file name="tag.xml" hash="3b13589cc8a8231ce8a73ff3b6eb2c31"/><file name="wishlist.xml" hash="b4cda0f01fc23f3466c7692cc8fb9801"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="793e1ff86039f24caff6fad87a094fa1"/></dir></dir><dir name="template"><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="f0d5c55a57290a885664ea86e133b679"/></dir><dir name="view"><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="c4d2679d1daa39b510b50333e207c5f2"/><file name="multi.phtml" hash="7faa0e1b19d975d3638711aac4deb6d7"/><file name="radio.phtml" hash="e8c90e6e0c780d5e00244a686951d381"/><file name="select.phtml" hash="fa49f7f1ac230ecc2bdab549e7d480d1"/></dir><file name="options.phtml" hash="be546769aaa064f1340eff43e38066d3"/></dir><file name="bundle.phtml" hash="d0e59e1797172c8eb0f257059c43f50b"/></dir><file name="price.phtml" hash="6c605683d7378a507fe603d9ad51c6db"/><file name="tierprices.phtml" hash="87c95796e53d19a9756c8e33df7eacfb"/></dir><file name="price.phtml" hash="976642108f8f04c2a9ff18b22380ea16"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="49302b9caf156c6965452d97980792e7"/></dir><dir name="invoice"><file name="default.phtml" hash="674d00e5c58727107248fc9d90811af5"/></dir><dir name="order"><file name="default.phtml" hash="a505ff115a7bbf1f97073358c1b86f41"/></dir><dir name="shipment"><file name="default.phtml" hash="5d8cf3065959e86c2be887716bce3b6e"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="73fd602c942c0575b9e68a7ce4cb84c5"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="c44050ac6889aefe382af2094808e02f"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="158b7162784376960ad934be11867423"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="308fcef88836ad8a7c7a8c85bdf6662b"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="b06a5468109257496c276e3ab9bfed82"/><file name="right_col.phtml" hash="92ffd86e758ddfe5684916fb33c788ac"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="aadf8b6c6e7657d5987dc4fc8898f81a"/><file name="view.phtml" hash="8794a8ec9fc90efdf0a9284dda88b3d7"/></dir><dir name="layer"><file name="filter.phtml" hash="ad88f40ef09460cc31f3cf3b8b132742"/><file name="state.phtml" hash="493c701dbb66786af9872a6137f5f10f"/><file name="view.phtml" hash="f42d2e546bedbf1d84b1bb8c8ccc1282"/></dir><dir name="navigation"><file name="left.phtml" hash="75bf0af3c058c16568263cf4938ed0d0"/><file name="top.phtml" hash="6a856216d0b08d3bed2b0f360597ace2"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="f71016df7f5cdfd7e915076192bd70ab"/><file name="sidebar.phtml" hash="8b04f65338a8553579cee53c9437854c"/></dir><dir name="list"><file name="related.phtml" hash="29bf56713108dd8feab826ff6b4816de"/><file name="toolbar.phtml" hash="c08d6d828a77c65ffc1b1dce63268aee"/><file name="upsell.phtml" hash="9ac23c3998f86d91341b81d88dd3aa5c"/></dir><dir name="view"><dir name="options"><dir name="type"><file name="date.phtml" hash="6e84105edec52c7ec566713dccefe87d"/><file name="default.phtml" hash="e164beb01b3077fa1bf9a9bbb341ad56"/><file name="file.phtml" hash="805652068a3cd4224e62ab946a1803b1"/><file name="select.phtml" hash="15d350c5944b75b93236c59f1ab70e86"/><file name="text.phtml" hash="5594a2889cd9cb7c7e784446205411ff"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="9be3658960ada4f4c774736829076538"/></dir><file name="wrapper.phtml" hash="c10ed9f230ecc827a1c2f99c9a4b4d46"/></dir><dir name="type"><dir name="options"><file name="configurable.phtml" hash="8eb194d7cef5bf44842c3380cbcd68ad"/></dir><file name="configurable.phtml" hash="9e3f4a6fb16ab3de753dae23796cde11"/><file name="grouped.phtml" hash="6b29550dd2f515dd37f84acf1f05f52b"/><file name="simple.phtml" hash="559ea95ea29fc6024e8abfae88fd90ff"/><file name="virtual.phtml" hash="559ea95ea29fc6024e8abfae88fd90ff"/></dir><file name="additional.phtml" hash="6fc511a523e1b3065765365aa194520a"/><file name="addto.phtml" hash="13630226d178b97229191ca9535c7457"/><file name="addtocart.phtml" hash="cc1091934b28ee93bac4ff7e8dda9d0b"/><file name="attributes.phtml" hash="e346dc81d9222db8f6c4e6415d21e47e"/><file name="description.phtml" hash="7e18c1608cb82f8a8c107e5568438e91"/><file name="media.phtml" hash="d0a403f01bd7c3c891facd490ff74bff"/><file name="options.phtml" hash="a54bcbd166d4a07219aa3f5b6291afe8"/><file name="price.phtml" hash="6ad72e4f21ddeba52027a7faade0e7cd"/><file name="price_clone.phtml" hash="8b72619d07da2aa9c7c11c1017068731"/><file name="tierprices.phtml" hash="d249837bea6a8f73c5e755ea8c46ba52"/></dir><file name="gallery.phtml" hash="dd58f98d6cf094f2cd024f9b4458af1f"/><file name="list.phtml" hash="417c01787b3faa99ed3d76eb27ea21b4"/><file name="new.phtml" hash="fe42f21177ccc9171a2126c8a7b1e232"/><file name="price.phtml" hash="8076a2d7d492f520c12ca1b106e2c820"/><file name="view.phtml" hash="f67cff47d239c34271a82d9e86ad3569"/></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="a952fcb12c6c8cd2f51313fa63dba74c"/></dir><file name="sitemap.phtml" hash="8906683fe0b04d0b3add51dcca7eb01c"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="8f76bb71ccbd15bdd504079427257a47"/><file name="result.phtml" hash="ab507f43a3b2b94239bfddc16e187e72"/></dir><file name="form.mini.phtml" hash="71803ed517beaa1176e42ad9181651bb"/><file name="result.phtml" hash="07470604fb50e5a3b25432f49a206006"/><file name="term.phtml" hash="66ab2560641b0872c3211f3d8f42e33a"/></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="98dd7d120e034edb97d78cc1199cf79e"/></dir><dir name="render"><file name="default.phtml" hash="2671864bbfc5fd95ea3b4a5f25521b2b"/><file name="simple.phtml" hash="cc81d4edfa9865928fd819fe41a8c723"/></dir><dir name="sidebar"><file name="default.phtml" hash="505fc67d7dd278071e9da7880cd5e9a4"/></dir><file name="coupon.phtml" hash="0f47b671f2f28ba2a9b317ca112a7475"/><file name="crosssell.phtml" hash="4f0d9f4b5e0090392c85f43e6afa6998"/><file name="noItems.phtml" hash="03f31b1e9168d12b3ba9dc2f8bd1f760"/><file name="shipping.phtml" hash="4476cd2fdb736eca745768aa68be853e"/><file name="sidebar.phtml" hash="7841d505317e5f6d5e0cde4a2a9f2c6b"/><file name="totals.phtml" hash="01b900fbbd994771ea04ed56c86339ec"/></dir><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="2b3c82fad5fcde0b9d02a141519dde69"/></dir><dir name="billing"><file name="items.phtml" hash="70f639ad42813a3da7cd32456d3a2845"/></dir><dir name="item"><file name="default.phtml" hash="bf3ff3612005dbd7dff5b538673a3db6"/></dir><file name="addresses.phtml" hash="44b2fdf4f089569d5039281962530547"/><file name="agreements.phtml" hash="0cc2c61890723b3c810f4165b0b6ea8e"/><file name="billing.phtml" hash="7c954ad06f44be1f00848ed6f92bc796"/><file name="link.phtml" hash="c4225a9a1bbd9f177199119209469b11"/><file name="overview.phtml" hash="a8b33ed09889c8bc5b5f8f85d2784b3b"/><file name="shipping.phtml" hash="9df79109f2a26934a5266a4cdcf3e253"/><file name="state.phtml" hash="a82cbe78e6abfa201db2c2af4063aa94"/><file name="success.phtml" hash="fd20be783d9db805c8a22d21b5af857e"/></dir><dir name="onepage"><dir name="payment"><file name="methods.phtml" hash="513839214b355ac6f1ec879230459d05"/></dir><dir name="review"><file name="info.phtml" hash="ed0b1dca61696cd7244c414ee7875b23"/><file name="item.phtml" hash="5007ab6d1977c1ead2fb050acd4e94ab"/><file name="totals.phtml" hash="63fb070ddef121951ed09f78641b17a4"/></dir><dir name="shipping_method"><file name="additional.phtml" hash="1f8a9204df1f5854c76ab9e729f1e191"/><file name="available.phtml" hash="b3794aa3ea6c16633292390b5e5100f0"/></dir><file name="agreements.phtml" hash="0527bfb427c60aa956791bcfc3aa2baa"/><file name="billing.phtml" hash="4b60d7366d70cc7256dde0205ec6fc81"/><file name="failure.phtml" hash="5c6c4a68a56edbe050f084e441231f69"/><file name="link.phtml" hash="3ee2e026b7ca9f052db065b35ef6fcd7"/><file name="login.phtml" hash="8815aa7c39bc7133941f327dbfe64af2"/><file name="payment.phtml" hash="a4bbb98233c87128a91573e93f29fcf9"/><file name="progress.phtml" hash="513b67ef8c08e71bb192c2f811664476"/><file name="review.phtml" hash="495f48bcc50ab3abd0efac683f4be4e1"/><file name="shipping.phtml" hash="66f34e6de976356c9e68e75967fc9b05"/><file name="shipping_method.phtml" hash="5f3d0140324ad1dca3901d14d0531277"/></dir><dir name="total"><file name="default.phtml" hash="4a680113802974e087a73b572129a11b"/><file name="tax.phtml" hash="c73da69829e5eb8629e02bb85c01fd1e"/></dir><file name="cart.phtml" hash="c77bbb58780661aa0cd8eee498d00dd8"/><file name="links.phtml" hash="affc0973c249464f98d6592ce4a52538"/><file name="onepage.phtml" hash="2ee5d54e33dfacb4f1cdd58ea12e12c1"/><file name="success.phtml" hash="65a36ed00abc941d129c47b7af164727"/></dir><dir name="cms"><dir name="default"><file name="home.phtml" hash="cae87e8ece9b2cf11d56f58f78b61354"/><file name="no-route.phtml" hash="a82130a7e80d0f544fe904b1b8795a1b"/></dir><file name="content.phtml" hash="5bc7aa683ad79c7a422478c6cc67a963"/><file name="meta.phtml" hash="73c1b59cdc8e7ec40d294f3ac755005c"/></dir><dir name="contacts"><file name="form.phtml" hash="16bc2d5f4a9501de250f0f74f3623f74"/></dir><dir name="core"><file name="messages.phtml" hash="31f0e7850e552a1e67d8d99a5c0fbe1b"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="2a9ec75a331b2411809154b99bb7020e"/><file name="hello.phtml" hash="a3870656761e58365a6f19e105d340ec"/><file name="info.phtml" hash="737b388782a4ca8b58d9295fbed7f16b"/><file name="newsletter.phtml" hash="22d34e6401ff61b26e48de0a7052bbd1"/><file name="sidebar.phtml" hash="affc0973c249464f98d6592ce4a52538"/></dir><dir name="link"><file name="back.phtml" hash="c0a1831d7f2926c3499fb9bbc2d519d5"/></dir><file name="dashboard.phtml" hash="116bef22699a11e2433fbc44ccdb87f7"/><file name="navigation.phtml" hash="d222e216465d2ede7f87f3dadb2dee37"/></dir><dir name="address"><file name="book.phtml" hash="b31cf726c0ceecdbcb414531fb4bac03"/><file name="edit.phtml" hash="ee9c515c4aa9d2d441ee959967b95e1a"/></dir><dir name="form"><file name="address.phtml" hash="66b0424e82ee7fedfac77eb5f1c07f15"/><file name="changepassword.phtml" hash="240dab89dc88f285cded4a64f38edb4a"/><file name="confirmation.phtml" hash="d0c81d2896cc570de2d4cd42611e73a8"/><file name="edit.phtml" hash="692479b7148859102f3981e8fdf3cce3"/><file name="forgotpassword.phtml" hash="a19e766fa6c2dc06b835da1eb00dfafc"/><file name="login.phtml" hash="adac97d2b418438e4c31a42ced0e8a48"/><file name="mini.login.phtml" hash="24d09a1d4ec2023f3767e91211545243"/><file name="newsletter.phtml" hash="89fa9aa14359fbb22baa940b45f48fd0"/><file name="register.phtml" hash="ea8ae3d332371f8cb06f2cc321ff4e35"/></dir><dir name="order"><file name="view.phtml" hash="1a01a49bb7b8c2c8e2f12f063056c826"/></dir><dir name="widget"><file name="dob.phtml" hash="df77fc6c2b2139dcd69249a32bac6367"/><file name="name.phtml" hash="b5782a6dca0e72a13b9c3ed9cb2159a0"/><file name="taxvat.phtml" hash="90f20cd2d8090ce8a37736caec07e503"/></dir><file name="address.phtml" hash="6b75ebcc1ec2586db731045d4161890a"/><file name="balance.phtml" hash="da9f8fa46d12a3dc7277dc6cf1fa4a13"/><file name="logout.phtml" hash="5dcd8e145f634fbd7d27b515d8b7582d"/><file name="orders.phtml" hash="fef7ae48cec30b6e27af3238bdb4a3a4"/><file name="wishlist.phtml" hash="57c44f1197bed317ab0f70e81ea6bd95"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="4670eb2ba16f1ddaa350d2edb74ce0eb"/></dir><file name="currency.phtml" hash="f7a5c9e12e46c6d1c084cc2260a2e246"/></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="cfe5211ef1d5c0785ca92065f4b88186"/></dir><dir name="invoice"><file name="items.phtml" hash="4e245ebd1d0005e011c67c000849f5c0"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="383c65275ccae0549b311aa00a56c91f"/></dir><dir name="invoice"><file name="default.phtml" hash="383c65275ccae0549b311aa00a56c91f"/></dir><dir name="order"><file name="default.phtml" hash="38224647ead525ed1754be37c695f8f6"/></dir><dir name="shipment"><file name="default.phtml" hash="40dab7ab90f7514acfe3e1d4ab408e60"/></dir></dir><dir name="shipment"><file name="items.phtml" hash="e38d0caba217e50d86320f49ad86b8da"/><file name="track.phtml" hash="e9810f489eda94dd7584444ee033fb59"/></dir><file name="items.phtml" hash="362c381e40ecdda30cba5300e339e896"/></dir><dir name="productalert"><file name="price.phtml" hash="b0e82922f05837ee68f29695483f4e81"/><file name="stock.phtml" hash="e1c6a78ca40ddd2fc87b714a64d64fd8"/></dir></dir><dir name="giftmessage"><file name="form.phtml" hash="2189441f6329cd1c7522bb3e467cd059"/><file name="helper.phtml" hash="ae0f4b7d8bfab3aba1e933a2001d1247"/><file name="inline.phtml" hash="4e6c8579f7797fa40957898f5c4269a0"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="47f80f80bc586a135d168e5cc12a372a"/><file name="link.phtml" hash="7f396ea577365a339e043916278f9bd5"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="e5836ac3bbd2bc710fec7477ff38276f"/></dir><dir name="page"><dir name="html"><file name="breadcrumbs.phtml" hash="bf72bc34af13a8a488ec0cef023e4b27"/><file name="footer.phtml" hash="ea657e715fc3f4fd17b6d46af8d2671b"/><file name="head.phtml" hash="f6105310b29d147f709cffe138cff9bb"/><file name="header.phtml" hash="b947b5b8c3c5bf3c68b7feb2a4697340"/><file name="pager.phtml" hash="37945676a2c4f93a1c9c7511e9e525f6"/><file name="top.links.phtml" hash="8599292fc6f27cdda2cf4dc8eb2e6d09"/><file name="wrapper.phtml" hash="a527f8b78162d1ccf89bf9c2b6d58e62"/></dir><dir name="switch"><file name="flags.phtml" hash="f7cee579500a0dde7ffa8f8ac6a069e8"/><file name="languages.phtml" hash="74bc530b7a284333c6dbfb63c233fa1b"/><file name="stores.phtml" hash="687bff8b05ac6b17f242a10479169df8"/></dir><dir name="template"><file name="container.phtml" hash="48a40301b0a26dbdd0de0f91d5adcc4d"/><file name="links.phtml" hash="9af7db5636ddd7faf2eed94cec40c1e9"/></dir><file name="1column.phtml" hash="f2aae419e58d98edc3b80bdd14829c27"/><file name="2columns-left.phtml" hash="87f05d9d7562b921a3affbd1a715c4ea"/><file name="2columns-right.phtml" hash="c8b57c6dcf0eee72bd66ae40a00ddcd3"/><file name="3columns.phtml" hash="4ff7095128b3237c87035151d7d9c787"/><file name="popup.phtml" hash="a4e73e22b8ec51b3aea5a8303bb3b250"/><file name="print.phtml" hash="53837eaccfcc0a83e54da945e07f125f"/><file name="redirect.phtml" hash="0711eff223361681d2d12b2061f42cb1"/></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="e2212577c2c9c28e00c66a1908d46fb3"/><file name="ccsave.phtml" hash="07ff3a0a20f00e31b5443800ebacb7f1"/><file name="checkmo.phtml" hash="395800ebbbd31f85c5c19f211f804c09"/><file name="purchaseorder.phtml" hash="63c6fb59568ad1f8a7170c231e947785"/></dir><dir name="info"><file name="cc.phtml" hash="3b58308f891f7456accfaef2cdbf4e3c"/><file name="ccsave.phtml" hash="f13dccb79ee937279722e34db2d75150"/><file name="checkmo.phtml" hash="68c1345716d154c63d6089c94d0e1c5d"/><file name="default.phtml" hash="5b12a176647450847712b5ddb5b7c1cb"/><file name="purchaseorder.phtml" hash="a258df940fb85b0dbd41221934cbee40"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="details.phtml" hash="742e51a7be0820096672d8ad9efc4bb2"/></dir><file name="form.phtml" hash="dacfbd1a1d0a82b9d2e6bc2ecf88ab00"/><file name="info.phtml" hash="e5055353ca8855207dbd981208ee3e66"/><file name="review.phtml" hash="b5795cd1c401d7aa3968a3b7009781ca"/></dir><dir name="standard"><file name="form.phtml" hash="99832274cde55a2c9999d89d38dd8c88"/></dir><file name="link.phtml" hash="a58135aa8c3451f479d0c5e1ce86d01b"/></dir><dir name="paypaluk"><dir name="direct"><file name="form.phtml" hash="df5728a0068b15ec6c56323b4f893b4e"/><file name="info.phtml" hash="91705c0d3cb8cb336aee5a24e57a93c9"/></dir><dir name="express"><dir name="review"><file name="details.phtml" hash="c8ccfb9c1eb05d86a10dc449f678e78c"/></dir><file name="form.phtml" hash="3ab14fedc24e6200b21ce5376cc34037"/><file name="info.phtml" hash="e5055353ca8855207dbd981208ee3e66"/><file name="review.phtml" hash="750608c895d5b302f9db119ff1f7aae3"/></dir><file name="link.phtml" hash="10a1748caabeecddf45b0792e770453b"/></dir><dir name="poll"><file name="active.phtml" hash="1779dac29251a5c782acf743bfddeeb1"/><file name="result.phtml" hash="72f240de2738a6245e1f2358bd372bfd"/></dir><dir name="productalert"><file name="price.phtml" hash="fbf4d4bd39aba47214e5517841300f9a"/><file name="stock.phtml" hash="c71de1c94128176d10de171743505525"/></dir><dir name="rating"><file name="detailed.phtml" hash="f805bcd92a7fda64a099928a812541bc"/><file name="empty.phtml" hash="5b8bb08fb214c543dfe26ff202891c7e"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="421dc0f3bfe7f0885c80560ce953cc50"/><file name="home_product_viewed.phtml" hash="81e52257f6a37ddd8c4a191c235b2bd5"/><file name="product_compared.phtml" hash="46f95495f89b745532386ca5f9cf392e"/><file name="product_viewed.phtml" hash="935074d1fc7041908e453537a23fa893"/></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="50996dd1969c2b09c328e39c7a97cd42"/><file name="recent.phtml" hash="07eb31712f2baf612e094dc9fed6bafa"/><file name="view.phtml" hash="ac2a40f8298e2a63a880d155196b8190"/></dir><dir name="helper"><file name="summary.phtml" hash="b2b0ba9cd00e13e32dd76efb02100d0f"/><file name="summary_short.phtml" hash="22dc079532ce1407c7c1f83f92e32aef"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="f5c8e159786a1e2486c4dac8dfb66e1e"/><file name="list.phtml" hash="07059ba73bf0540c04d4e1a12ab5df20"/><file name="other.phtml" hash="ff7173288f722adad334cd3b1a9f588f"/></dir></dir><file name="form.phtml" hash="300d77db884521c3404ea3c87a161cb5"/><file name="view.phtml" hash="4af924813e6a0170c72ff0dd0b385f73"/></dir><dir name="rss"><dir name="order"><file name="details.phtml" hash="b5d5a99587a8545bdb9c6a0d70a042d3"/></dir><file name="list.phtml" hash="0fbdeef4328ce1f95445add0d8544387"/><file name="nofeed.phtml" hash="76502bd485ec3713e10802eba65d4e58"/></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="9af91782529eb2049157417e3de30250"/></dir></dir><file name="items.phtml" hash="265a5b99ea0ddce705664b3ff7273065"/></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="5a688481010edd6edcebaf81508e7b5a"/></dir></dir><file name="items.phtml" hash="26d2bfb70592ea816c6c4ef22004fcaf"/></dir><dir name="items"><dir name="renderer"><file name="default.phtml" hash="2ac5d661024b267ad92434224b4f31c7"/></dir></dir><dir name="print"><file name="creditmemo.phtml" hash="a25cd04a4250c57f61b00ec9588ec0af"/><file name="invoice.phtml" hash="e24161137cd90d6d5a3371553e0e9023"/><file name="shipment.phtml" hash="bc8d28f761e0fdbf5b9fb8c516595439"/><file name="tax.phtml" hash="05a58d692ece2235dcfac5b3ff52d835"/></dir><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="638f8f565efa05b7d26738f1994a1fa5"/></dir></dir><file name="items.phtml" hash="e4dd2210be4241543cee82e1b440ebc1"/></dir><file name="creditmemo.phtml" hash="8d13ffb5de2e98c02e22d6a55f498a29"/><file name="details.phtml" hash="e7cad4cdf7f1ff69473161ed11585d3c"/><file name="history.phtml" hash="a87edd981e6a0451181139cd2bf45b98"/><file name="info.phtml" hash="97ed7ec4d4032bbb19cc1ddd0447feed"/><file name="invoice.phtml" hash="d26a29413f8574543b11a0775f2ac46d"/><file name="items.phtml" hash="6f14ea4daf34822ca7d70d51bf87c653"/><file name="print.phtml" hash="6bd000e5429a241354f1be38da5342e9"/><file name="recent.phtml" hash="33733728c39ad12a7e9ef0ede33d3a07"/><file name="shipment.phtml" hash="3c451556d2205e02489094a2dcfee65e"/><file name="tax.phtml" hash="d5921bc0ffac01f15bbf826d09f10d1f"/><file name="trackinginfo.phtml" hash="1c680d4542402f269b4c635804a04f77"/><file name="view.phtml" hash="370773c9384b0d954670bca11aaf60a5"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="8ccb45b3745e12d010400d3e287fd6cc"/></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="fc8f0cdd4573346b9119356291641d56"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="affc0973c249464f98d6592ce4a52538"/><file name="popup.phtml" hash="d7507d379f524345a38b530c885263ac"/></dir></dir><dir name="tag"><dir name="customer"><file name="edit.phtml" hash="10e61541877d0f82188bbdcd60ad85e4"/><file name="recent.phtml" hash="edd2e285ce655539e067644013b5094f"/><file name="tags.phtml" hash="1d3551b3f3713dbc6d32ba205fdc2c51"/><file name="view.phtml" hash="aa64c5d4b4551d9f2f0bd7faf7c416ac"/></dir><dir name="product"><file name="result.phtml" hash="d8ef80c71effcde769732397b961a03a"/></dir><file name="cloud.phtml" hash="dfb3592054b773c08a522091cf5de233"/><file name="list.phtml" hash="9c63e292af3e051edb0a961e846d36cc"/><file name="mytags.phtml" hash="b6efff2bc3bb2139a4057f8c1eb989f4"/><file name="popular.phtml" hash="41aa202199f6f0ca648e16076484bfbf"/><file name="result.phtml" hash="dea62fd62de4c403f93334d361ec19ec"/><file name="search.phtml" hash="6222566c51093557e1de7c363dd8169f"/></dir><dir name="wishlist"><dir name="email"><file name="items.phtml" hash="546c2d345323aaebe27a23d5c838a3e2"/><file name="rss.phtml" hash="fe00d171bdd383f4fbf97bf1de054a41"/></dir><file name="shared.phtml" hash="83dfab61444198fe1c7c0fca357865dc"/><file name="sharing.phtml" hash="9d66b58b3a5b29931ee8e9d129a9c323"/><file name="sidebar.phtml" hash="7100232fc784ccb848634d26fb356b5f"/><file name="view.phtml" hash="25443c66eee90544effe050fc152f483"/></dir></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
-
<dependencies><required><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Interface_Frontend_Blank</name>
|
| 4 |
+
<version>1.2.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/afl-3.0.php">AFL 3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>A clean simplistic design interface that can be easily customized by professional designers</summary>
|
| 10 |
<description>A clean simplistic design interface that can be easily customized by professional designers</description>
|
| 11 |
+
<notes>1.2.0</notes>
|
| 12 |
<authors><author><name>Magento Core Team</name><user>auto-converted</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
+
<date>2008-12-30</date>
|
| 14 |
+
<time>04:34:19</time>
|
| 15 |
+
<contents><target name="mageskin"><dir name="frontend"><dir name="blank"><dir name="default"><dir name="css"><file name="clears.css" hash="3d33e824e9fe88915a0f9f1e7f9c147d"/><file name="print.css" hash="1839347706087be0a9c2e3088e5f2f1d"/><file name="reset.css" hash="22db9066e96542f5895a31cca4a21269"/><file name="styles-ie.css" hash="e2039b3791e140d53320fb90ddce661f"/><file name="styles.css" hash="67d75fbec01b329b9d6ec2d173821a1c"/></dir><dir name="images"><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="media"><file name="404_callout1.jpg" hash="834e53a03e2921a2fd3c135c0c7189df"/><file name="404_callout2.jpg" hash="016984b4a1579df34147f9407098db73"/><file name="about_us_img.jpg" hash="726f36dd75b5a709a1a14acab1660188"/><file name="col_left_callout.jpg" hash="5f762006021e046f9bd536f37ea7c463"/><file name="col_right_callout.jpg" hash="dae22f37a542da272a35195ec286ec25"/></dir><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_rating.gif" hash="0a8777c815350ddf1e316a537ad0c335"/><file name="btn_google_checkout.gif" hash="843d75249ce05b5d87ca5419f37b1c3b"/><file name="btn_paypal_checkout.gif" hash="6edd61270b7b5632eafad10557129114"/><file name="btn_trash.gif" hash="bcb22f558a0eb32243a2a36645189e9f"/><file name="btn_window_close.gif" hash="c83f3cbbb2aedfc580dff78d5cfb63ed"/><file name="cvv.gif" hash="ed0f392004a405466291071a760b285d"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="icon_big_rss.png" hash="6cf70e7c52a3f3d7b833ccadb041a555"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_rss.gif" hash="e5bbc388d818c142868b4a1df0b48793"/><file name="list_remove_btn.gif" hash="6182e723aa2a253dc6cf334a3dfaaa84"/><file name="logo.gif" hash="6c1c8318d7dd57cc674f2f3cddf04344"/><file name="logo_email.gif" hash="3901817e7bdd9456699f7a267078f2ff"/><file name="logo_print.gif" hash="3901817e7bdd9456699f7a267078f2ff"/><file name="magnifier_handle.gif" hash="238fbdd7959f517db11c6f57ee4daaf4"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="pager_arrow_left.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="pager_arrow_right.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="slider_bg.gif" hash="87bc1b46d87de4f6252c7216216627c3"/><file name="slider_btn_zoom_in.gif" hash="ef0fc67f77f30827ee67f4e744b60781"/><file name="slider_btn_zoom_out.gif" hash="68b3d1c28dc5aec4f6b64d70a6996b6f"/><file name="sort_asc_arrow.gif" hash="40aa554212d6a1f60593c27d78d85fa3"/><file name="sort_desc_arrow.gif" hash="92fd194bfae4ce5ae3354e1e47d7ac7d"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir><dir name="js"><file name="bundle.js" hash="7fb06ec966f79c0488198975a69c6c0b"/><file name="giftmessage.js" hash="98f056ae92e10813f0d550daae6dd944"/><file name="opcheckout.js" hash="88c8105c1a196534fdb5ebc7f216cb8c"/><file name="paypal.js" hash="4793d611370033c7daec147f135672b5"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="blank"><dir name="default"><dir name="layout"><file name="bundle.xml" hash="4f03691d578996e5241629877fb28b99"/><file name="catalog.xml" hash="359d90f692b67b46736c702be63c3506"/><file name="catalogsearch.xml" hash="b21a5126f8cff8c4da6c853c8163f769"/><file name="checkout.xml" hash="ee2b9f38a9dcc0d971a9204bce49cc36"/><file name="cms.xml" hash="9a4eb9fa95b1e217ab30a654e7423821"/><file name="contacts.xml" hash="e3e3eb3dcf2c276fa11d66722a0a1c62"/><file name="core.xml" hash="99c290a45fc882985b55279180d6a491"/><file name="customer.xml" hash="a180537185e2e90d25f3e7efa7298b35"/><file name="directory.xml" hash="eb1bb63ef64fc8283a69f13fd3f90005"/><file name="downloadable.xml" hash="a4bb31c7d838e10893fe2a54a7636592"/><file name="giftmessage.xml" hash="d91f058897e4ae05938b44960a87a7c0"/><file name="googleanalytics.xml" hash="72fd608e307339080bc2b0e28762644d"/><file name="googlecheckout.xml" hash="c24d4770dec193a19a72834beb1951df"/><file name="googleoptimizer.xml" hash="c8b25d432c8d2d1892834af7a3f35667"/><file name="newsletter.xml" hash="06e2fa151b7034cd74268684d2050309"/><file name="page.xml" hash="edc6889fc4f4f406b0501b4533b3f455"/><file name="paypal.xml" hash="53eed662b8f4486b6a0064ba480b92e4"/><file name="paypaluk.xml" hash="e1f0523007cc3d4b523b6be24fa4e950"/><file name="poll.xml" hash="3cd2707dc21722104fc344c3d342a4b9"/><file name="productalert.xml" hash="8760bb53020762f38f2b854840017a9b"/><file name="reports.xml" hash="5a5c702eb1447187f08191d1d9a5e03d"/><file name="review.xml" hash="45b1dd918723370021ca91570f1d80eb"/><file name="rss.xml" hash="fcad94b8d76d848a2f4f558db95327b5"/><file name="sales.xml" hash="b325c89f0069ecc6845eeb4bef0f41a1"/><file name="sendfriend.xml" hash="515511b04f660095caed35c617bbab28"/><file name="shipping.xml" hash="89377704115050fe38a219c4abcf7ec6"/><file name="tag.xml" hash="3b13589cc8a8231ce8a73ff3b6eb2c31"/><file name="wishlist.xml" hash="b4cda0f01fc23f3466c7692cc8fb9801"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="793e1ff86039f24caff6fad87a094fa1"/></dir></dir><dir name="template"><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="f0d5c55a57290a885664ea86e133b679"/></dir><dir name="view"><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="c4d2679d1daa39b510b50333e207c5f2"/><file name="multi.phtml" hash="7faa0e1b19d975d3638711aac4deb6d7"/><file name="radio.phtml" hash="0fe4a1916cd43b89f5e0681b2a095af9"/><file name="select.phtml" hash="cc85f0bccd13e65e65db247913e74382"/></dir><file name="options.phtml" hash="be546769aaa064f1340eff43e38066d3"/></dir><file name="bundle.phtml" hash="d0e59e1797172c8eb0f257059c43f50b"/></dir><file name="price.phtml" hash="5d61ae7dde0a2334c1e67c42412e03a9"/><file name="tierprices.phtml" hash="87c95796e53d19a9756c8e33df7eacfb"/></dir><file name="price.phtml" hash="e8a4ed53bcf630bf1fbc5dfdb8c4cac1"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="4144bdfa26bc8c6bfef2b415c047b97d"/></dir><dir name="invoice"><file name="default.phtml" hash="ef20fe460ac338cf1716f36ca3b3281b"/></dir><dir name="order"><file name="default.phtml" hash="f0927ef4c5ad576690523804f086ba39"/></dir><dir name="shipment"><file name="default.phtml" hash="5d8cf3065959e86c2be887716bce3b6e"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="371c5b21820208ca436b7b0896251cb0"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="fc83ec6b4d194be4ca1a00d5d7ef3907"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="34b094f32fc1a7c8b238ab20a7300c9a"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="308fcef88836ad8a7c7a8c85bdf6662b"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="da32aafba925f37aeab347e4f93b1403"/><file name="right_col.phtml" hash="14e517ae3aeb65a1a5861dbb6aa81c1b"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="aadf8b6c6e7657d5987dc4fc8898f81a"/><file name="view.phtml" hash="68897ae0f611b891d1dd20dfb10a1630"/></dir><dir name="layer"><file name="filter.phtml" hash="ad88f40ef09460cc31f3cf3b8b132742"/><file name="state.phtml" hash="493c701dbb66786af9872a6137f5f10f"/><file name="view.phtml" hash="f42d2e546bedbf1d84b1bb8c8ccc1282"/></dir><dir name="navigation"><file name="left.phtml" hash="75bf0af3c058c16568263cf4938ed0d0"/><file name="top.phtml" hash="6a856216d0b08d3bed2b0f360597ace2"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="f71016df7f5cdfd7e915076192bd70ab"/><file name="sidebar.phtml" hash="8b04f65338a8553579cee53c9437854c"/></dir><dir name="list"><file name="related.phtml" hash="29bf56713108dd8feab826ff6b4816de"/><file name="toolbar.phtml" hash="c08d6d828a77c65ffc1b1dce63268aee"/><file name="upsell.phtml" hash="9ac23c3998f86d91341b81d88dd3aa5c"/></dir><dir name="view"><dir name="options"><dir name="type"><file name="date.phtml" hash="6e84105edec52c7ec566713dccefe87d"/><file name="default.phtml" hash="e164beb01b3077fa1bf9a9bbb341ad56"/><file name="file.phtml" hash="805652068a3cd4224e62ab946a1803b1"/><file name="select.phtml" hash="15d350c5944b75b93236c59f1ab70e86"/><file name="text.phtml" hash="5594a2889cd9cb7c7e784446205411ff"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="9be3658960ada4f4c774736829076538"/></dir><file name="wrapper.phtml" hash="c10ed9f230ecc827a1c2f99c9a4b4d46"/></dir><dir name="type"><dir name="options"><file name="configurable.phtml" hash="8eb194d7cef5bf44842c3380cbcd68ad"/></dir><file name="configurable.phtml" hash="9e3f4a6fb16ab3de753dae23796cde11"/><file name="grouped.phtml" hash="6b29550dd2f515dd37f84acf1f05f52b"/><file name="simple.phtml" hash="559ea95ea29fc6024e8abfae88fd90ff"/><file name="virtual.phtml" hash="559ea95ea29fc6024e8abfae88fd90ff"/></dir><file name="additional.phtml" hash="6fc511a523e1b3065765365aa194520a"/><file name="addto.phtml" hash="13630226d178b97229191ca9535c7457"/><file name="addtocart.phtml" hash="cc1091934b28ee93bac4ff7e8dda9d0b"/><file name="attributes.phtml" hash="e346dc81d9222db8f6c4e6415d21e47e"/><file name="description.phtml" hash="7e18c1608cb82f8a8c107e5568438e91"/><file name="media.phtml" hash="a7d10d0a7e3232d29fce64276c1d454b"/><file name="options.phtml" hash="a54bcbd166d4a07219aa3f5b6291afe8"/><file name="price.phtml" hash="6ad72e4f21ddeba52027a7faade0e7cd"/><file name="price_clone.phtml" hash="8b72619d07da2aa9c7c11c1017068731"/><file name="tierprices.phtml" hash="3ac2d5f5338c97a67f2e7a81e741295e"/></dir><file name="gallery.phtml" hash="dd58f98d6cf094f2cd024f9b4458af1f"/><file name="list.phtml" hash="271c7c8ad0d01d1299c8a65c1faea818"/><file name="new.phtml" hash="fe42f21177ccc9171a2126c8a7b1e232"/><file name="price.phtml" hash="a22ab6e67861dd45ed81759874595e84"/><file name="view.phtml" hash="f67cff47d239c34271a82d9e86ad3569"/></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="a952fcb12c6c8cd2f51313fa63dba74c"/></dir><file name="sitemap.phtml" hash="8906683fe0b04d0b3add51dcca7eb01c"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="8076150501f5051b8876212539e10f1f"/><file name="result.phtml" hash="ab507f43a3b2b94239bfddc16e187e72"/></dir><file name="form.mini.phtml" hash="71803ed517beaa1176e42ad9181651bb"/><file name="result.phtml" hash="07470604fb50e5a3b25432f49a206006"/><file name="term.phtml" hash="66ab2560641b0872c3211f3d8f42e33a"/></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="4f8c87c35dd871765b92d6042484b562"/></dir><dir name="render"><file name="default.phtml" hash="2671864bbfc5fd95ea3b4a5f25521b2b"/><file name="simple.phtml" hash="cc81d4edfa9865928fd819fe41a8c723"/></dir><dir name="sidebar"><file name="default.phtml" hash="f1cc0dde7d77bbe871af648c73449aab"/></dir><file name="coupon.phtml" hash="0f47b671f2f28ba2a9b317ca112a7475"/><file name="crosssell.phtml" hash="4f0d9f4b5e0090392c85f43e6afa6998"/><file name="noItems.phtml" hash="03f31b1e9168d12b3ba9dc2f8bd1f760"/><file name="shipping.phtml" hash="4476cd2fdb736eca745768aa68be853e"/><file name="sidebar.phtml" hash="7841d505317e5f6d5e0cde4a2a9f2c6b"/><file name="totals.phtml" hash="01b900fbbd994771ea04ed56c86339ec"/></dir><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="2b3c82fad5fcde0b9d02a141519dde69"/></dir><dir name="billing"><file name="items.phtml" hash="70f639ad42813a3da7cd32456d3a2845"/></dir><dir name="item"><file name="default.phtml" hash="bf3ff3612005dbd7dff5b538673a3db6"/></dir><file name="addresses.phtml" hash="44b2fdf4f089569d5039281962530547"/><file name="agreements.phtml" hash="0cc2c61890723b3c810f4165b0b6ea8e"/><file name="billing.phtml" hash="5ebdb4919e56eb58073f8d070b48fc6a"/><file name="link.phtml" hash="c4225a9a1bbd9f177199119209469b11"/><file name="overview.phtml" hash="efed56ad7b22899afb3f8bbaabf4cbe8"/><file name="shipping.phtml" hash="396208d67285f2fdc1e052cefa20379c"/><file name="state.phtml" hash="a82cbe78e6abfa201db2c2af4063aa94"/><file name="success.phtml" hash="176224e9774b28520d8b7e07d22db6ba"/></dir><dir name="onepage"><dir name="payment"><file name="methods.phtml" hash="513839214b355ac6f1ec879230459d05"/></dir><dir name="review"><file name="info.phtml" hash="ed0b1dca61696cd7244c414ee7875b23"/><file name="item.phtml" hash="f5f3ee3ad4430d94b09d5243875ae197"/><file name="totals.phtml" hash="63fb070ddef121951ed09f78641b17a4"/></dir><dir name="shipping_method"><file name="additional.phtml" hash="1f8a9204df1f5854c76ab9e729f1e191"/><file name="available.phtml" hash="b3794aa3ea6c16633292390b5e5100f0"/></dir><file name="agreements.phtml" hash="0527bfb427c60aa956791bcfc3aa2baa"/><file name="billing.phtml" hash="5207f18b54ed643ddcdbe96bee74466e"/><file name="failure.phtml" hash="5c6c4a68a56edbe050f084e441231f69"/><file name="link.phtml" hash="3ee2e026b7ca9f052db065b35ef6fcd7"/><file name="login.phtml" hash="8815aa7c39bc7133941f327dbfe64af2"/><file name="payment.phtml" hash="a4bbb98233c87128a91573e93f29fcf9"/><file name="progress.phtml" hash="44f9aed669a32f4edcff52760d283a6d"/><file name="review.phtml" hash="495f48bcc50ab3abd0efac683f4be4e1"/><file name="shipping.phtml" hash="66f34e6de976356c9e68e75967fc9b05"/><file name="shipping_method.phtml" hash="5f3d0140324ad1dca3901d14d0531277"/></dir><dir name="total"><file name="default.phtml" hash="4a680113802974e087a73b572129a11b"/><file name="tax.phtml" hash="445fd8fd4d463610f33014596a0871ba"/></dir><file name="cart.phtml" hash="c77bbb58780661aa0cd8eee498d00dd8"/><file name="links.phtml" hash="affc0973c249464f98d6592ce4a52538"/><file name="onepage.phtml" hash="2ee5d54e33dfacb4f1cdd58ea12e12c1"/><file name="success.phtml" hash="dac0fd8f84f2607379eff82da2c8fb5c"/></dir><dir name="cms"><dir name="default"><file name="home.phtml" hash="cae87e8ece9b2cf11d56f58f78b61354"/><file name="no-route.phtml" hash="a82130a7e80d0f544fe904b1b8795a1b"/></dir><file name="content.phtml" hash="5bc7aa683ad79c7a422478c6cc67a963"/><file name="meta.phtml" hash="73c1b59cdc8e7ec40d294f3ac755005c"/></dir><dir name="contacts"><file name="form.phtml" hash="a48b4c5517e3ae407c9ceb89c24e249d"/></dir><dir name="core"><file name="formkey.phtml" hash="6f59eb9cc856f4f5b3ee30756300e2a6"/><file name="messages.phtml" hash="31f0e7850e552a1e67d8d99a5c0fbe1b"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="2a9ec75a331b2411809154b99bb7020e"/><file name="hello.phtml" hash="a3870656761e58365a6f19e105d340ec"/><file name="info.phtml" hash="737b388782a4ca8b58d9295fbed7f16b"/><file name="newsletter.phtml" hash="22d34e6401ff61b26e48de0a7052bbd1"/><file name="sidebar.phtml" hash="affc0973c249464f98d6592ce4a52538"/></dir><dir name="link"><file name="back.phtml" hash="c0a1831d7f2926c3499fb9bbc2d519d5"/></dir><file name="dashboard.phtml" hash="116bef22699a11e2433fbc44ccdb87f7"/><file name="navigation.phtml" hash="d222e216465d2ede7f87f3dadb2dee37"/></dir><dir name="address"><file name="book.phtml" hash="b31cf726c0ceecdbcb414531fb4bac03"/><file name="edit.phtml" hash="438d701bf22fda1e97ce01d07fb5cd65"/></dir><dir name="form"><file name="address.phtml" hash="c8644adb22b0c3d96ae2e4d3c5302e5f"/><file name="changepassword.phtml" hash="240dab89dc88f285cded4a64f38edb4a"/><file name="confirmation.phtml" hash="d0c81d2896cc570de2d4cd42611e73a8"/><file name="edit.phtml" hash="6fd41257904a0e2cb595f9de5c1b1283"/><file name="forgotpassword.phtml" hash="a19e766fa6c2dc06b835da1eb00dfafc"/><file name="login.phtml" hash="adac97d2b418438e4c31a42ced0e8a48"/><file name="mini.login.phtml" hash="24d09a1d4ec2023f3767e91211545243"/><file name="newsletter.phtml" hash="0bafe0aceda804f9da5898abc449c108"/><file name="register.phtml" hash="1cdabd071a5c7c7bf8905ec4b116141d"/></dir><dir name="order"><file name="view.phtml" hash="1a01a49bb7b8c2c8e2f12f063056c826"/></dir><dir name="widget"><file name="dob.phtml" hash="a19c80a0826d867a1676df68dfd759eb"/><file name="name.phtml" hash="b5782a6dca0e72a13b9c3ed9cb2159a0"/><file name="taxvat.phtml" hash="90f20cd2d8090ce8a37736caec07e503"/></dir><file name="address.phtml" hash="6b75ebcc1ec2586db731045d4161890a"/><file name="balance.phtml" hash="da9f8fa46d12a3dc7277dc6cf1fa4a13"/><file name="logout.phtml" hash="5dcd8e145f634fbd7d27b515d8b7582d"/><file name="orders.phtml" hash="fef7ae48cec30b6e27af3238bdb4a3a4"/><file name="wishlist.phtml" hash="57c44f1197bed317ab0f70e81ea6bd95"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="4670eb2ba16f1ddaa350d2edb74ce0eb"/></dir><file name="currency.phtml" hash="f7a5c9e12e46c6d1c084cc2260a2e246"/></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="c68f23d2152101396cc8f0ea743cb0b5"/><file name="samples.phtml" hash="44c0a95537374a28b2ef7dc61af83081"/><file name="type.phtml" hash="c8812cbea63ed61c218a223608bc2d37"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="ca79aecfc367a66f2472f48a4df1fd55"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="9d16cb2078c4cef18d1ec09282e80d27"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="e1536bf066aa2a9402cd0ae87fae1e9f"/></dir></dir><file name="success.phtml" hash="3a03beb83b20a623c0a8e364c0015cdc"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="d3b3a11fe38c46c02dcd6d2c4c0f6fcf"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="d0a310bd1117fc84443a53e9d9687400"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="0282e9403b6551c80bc424251cbaca7a"/></dir><dir name="order"><file name="downloadable.phtml" hash="16a6d6963fb5deb32a28378098239d21"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="63b11beb3c90be589886d0788a11c078"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="51c8430e7c5d3959e87e511533c5e8e3"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b9b117e382f27add54b56e751f4c9e38"/></dir><file name="renderer.phtml" hash="143415b140ba16e97c0a1807c40e6e09"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="cfe5211ef1d5c0785ca92065f4b88186"/></dir><dir name="invoice"><file name="items.phtml" hash="4e245ebd1d0005e011c67c000849f5c0"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="e99fe3121b7b80e36690715a09bd6550"/></dir><dir name="invoice"><file name="default.phtml" hash="e99fe3121b7b80e36690715a09bd6550"/></dir><dir name="order"><file name="default.phtml" hash="7f3b388e6b84046e1c771b632ebde612"/></dir><dir name="shipment"><file name="default.phtml" hash="40dab7ab90f7514acfe3e1d4ab408e60"/></dir></dir><dir name="shipment"><file name="items.phtml" hash="e38d0caba217e50d86320f49ad86b8da"/><file name="track.phtml" hash="e9810f489eda94dd7584444ee033fb59"/></dir><file name="items.phtml" hash="362c381e40ecdda30cba5300e339e896"/></dir><dir name="productalert"><file name="price.phtml" hash="b0e82922f05837ee68f29695483f4e81"/><file name="stock.phtml" hash="e1c6a78ca40ddd2fc87b714a64d64fd8"/></dir></dir><dir name="giftmessage"><file name="form.phtml" hash="2189441f6329cd1c7522bb3e467cd059"/><file name="helper.phtml" hash="ae0f4b7d8bfab3aba1e933a2001d1247"/><file name="inline.phtml" hash="4e6c8579f7797fa40957898f5c4269a0"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="47f80f80bc586a135d168e5cc12a372a"/><file name="link.phtml" hash="640b8d022d5476330ba155691e1f0d3d"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="e5836ac3bbd2bc710fec7477ff38276f"/></dir><dir name="page"><dir name="html"><file name="breadcrumbs.phtml" hash="bf72bc34af13a8a488ec0cef023e4b27"/><file name="footer.phtml" hash="ea657e715fc3f4fd17b6d46af8d2671b"/><file name="head.phtml" hash="1fea2048b0f43e79e325455c29186cba"/><file name="header.phtml" hash="b947b5b8c3c5bf3c68b7feb2a4697340"/><file name="pager.phtml" hash="37945676a2c4f93a1c9c7511e9e525f6"/><file name="top.links.phtml" hash="8599292fc6f27cdda2cf4dc8eb2e6d09"/><file name="wrapper.phtml" hash="a527f8b78162d1ccf89bf9c2b6d58e62"/></dir><dir name="switch"><file name="flags.phtml" hash="f7cee579500a0dde7ffa8f8ac6a069e8"/><file name="languages.phtml" hash="74bc530b7a284333c6dbfb63c233fa1b"/><file name="stores.phtml" hash="687bff8b05ac6b17f242a10479169df8"/></dir><dir name="template"><file name="container.phtml" hash="48a40301b0a26dbdd0de0f91d5adcc4d"/><file name="links.phtml" hash="9af7db5636ddd7faf2eed94cec40c1e9"/></dir><file name="1column.phtml" hash="f2aae419e58d98edc3b80bdd14829c27"/><file name="2columns-left.phtml" hash="87f05d9d7562b921a3affbd1a715c4ea"/><file name="2columns-right.phtml" hash="c8b57c6dcf0eee72bd66ae40a00ddcd3"/><file name="3columns.phtml" hash="4ff7095128b3237c87035151d7d9c787"/><file name="popup.phtml" hash="a4e73e22b8ec51b3aea5a8303bb3b250"/><file name="print.phtml" hash="53837eaccfcc0a83e54da945e07f125f"/><file name="redirect.phtml" hash="0711eff223361681d2d12b2061f42cb1"/></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="e2212577c2c9c28e00c66a1908d46fb3"/><file name="ccsave.phtml" hash="07ff3a0a20f00e31b5443800ebacb7f1"/><file name="checkmo.phtml" hash="395800ebbbd31f85c5c19f211f804c09"/><file name="purchaseorder.phtml" hash="63c6fb59568ad1f8a7170c231e947785"/></dir><dir name="info"><file name="cc.phtml" hash="3b58308f891f7456accfaef2cdbf4e3c"/><file name="ccsave.phtml" hash="f13dccb79ee937279722e34db2d75150"/><file name="checkmo.phtml" hash="68c1345716d154c63d6089c94d0e1c5d"/><file name="default.phtml" hash="5b12a176647450847712b5ddb5b7c1cb"/><file name="purchaseorder.phtml" hash="a258df940fb85b0dbd41221934cbee40"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="details.phtml" hash="61f34a3d49929852e8278b6371479962"/></dir><file name="form.phtml" hash="dacfbd1a1d0a82b9d2e6bc2ecf88ab00"/><file name="info.phtml" hash="e5055353ca8855207dbd981208ee3e66"/><file name="review.phtml" hash="5a09c7220681003bcc3c9e6cc4694042"/></dir><dir name="standard"><file name="form.phtml" hash="99832274cde55a2c9999d89d38dd8c88"/></dir><file name="link.phtml" hash="a58135aa8c3451f479d0c5e1ce86d01b"/></dir><dir name="paypaluk"><dir name="direct"><file name="form.phtml" hash="df5728a0068b15ec6c56323b4f893b4e"/><file name="info.phtml" hash="91705c0d3cb8cb336aee5a24e57a93c9"/></dir><dir name="express"><dir name="review"><file name="details.phtml" hash="c8ccfb9c1eb05d86a10dc449f678e78c"/></dir><file name="form.phtml" hash="3ab14fedc24e6200b21ce5376cc34037"/><file name="info.phtml" hash="e5055353ca8855207dbd981208ee3e66"/><file name="review.phtml" hash="750608c895d5b302f9db119ff1f7aae3"/></dir><file name="link.phtml" hash="10a1748caabeecddf45b0792e770453b"/></dir><dir name="poll"><file name="active.phtml" hash="1779dac29251a5c782acf743bfddeeb1"/><file name="result.phtml" hash="72f240de2738a6245e1f2358bd372bfd"/></dir><dir name="productalert"><file name="price.phtml" hash="fbf4d4bd39aba47214e5517841300f9a"/><file name="stock.phtml" hash="c71de1c94128176d10de171743505525"/></dir><dir name="rating"><file name="detailed.phtml" hash="f805bcd92a7fda64a099928a812541bc"/><file name="empty.phtml" hash="5b8bb08fb214c543dfe26ff202891c7e"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="421dc0f3bfe7f0885c80560ce953cc50"/><file name="home_product_viewed.phtml" hash="81e52257f6a37ddd8c4a191c235b2bd5"/><file name="product_compared.phtml" hash="46f95495f89b745532386ca5f9cf392e"/><file name="product_viewed.phtml" hash="935074d1fc7041908e453537a23fa893"/></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="50996dd1969c2b09c328e39c7a97cd42"/><file name="recent.phtml" hash="07eb31712f2baf612e094dc9fed6bafa"/><file name="view.phtml" hash="ac2a40f8298e2a63a880d155196b8190"/></dir><dir name="helper"><file name="summary.phtml" hash="b2b0ba9cd00e13e32dd76efb02100d0f"/><file name="summary_short.phtml" hash="22dc079532ce1407c7c1f83f92e32aef"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="f5c8e159786a1e2486c4dac8dfb66e1e"/><file name="list.phtml" hash="07059ba73bf0540c04d4e1a12ab5df20"/><file name="other.phtml" hash="ff7173288f722adad334cd3b1a9f588f"/></dir></dir><file name="form.phtml" hash="300d77db884521c3404ea3c87a161cb5"/><file name="view.phtml" hash="4af924813e6a0170c72ff0dd0b385f73"/></dir><dir name="rss"><dir name="order"><file name="details.phtml" hash="b5d5a99587a8545bdb9c6a0d70a042d3"/></dir><file name="list.phtml" hash="0fbdeef4328ce1f95445add0d8544387"/><file name="nofeed.phtml" hash="76502bd485ec3713e10802eba65d4e58"/></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="2a352211a3378803a919e59e7b39896d"/></dir></dir><file name="items.phtml" hash="265a5b99ea0ddce705664b3ff7273065"/></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="ee34d85a40e144f3264a2868d5a034c4"/></dir></dir><file name="items.phtml" hash="26d2bfb70592ea816c6c4ef22004fcaf"/></dir><dir name="items"><dir name="renderer"><file name="default.phtml" hash="7a4175d2dc4cf1d95e6f32e634e95b55"/></dir></dir><dir name="print"><file name="creditmemo.phtml" hash="a25cd04a4250c57f61b00ec9588ec0af"/><file name="invoice.phtml" hash="e24161137cd90d6d5a3371553e0e9023"/><file name="shipment.phtml" hash="bc8d28f761e0fdbf5b9fb8c516595439"/><file name="tax.phtml" hash="bf254c2d780f00e18b1c00f95b067db8"/></dir><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="638f8f565efa05b7d26738f1994a1fa5"/></dir></dir><file name="items.phtml" hash="e4dd2210be4241543cee82e1b440ebc1"/></dir><file name="creditmemo.phtml" hash="8d13ffb5de2e98c02e22d6a55f498a29"/><file name="details.phtml" hash="e7cad4cdf7f1ff69473161ed11585d3c"/><file name="history.phtml" hash="a87edd981e6a0451181139cd2bf45b98"/><file name="info.phtml" hash="97ed7ec4d4032bbb19cc1ddd0447feed"/><file name="invoice.phtml" hash="d26a29413f8574543b11a0775f2ac46d"/><file name="items.phtml" hash="6f14ea4daf34822ca7d70d51bf87c653"/><file name="print.phtml" hash="6bd000e5429a241354f1be38da5342e9"/><file name="recent.phtml" hash="33733728c39ad12a7e9ef0ede33d3a07"/><file name="shipment.phtml" hash="3c451556d2205e02489094a2dcfee65e"/><file name="tax.phtml" hash="ec921ad542c485c3959482d58bd28809"/><file name="trackinginfo.phtml" hash="1c680d4542402f269b4c635804a04f77"/><file name="view.phtml" hash="370773c9384b0d954670bca11aaf60a5"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="8ccb45b3745e12d010400d3e287fd6cc"/></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="fc8f0cdd4573346b9119356291641d56"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="affc0973c249464f98d6592ce4a52538"/><file name="popup.phtml" hash="fb601d65ec85db1860620716da993872"/></dir></dir><dir name="tag"><dir name="customer"><file name="edit.phtml" hash="98f1043e06c2d29a4e4aa6ff7d5c060b"/><file name="recent.phtml" hash="edd2e285ce655539e067644013b5094f"/><file name="tags.phtml" hash="1d3551b3f3713dbc6d32ba205fdc2c51"/><file name="view.phtml" hash="aa64c5d4b4551d9f2f0bd7faf7c416ac"/></dir><dir name="product"><file name="result.phtml" hash="d8ef80c71effcde769732397b961a03a"/></dir><file name="cloud.phtml" hash="dfb3592054b773c08a522091cf5de233"/><file name="list.phtml" hash="daf3a8ecb82f0b271aae9e199390940e"/><file name="mytags.phtml" hash="b6efff2bc3bb2139a4057f8c1eb989f4"/><file name="popular.phtml" hash="41aa202199f6f0ca648e16076484bfbf"/><file name="result.phtml" hash="dea62fd62de4c403f93334d361ec19ec"/><file name="search.phtml" hash="6222566c51093557e1de7c363dd8169f"/></dir><dir name="wishlist"><dir name="email"><file name="items.phtml" hash="546c2d345323aaebe27a23d5c838a3e2"/><file name="rss.phtml" hash="fe00d171bdd383f4fbf97bf1de054a41"/></dir><file name="shared.phtml" hash="83dfab61444198fe1c7c0fca357865dc"/><file name="sharing.phtml" hash="1a2d61eb37e586e67158aca1b45b7970"/><file name="sidebar.phtml" hash="7100232fc784ccb848634d26fb356b5f"/><file name="view.phtml" hash="fcc4a99258305e33b0117c8357c5d7fa"/></dir></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
+
<dependencies><required><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.2.0</min><max>1.2.0</max></package></required></dependencies>
|
| 18 |
</package>
|
skin/frontend/blank/default/css/styles.css
CHANGED
|
@@ -127,7 +127,7 @@
|
|
| 127 |
/* Global Styles ========================================================================= */
|
| 128 |
/* Form Elements */
|
| 129 |
input,select,textarea,button { font:12px Arial, Helvetica, sans-serif; vertical-align:middle; color:#000; }
|
| 130 |
-
input.input-text,select,textarea { border:1px solid #ddd; }
|
| 131 |
input.input-text,textarea { padding:2px; }
|
| 132 |
select { padding:1px; }
|
| 133 |
select option { padding-right:10px; }
|
|
@@ -151,23 +151,22 @@ button.disabled span {}
|
|
| 151 |
|
| 152 |
/* Form lists */
|
| 153 |
.form-list li { margin:0 0 5px; }
|
| 154 |
-
.form-list
|
| 155 |
-
.form-list
|
| 156 |
-
.form-list
|
| 157 |
-
.form-list
|
|
|
|
| 158 |
.form-list li.add-row { border-top:1px solid #ddd; margin-top:10px; }
|
| 159 |
-
.form-list label {}
|
| 160 |
|
| 161 |
.group-select {}
|
| 162 |
-
.group-select label {}
|
| 163 |
.group-select li { margin:0 0 5px; }
|
| 164 |
-
.group-select
|
| 165 |
-
.group-select
|
| 166 |
-
.group-select
|
| 167 |
-
.group-select
|
| 168 |
-
.group-select
|
| 169 |
-
.group-select
|
| 170 |
-
.group-select
|
| 171 |
|
| 172 |
.buttons-set { clear:both; margin:5px 0 0; padding:5px; border:1px solid #ddd; }
|
| 173 |
.buttons-set .back-link { float:left; }
|
|
@@ -622,7 +621,7 @@ a.minimal-price-link .price { font-weight:normal; }
|
|
| 622 |
.truncated a.dots { cursor:help; }
|
| 623 |
.truncated a.details { cursor:help; }
|
| 624 |
.truncated .truncated_full_value { position:relative; z-index:999; }
|
| 625 |
-
.truncated .truncated_full_value dl { position:absolute; top:-99999em; z-index:999; width:250px; padding:8px; border:1px solid #ddd; background-color:#f6f6f6; }
|
| 626 |
.truncated .show dl { top:-20px; left:50%; }
|
| 627 |
.col-left .truncated .show dl { left:30px; top:7px; }
|
| 628 |
.col-right .truncated .show dl { left:-240px; top:7px; }
|
| 127 |
/* Global Styles ========================================================================= */
|
| 128 |
/* Form Elements */
|
| 129 |
input,select,textarea,button { font:12px Arial, Helvetica, sans-serif; vertical-align:middle; color:#000; }
|
| 130 |
+
input.input-text,select,textarea { background:#fff; border:1px solid #ddd; }
|
| 131 |
input.input-text,textarea { padding:2px; }
|
| 132 |
select { padding:1px; }
|
| 133 |
select option { padding-right:10px; }
|
| 151 |
|
| 152 |
/* Form lists */
|
| 153 |
.form-list li { margin:0 0 5px; }
|
| 154 |
+
.form-list label { font-weight:bold; }
|
| 155 |
+
.form-list .input-box { float:left; width:260px; }
|
| 156 |
+
.form-list input.input-text,
|
| 157 |
+
.form-list textarea { width:250px; }
|
| 158 |
+
.form-list select { width:256px; }
|
| 159 |
.form-list li.add-row { border-top:1px solid #ddd; margin-top:10px; }
|
|
|
|
| 160 |
|
| 161 |
.group-select {}
|
|
|
|
| 162 |
.group-select li { margin:0 0 5px; }
|
| 163 |
+
.group-select .input-box { float:left; width:260px; }
|
| 164 |
+
.group-select input.input-text,
|
| 165 |
+
.group-select textarea {width:510px; }
|
| 166 |
+
.group-select select { width:516px; }
|
| 167 |
+
.group-select .input-box input.input-text,
|
| 168 |
+
.group-select .input-box textarea { width:250px; }
|
| 169 |
+
.group-select .input-box select { width:256px; }
|
| 170 |
|
| 171 |
.buttons-set { clear:both; margin:5px 0 0; padding:5px; border:1px solid #ddd; }
|
| 172 |
.buttons-set .back-link { float:left; }
|
| 621 |
.truncated a.dots { cursor:help; }
|
| 622 |
.truncated a.details { cursor:help; }
|
| 623 |
.truncated .truncated_full_value { position:relative; z-index:999; }
|
| 624 |
+
.truncated .truncated_full_value dl { position:absolute; top:-99999em; left:-99999em; z-index:999; width:250px; padding:8px; border:1px solid #ddd; background-color:#f6f6f6; }
|
| 625 |
.truncated .show dl { top:-20px; left:50%; }
|
| 626 |
.col-left .truncated .show dl { left:30px; top:7px; }
|
| 627 |
.col-right .truncated .show dl { left:-240px; top:7px; }
|
skin/frontend/blank/default/js/bundle.js
CHANGED
|
@@ -64,10 +64,13 @@ Product.Bundle.prototype = {
|
|
| 64 |
|
| 65 |
reloadPrice: function() {
|
| 66 |
var calculatedPrice = 0;
|
|
|
|
| 67 |
for (var option in this.config.selected) {
|
| 68 |
if (this.config.options[option]) {
|
| 69 |
for (var i=0; i < this.config.selected[option].length; i++) {
|
| 70 |
-
|
|
|
|
|
|
|
| 71 |
}
|
| 72 |
}
|
| 73 |
}
|
|
@@ -78,6 +81,7 @@ Product.Bundle.prototype = {
|
|
| 78 |
}
|
| 79 |
|
| 80 |
optionsPrice.changePrice('bundle', calculatedPrice);
|
|
|
|
| 81 |
optionsPrice.reload();
|
| 82 |
|
| 83 |
return calculatedPrice;
|
|
@@ -115,7 +119,14 @@ Product.Bundle.prototype = {
|
|
| 115 |
price = (this.config.basePrice*selection.priceValue)/100;
|
| 116 |
}
|
| 117 |
}
|
| 118 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 119 |
},
|
| 120 |
|
| 121 |
populateQty: function(optionId, selectionId){
|
|
@@ -141,8 +152,14 @@ Product.Bundle.prototype = {
|
|
| 141 |
}
|
| 142 |
},
|
| 143 |
|
| 144 |
-
changeOptionQty: function (element) {
|
| 145 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 146 |
element.value = 1;
|
| 147 |
}
|
| 148 |
parts = element.id.split('-');
|
| 64 |
|
| 65 |
reloadPrice: function() {
|
| 66 |
var calculatedPrice = 0;
|
| 67 |
+
var dispositionPrice = 0;
|
| 68 |
for (var option in this.config.selected) {
|
| 69 |
if (this.config.options[option]) {
|
| 70 |
for (var i=0; i < this.config.selected[option].length; i++) {
|
| 71 |
+
var prices = this.selectionPrice(option, this.config.selected[option][i]);
|
| 72 |
+
calculatedPrice += Number(prices[0]);
|
| 73 |
+
dispositionPrice += Number(prices[1]);
|
| 74 |
}
|
| 75 |
}
|
| 76 |
}
|
| 81 |
}
|
| 82 |
|
| 83 |
optionsPrice.changePrice('bundle', calculatedPrice);
|
| 84 |
+
optionsPrice.changePrice('nontaxable', dispositionPrice);
|
| 85 |
optionsPrice.reload();
|
| 86 |
|
| 87 |
return calculatedPrice;
|
| 119 |
price = (this.config.basePrice*selection.priceValue)/100;
|
| 120 |
}
|
| 121 |
}
|
| 122 |
+
//price += this.config.options[optionId].selections[selectionId].plusDisposition;
|
| 123 |
+
//price -= this.config.options[optionId].selections[selectionId].minusDisposition;
|
| 124 |
+
//return price*qty;
|
| 125 |
+
var disposition = this.config.options[optionId].selections[selectionId].plusDisposition +
|
| 126 |
+
this.config.options[optionId].selections[selectionId].minusDisposition;
|
| 127 |
+
|
| 128 |
+
var result = new Array(price*qty, disposition*qty);
|
| 129 |
+
return result;
|
| 130 |
},
|
| 131 |
|
| 132 |
populateQty: function(optionId, selectionId){
|
| 152 |
}
|
| 153 |
},
|
| 154 |
|
| 155 |
+
changeOptionQty: function (element, event) {
|
| 156 |
+
var checkQty = true;
|
| 157 |
+
if (typeof(event) != 'undefined') {
|
| 158 |
+
if (event.keyCode == 8 || event.keyCode == 46) {
|
| 159 |
+
checkQty = false;
|
| 160 |
+
}
|
| 161 |
+
}
|
| 162 |
+
if (checkQty && (Number(element.value) == 0 || isNaN(Number(element.value)))) {
|
| 163 |
element.value = 1;
|
| 164 |
}
|
| 165 |
parts = element.id.split('-');
|
