diff --git a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl index f9a3c45a5..c3fcbe898 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl @@ -26,21 +26,26 @@ {extends file="helpers/view/view.tpl"} {block name="override_tpl"} -
-
-
+
+

+ + {l s='Message status'} +

+ +
+ +
- -

- - {l s='Forward this discussion to an employee:'} +

+
+ +
-

- - +
-
+ +
{if $thread->id_customer} -
+
{if $orders && count($orders)} {if $count_ok} -
-

{l s='Orders'}

+

+ {l s='Orders'} +

+
- - - - - - - + + + + + + + {assign var=irow value=0} {foreach $orders_ok as $order} - + - - - - - - + + + + + {/foreach}
{l s='ID'}{l s='Date'}{l s='Products:'}{l s='Total paid'}{l s='Payment: '}{l s='State'}{l s='Actions'} + {l s='ID'} + + {l s='Date'} + + {l s='Products:'} + + {l s='Total paid'} + + {l s='Payment: '} + + {l s='State'} + + {l s='Actions'} +
{$order.id_order}{$order.date_add}{$order.nb_products}{$order.total_paid_real}{$order.payment}{$order.order_state} - - + {$order.date_add}{$order.nb_products}{$order.total_paid_real}{$order.payment}{$order.order_state} + + {l s='View'}
-

- {l s='Validated Orders:'} {$count_ok} {l s='for'} {$total_ok} -

+

+ {l s='Validated Orders:'} {$count_ok} {l s='for'} {$total_ok} +

{/if} {/if} +
+
{if $products && count($products)} -
-

{l s='Products:'}

- +

+ {l s='Products:'} +

+
+
- - - - - + + + + + {assign var=irow value=0} {foreach $products as $product} - - - - - - + + + + + @@ -133,10 +180,10 @@
{l s='Date'}{l s='ID'}{l s='Name'}{l s='Quantity'}{l s='Actions'} + {l s='Date'} + + {l s='ID'} + + {l s='Name'} + + {l s='Quantity'} + + {l s='Actions'} +
{$product.date_add}{$product.product_id}{$product.product_name}{$product.product_quantity} - - +
{$product.date_add}{$product.product_id}{$product.product_name}{$product.product_quantity} + + {l s='View'}
{/if} -
+ {/if} -
+
{foreach $messages as $message} {$message} {/foreach} diff --git a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl index 533d12610..970314e9a 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl @@ -27,13 +27,13 @@ {if !$email} -
- +
+

{if !empty($message.employee_name)} - {$PS_SHOP_NAME} + {$PS_SHOP_NAME} - {$message.employee_name} {else} - {$PS_SHOP_NAME} + -- {if !empty($message.id_customer)} {$message.customer_name} @@ -42,147 +42,177 @@ {$message.email} {/if} {/if} - +

{if !empty($message.id_customer) && empty($message.id_employee)} -
-
{l s='Customer ID:'} -
- {$message.id_customer} {l s='View'} - +
+
{l s='Customer ID:'}
+
+ + {$message.id_customer} +
{/if} -
+
{l s='Sent on:'}
{$message.date_add}
-
{if empty($message.id_employee)} -
+
{l s='Browser:'}
{$message.user_agent}
{/if} {if !empty($message.file_name) && $file_name} -
+
{l s='File attachment'}
-
+ - {l s='View'} - + +
{/if} {if !empty($message.id_order) && empty($message.id_employee)} -
+
{l s='Order #'}
-
- {$message.id_order} {l s='View'} -
+
+ + {$message.id_order} + +
{/if} {if !empty($message.id_product) && empty($message.id_employee)} -
+
{l s='Product #'}
-
- {$message.id_product} {l s='View'} -
+
+ + {$message.id_product} + +
{/if} - -
- {l s='Subject:'} - - -
+
+
+
{l s='Subject:'}
+
+ + +
+
+
+
{else} -
- {if $id_employee} - '. - {l s='View this thread'} -
- {/if} - {l s='Sent by:'} +
+ {if $id_employee} + + {l s='View this thread'} + + {/if} +
+
{l s='Sent by:'}
+
+ {if !empty($message.customer_name)} + {$message.customer_name} ({$message.email}) + {else} + {$message.email} + {/if} +
+
- {if !empty($message.customer_name)} - {$message.customer_name} ({$message.email}) - {else} - {$message.email} - {/if} + {if !empty($message.id_customer) && empty($message.id_employee)} +
+
{l s='Customer ID:'}
+
{$message.id_customer}
+
+ {/if} - {if !empty($message.id_customer) && empty($message.id_employee)} -
{l s='Customer ID:'} {$message.id_customer}
- {/if} + {if !empty($message.id_order) && empty($message.id_employee)} +
+
{l s='Order #'}:
+
{$message.id_order}
+
+ {/if} - {if !empty($message.id_order) && empty($message.id_employee)} -
{l s='Order #'}: {$message.id_order}
- {/if} + {if !empty($message.id_product) && empty($message.id_employee)} +
+
{l s='Product #'}:
+
{$message.id_product}
+
+ {/if} - {if !empty($message.id_product) && empty($message.id_employee)} -
{l s='Product #'}: {$message.id_product}
- {/if} - -
{l s='Subject:'} {$message.subject} +
+
{l s='Subject:'}
+
{$message.subject}
+
{/if} -
-
{l s='Thread ID:'}
-
{$message.id_customer_thread}
-
-
-
{l s='Message ID:'}
-
{$message.id_customer_message}
-
-
-
{l s='Message:'}
-
{$message.message|escape:'htmlall':'UTF-8'|nl2br}
-
-
+
+
{l s='Thread ID:'}
+
{$message.id_customer_thread}
+
+
+
{l s='Message ID:'}
+
{$message.id_customer_message}
+
+
+
{l s='Message:'}
+
{$message.message|escape:'htmlall':'UTF-8'|nl2br}
+
+
+
{if !$email} {if empty($message.id_employee)} - +
{/if} -