From 32a85007dfc815326baec41b671f88e53adc5925 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Tue, 22 Oct 2013 15:45:33 +0200 Subject: [PATCH] // update mail templates --- .../themes/default/css/admin-theme/email.css | 105 ++++++++++++++++++ classes/PaymentModule.php | 24 ++-- 2 files changed, 117 insertions(+), 12 deletions(-) create mode 100644 admin-dev/themes/default/css/admin-theme/email.css diff --git a/admin-dev/themes/default/css/admin-theme/email.css b/admin-dev/themes/default/css/admin-theme/email.css new file mode 100644 index 000000000..44168415e --- /dev/null +++ b/admin-dev/themes/default/css/admin-theme/email.css @@ -0,0 +1,105 @@ +body{ + background-color: #ffffff; + width:650px; + margin:auto; + font-family: "Open-sans", sans-serif; + color: #555454; + font-size: 13px; + line-height: 18px +} + +.table tbody > tr > td { + border:none; + padding-left:0; + padding-right:0; +} + +td.space {width:20px;} +td.space_footer {padding:0 !important;} + +.table .table{background-color: #ffffff;} + +table.table-mail{ + margin-top:10px; + -moz-box-shadow: 0 0 5px #afafaf; + -webkit-box-shadow: 0 0 5px #afafaf; + -o-box-shadow: 0 0 5px #afafaf; + box-shadow: 0 0 5px #afafaf; + filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf, Direction=134, Strength=5); +} + +table.table-recap tbody > tr > td, .table-recap thead > tr > th{ + border: 1px solid #DDDDDD !important +} + +table.table-recap td{ + padding:10px !important; + color:#777777; +} + +.table .table-recap thead > tr > th{ + background-color: #fbfbfb; + padding:10px; + font-family: Arial; + color:#333333; + font-size: 13px +} + +table.table-recap .conf_body td{color:#333333;} + +table.table-recap .conf_body td.total{ + color:#555454; + font-size:18px; + font-weight:500; + font-family: "Open-sans", sans-serif; +} + +table.table-recap .conf_body td.total_amount{ + color:#333333; + font-size: 21px; + font-weight:500; + font-family: "Open-sans", sans-serif; +} + +a{color: #337ff1} + +td.logo{ + border-bottom: 4px solid #333333 !important +} + +span.title{ + font-weight: 500; + font-size: 28px; + text-transform: uppercase; +} +span.subtitle{ + font-weight: 500; + font-size: 16px; + text-transform: uppercase; +} + +td.box{ + background-color: #fbfbfb; + padding: 10px !important; + border: 1px solid #d6d4d4 !important +} + +td.box p{ + text-transform: uppercase; + font-weight: 500; + font-size: 18px; + border-bottom: 1px solid #d6d4d4 !important; + padding-bottom: 10px +} + +td.box span{ + color:#777777; +} + +td.box span span{ + color:#333333; +} + +td.footer{ + border-top: 4px solid #333333 !important +} \ No newline at end of file diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 9d638ecd3..34a13c56d 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -373,23 +373,23 @@ abstract class PaymentModuleCore extends Module $customization_quantity = (int)$product['customization_quantity']; $products_list .= - ' - '.$product['reference'].' - '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' - '.Tools::displayError('Customized').(!empty($customization_text) ? ' - '.$customization_text : '').' - '.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' - '.$customization_quantity.' - '.Tools::displayPrice($customization_quantity * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' + ' + '.$product['reference'].' + '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' - '.Tools::displayError('Customized').(!empty($customization_text) ? ' - '.$customization_text : '').' + '.Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' + '.$customization_quantity.' + '.Tools::displayPrice($customization_quantity * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' '; } if (!$customization_quantity || (int)$product['cart_quantity'] > $customization_quantity) $products_list .= - ' - '.$product['reference'].' - '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' - '.Tools::displayPrice(Product::getTaxCalculationMethod((int)$this->context->customer->id) == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' - '.((int)$product['cart_quantity'] - $customization_quantity).' - '.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' + ' + '.$product['reference'].' + '.$product['name'].(isset($product['attributes']) ? ' - '.$product['attributes'] : '').' + '.Tools::displayPrice(Product::getTaxCalculationMethod((int)$this->context->customer->id) == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt, $this->context->currency, false).' + '.((int)$product['cart_quantity'] - $customization_quantity).' + '.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? Tools::ps_round($price, 2) : $price_wt), $this->context->currency, false).' '; // Check if is not a virutal product for the displaying of shipping