+
+
+
+ 
{l s='Cart summary'}
+
+
- | |
+ |
{l s='Product'} |
{l s='UP'} |
{l s='Qty'} |
@@ -183,8 +183,9 @@
{/if}
{l s='According to the group of this customer, prices are printed:'} {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if}
-
+
-
{/block}
+
+
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/customer_threads/message.tpl b/admin-dev/themes/default/template/customer_threads/message.tpl
index 3e939261f..bd45db20f 100644
--- a/admin-dev/themes/default/template/customer_threads/message.tpl
+++ b/admin-dev/themes/default/template/customer_threads/message.tpl
@@ -28,8 +28,8 @@
{if !$email}
-
+
+
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/customer_threads/view.tpl b/admin-dev/themes/default/template/customer_threads/view.tpl
index 7522e8c8e..54f3bc2d7 100644
--- a/admin-dev/themes/default/template/customer_threads/view.tpl
+++ b/admin-dev/themes/default/template/customer_threads/view.tpl
@@ -142,7 +142,7 @@
{$message}
{/foreach}
-
+
diff --git a/admin-dev/themes/default/template/customers/view.tpl b/admin-dev/themes/default/template/customers/view.tpl
index 7810bcd36..6efe6350a 100644
--- a/admin-dev/themes/default/template/customers/view.tpl
+++ b/admin-dev/themes/default/template/customers/view.tpl
@@ -63,7 +63,7 @@
-
+
{$customer->firstname} {$customer->lastname}
diff --git a/admin-dev/themes/default/template/groups/view.tpl b/admin-dev/themes/default/template/groups/view.tpl
index 9f96a6ab1..2566c9506 100755
--- a/admin-dev/themes/default/template/groups/view.tpl
+++ b/admin-dev/themes/default/template/groups/view.tpl
@@ -28,12 +28,11 @@
{block name="override_tpl"}
-
{/if}
-
- {l s='Price display method:'}
+
+
+ {l s='Price display method:'}
{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}
-
- {l s='Show prices:'} {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}
-
+
+ {l s='Show prices:'} {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}
+
+
{l s='Customer members of this group'}
{$customerList}
diff --git a/admin-dev/themes/default/template/products/informations.tpl b/admin-dev/themes/default/template/products/informations.tpl
index d76f24b02..709e04a1d 100644
--- a/admin-dev/themes/default/template/products/informations.tpl
+++ b/admin-dev/themes/default/template/products/informations.tpl
@@ -66,15 +66,15 @@
-
-
{l s='Direct traffic can be quite consuming. You should consider enabling it only if you have a strong database server and a strong need for it.'}
-
+
-
+
diff --git a/classes/Hook.php b/classes/Hook.php
index 8e2d1f253..af252ae39 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -379,7 +379,9 @@ class HookCore extends ObjectModel
$output .= '
-
'
+ '
.$moduleInstance->displayName.'
diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index d2bd432be..a4bb20e4c 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -53,7 +53,7 @@ class AdminAddressesControllerCore extends AdminController
'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'),
'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'),
'address1' => array('title' => $this->l('Address')),
- 'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 50),
+ 'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 80),
'city' => array('title' => $this->l('City'), 'width' => 150),
'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'list' => $this->countriesArray, 'filter_key' => 'cl!id_country'));
diff --git a/css/admin.css b/css/admin.css
index d201d73c0..9fa4c4f41 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -269,6 +269,7 @@ input, textarea, option {
input[type="text"], input[type="password"], input[type="file"], textarea {
padding: 2px 4px;
+ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset;
}
input[type="text"], input[type="password"], input[type="file"], textarea, select, option {
@@ -2170,6 +2171,11 @@ div#scrollTop a:hover{
#container-customer h2 {
color:#000;
font-weight:normal;
+margin:0;
+}
+
+#container-customer h2 img {
+margin-right:5px;
}
#container-customer .info-customer-left {
@@ -2189,6 +2195,14 @@ font-weight:normal;
}
+#container-customer .info-customer-left h2,
+#container-customer .info-customer-right h2 {
+margin-bottom:7px;
+}
+
+#container-customer a {
+
+}
/*infoCustomer*/
.infoCustomer {}
@@ -2196,21 +2210,5 @@ font-weight:normal;
.infoCustomer dl dt {font-weight:bold; float:left; padding-right:5px;}
.infoCustomer dl dd { margin:0; padding:0;}
-
-#ajax_running {
- display: none;
- position: fixed;
- top: 0;
- left: 40%;
- z-index: 10000;
- background-color: #FFF1A8;
- border: 1px solid #FFD96F;
- color: #000;
- font-weight: bold;
- font-size: 14px;
- padding: 5px 20px;
- border-radius: 0 0 3px 3px;
- -webkit-border-bottom-left-radius: 3px;
- -webkit-border-bottom-right-radius: 3px;
- width: 300px;
-}
\ No newline at end of file
+/*container-carts*/
+#container-carts { background-color:#EBEDF4; border:1px solid #CCCED7; padding:10px;}
diff --git a/img/admin/basket.png b/img/admin/basket.png
new file mode 100755
index 000000000..edd35f199
Binary files /dev/null and b/img/admin/basket.png differ
diff --git a/img/admin/vcard.png b/img/admin/vcard.png
new file mode 100755
index 000000000..b8a9fea4c
Binary files /dev/null and b/img/admin/vcard.png differ
{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}{l s='from'} {$cart->date_upd}