{if $count_ok}
- {l s='[1]%1$d[/1] order(s) validated for a total amount of [2]%2$s[/2]' sprintf=[$count_ok, $total_ok] tags=['', '']}
+ {l s='[1]%1$d[/1] order(s) validated, total amount paid [2]%2$s[/2]' sprintf=[$count_ok, $total_ok] tags=['', '']}
{else}
{l s="No orders validated for the moment"}
{/if}
@@ -115,7 +115,7 @@
{l s="Choose a template"}
- -->
+ -->
@@ -159,7 +159,7 @@
});
timer = setInterval("markAsRead()", 3000);
});
-
+
function markAsRead()
{
$.ajax({
diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
index 88da2734e..8aab78130 100644
--- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
@@ -146,15 +146,27 @@
- {if $customer->active}
-
-
- {l s='Active'}
+ {if !$customer->deleted}
+ {if $customer->active}
+
+
+ {l s='Active'}
+
+ {else}
+
+
+ {l s='Inactive'}
+
+ {/if}
+ {elseif $customer->deleted == Customer::STATUS_BANNED}
+
+
+ {l s='Banned'}
- {else}
+ {elseif $customer->deleted == Customer::STATUS_DELETED}
- {l s='Inactive'}
+ {l s='Deleted'}
{/if}
@@ -185,85 +197,122 @@
{if $orders AND count($orders)}
{assign var=count_ok value=count($orders_ok)}
{assign var=count_ko value=count($orders_ko)}
-
-
-
-
- {l s='Valid orders:'}
- {$count_ok}
- {l s='for a total amount of %s' sprintf=$total_ok}
-
-
-
- {l s='Invalid orders:'}
-
{$count_ko}
+ {if $count_ok || $count_ko}
+
+
+
+
+
+
+ {l s='Total amount received: %s' sprintf=$total_ok}
+
+
+
+ {if $count_ok}
+
+
+
+ | {l s='ID'} |
+ {l s='Date'} |
+ {l s='Payment'} |
+ {l s='Status'} |
+ {l s='Products'} |
+ {l s='Total spent'} |
+ |
+
+
+
+ {foreach $orders_ok AS $key => $order}
+
+ | {$order['id_order']} |
+ {dateFormat date=$order['date_add'] full=0} |
+ {$order['payment']} |
+ {$order['order_state']} |
+ {$order['nb_products']} |
+ {$order['total_paid_real']} |
+
+
+ {l s='View'}
+
+ |
+
+ {/foreach}
+
+
+ {else}
+
+ {l s='No valid order found!!'}
+
+ {/if}
+
+
+
+
+
+ {l s='Order total: %s' sprintf=$total_ko}
+
+
+
+ {if $count_ko}
+
+
+
+ | {l s='ID'} |
+ {l s='Date'} |
+ {l s='Payment'} |
+ {l s='Status'} |
+ {l s='Products'} |
+ {l s='Total spent'} |
+ |
+
+
+
+ {foreach $orders_ko AS $key => $order}
+
+ | {$order['id_order']} |
+ {dateFormat date=$order['date_add'] full=0} |
+ {$order['payment']} |
+ {$order['order_state']} |
+ {$order['nb_products']} |
+ {$order['total_paid_real']} |
+
+
+ {l s='View'}
+
+ |
+
+ {/foreach}
+
+
+ {else}
+
+ {l s='No invalid order found!!'}
+
+ {/if}
+
-
-
- {if $count_ok}
-
-
-
- | {l s='ID'} |
- {l s='Date'} |
- {l s='Payment'} |
- {l s='Status'} |
- {l s='Products'} |
- {l s='Total spent'} |
- |
-
-
-
- {foreach $orders_ok AS $key => $order}
-
- | {$order['id_order']} |
- {dateFormat date=$order['date_add'] full=0} |
- {$order['payment']} |
- {$order['order_state']} |
- {$order['nb_products']} |
- {$order['total_paid_real']} |
-
-
- {l s='View'}
-
- |
-
- {/foreach}
-
-
{/if}
- {if $count_ko}
-
-
-
- | {l s='ID'} |
- {l s='Date'} |
- {l s='Payment'} |
- {l s='Status'} |
- {l s='Products'} |
- {l s='Total spent'} |
-
-
-
- {foreach $orders_ko AS $key => $order}
-
- | {$order['id_order']} |
- {dateFormat date=$order['date_add'] full=0} |
- {$order['payment']} |
- {$order['order_state']} |
- {$order['nb_products']} |
- {$order['total_paid_real']} |
-
- {/foreach}
-
-
- {/if}
{else}
-
- {l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]}
-
+
+ {l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]}
+
{/if}
@@ -277,7 +326,6 @@
| {l s='ID'} |
{l s='Date'} |
- {l s='Carrier'} |
{l s='Total'} |
@@ -290,7 +338,6 @@
{dateFormat date=$cart['date_upd'] full=0}
-
{$cart['name']} |
{$cart['total_price']} |
{/foreach}
@@ -303,33 +350,95 @@
{/if}
{if $products AND count($products)}
-
-
-
{l s='Purchased products'}
{count($products)}
+
+
+ {l s='Room types and services'} {count($products)}
+
+
+
+
+ {if $count_room_types}
+
+
+
+
+ | {l s='ID Order'} |
+ {l s='Name'} |
+ {l s='Nights booked'} |
+ {l s='Booking Date'} |
+
+
+
+ {foreach $purchasedRoomTypes AS $key => $product}
+
+ |
+
+ #{$product['id_order']}
+
+ |
+
+ {$product['product_name']}
+ |
+ {$product['product_quantity']} |
+ {dateFormat date=$product['date_add'] full=0} |
+
+ {/foreach}
+
+
+
+ {/if}
+ {if $count_services}
+
+
+
+
+ | {l s='ID Order'} |
+ {l s='Name'} |
+ {l s='Quantity'} |
+ {l s='Booking Date'} |
+
+
+
+ {foreach $purchasedServices AS $key => $product}
+
+ |
+
+ #{$product['id_order']}
+
+ |
+
+ {$product['product_name']}
+ |
+ {$product['product_quantity']} |
+ {dateFormat date=$product['date_add'] full=0} |
+
+ {/foreach}
+
+
+
+ {/if}
+
+
-
-
-
- | {l s='Date'} |
- {l s='Name'} |
- {l s='Quantity'} |
-
-
-
- {foreach $products AS $key => $product}
-
- | {dateFormat date=$product['date_add'] full=0} |
-
-
- {$product['product_name']}
-
- |
- {$product['product_quantity']} |
-
- {/foreach}
-
-
-
{/if}
{if count($interested)}
@@ -442,7 +551,7 @@
-
+
diff --git a/admin/themes/default/template/controllers/login/content.tpl b/admin/themes/default/template/controllers/login/content.tpl
index f28b4a838..e29607c74 100644
--- a/admin/themes/default/template/controllers/login/content.tpl
+++ b/admin/themes/default/template/controllers/login/content.tpl
@@ -67,6 +67,7 @@
+ {hook h="displayAdminLoginFormFieldsAfter"}