From d0f2a37fff63f22a020975a9ab7fcbff5cbbeded Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Mon, 2 Sep 2013 10:10:20 +0200 Subject: [PATCH] //dashboard module view tpl init --- .../dashboard/helpers/view/view.tpl | 288 +----------------- .../admin/AdminDashboardController.php | 9 + install-dev/models/install.php | 3 + modules/dashactivity/config.xml | 2 +- modules/dashactivity/dashactivity.php | 1 + .../templates/hook/dashboard_zone_one.tpl | 133 ++++++++ modules/dashproducts/config.xml | 2 +- modules/dashproducts/dashproducts.php | 1 + .../templates/hook/dashboard_zone_two.tpl | 100 ++++++ modules/dashtrends/config.xml | 2 +- modules/dashtrends/dashtrends.php | 1 + .../templates/hook/dashboard_zone_two.tpl | 50 +++ 12 files changed, 303 insertions(+), 289 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl index 664b5e97e..b8a27d358 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl @@ -7,294 +7,10 @@
-
-
- {l s='Recent Activity'} - - - - - - - - -
-
-
    -
  • - - {l s='Orders'}
    - {l s='Within the last seven days'} -     - - 365
    - 0.66% -     -
    • -
-
-
-
{l s='Pending'}
-
    -
  • - {l s='Pending Orders'} - 120 -
    • -
  • - {l s='Return/Exchanges'} - 35 -
    • -
  • - {l s='Abandonned Carts'} - 12 -
    • -
  • - {l s='Products Out of Stock'} - 4 -
    • -
-
-
-
{l s='Notification'}
-
    -
  • - {l s='New Messages'} - 42 -
    • -
  • - {l s='Order Inquires'} - 13 -
    • -
  • - {l s='Product Reviews'} - 56 -
    • -
-
-
-
{l s='Customers'}
-
    -
  • - {l s='New Customers'} - 42 -
    • -
  • - {l s='Online Visitor'} - 200 -
    • -
  • - - {l s='Active Shopping Carts'} -
    - {l s='In the last 30 minutes'} -     -     - 36 -
    • -
-
-
-
{l s='Newsletter'}
-
    -
  • - {l s='New Registrations'} - 125 -
    • -
  • - {l s='Total Subscribers'} - 13,500 -
    • -
-
-
-
{l s='Traffic'}
-
    -
  • - {l s='Visits'} - 10,000 -
    • -
  • - {l s='Unique Visitors'} - 3,500 -
    • -
  • - {l s='Traffic Sources'} -
      -
    • - {l s='Direct Link'} - 120 -
      • -
    • - google.com - 75 -
      • -
    • - facebook.com - 32 -
      • -
    -
    - -
    -
    • -
-
-
+ {$hookDashboardZoneOne}
-
- - - -
-
- {l s='Product and Sales'} - - - - - - - - -
- - - -

Last 10 orders: Overall | Pending

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CustomerProductsTotalDate
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
-
+ {$hookDashboardZoneOne}
diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php index 4c9c2dd92..91c94841b 100644 --- a/controllers/admin/AdminDashboardController.php +++ b/controllers/admin/AdminDashboardController.php @@ -46,4 +46,13 @@ class AdminDashboardControllerCore extends AdminController __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/nv.d3.css' )); } + + public function renderView() + { + $this->tpl_view_vars = array( + 'hookDashboardZoneOne' => Hook::exec('dashboardZoneOne'), + 'hookDashboardZoneTwo' => Hook::exec('dashboardZoneTwo'), + ); + return parent::renderView(); + } } \ No newline at end of file diff --git a/install-dev/models/install.php b/install-dev/models/install.php index ac7965719..cb5163b8d 100644 --- a/install-dev/models/install.php +++ b/install-dev/models/install.php @@ -550,6 +550,9 @@ class InstallModelInstall extends InstallAbstractModel 'blockuserinfo', 'blockviewed', 'cheque', + 'dashactivity', + 'dashproducts', + 'dashtrends', 'favoriteproducts', 'graphartichow', 'graphgooglechart', diff --git a/modules/dashactivity/config.xml b/modules/dashactivity/config.xml index 19950fa95..4f3441372 100644 --- a/modules/dashactivity/config.xml +++ b/modules/dashactivity/config.xml @@ -1,7 +1,7 @@ dashactivity - + diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php index 6d3dcdbe3..ffb2981da 100644 --- a/modules/dashactivity/dashactivity.php +++ b/modules/dashactivity/dashactivity.php @@ -32,6 +32,7 @@ class Dashactivity extends Module public function __construct() { $this->name = 'dashactivity'; + $this->displayName = 'Dashboard Activity'; $this->tab = ''; $this->version = '0.1'; $this->author = 'PrestaShop'; diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl index 5e593ebe6..5f01bf973 100644 --- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl +++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl @@ -23,3 +23,136 @@ * International Registered Trademark & Property of PrestaShop SA *} +
+
+ {l s='Recent Activity'} + + + + + + + + +
+
+
    +
  • + + {l s='Orders'}
    + {l s='Within the last seven days'} +     + + 365
    + 0.66% +     +
    • +
+
+
+
{l s='Pending'}
+
    +
  • + {l s='Pending Orders'} + 120 +
    • +
  • + {l s='Return/Exchanges'} + 35 +
    • +
  • + {l s='Abandonned Carts'} + 12 +
    • +
  • + {l s='Products Out of Stock'} + 4 +
    • +
+
+
+
{l s='Notification'}
+
    +
  • + {l s='New Messages'} + 42 +
    • +
  • + {l s='Order Inquires'} + 13 +
    • +
  • + {l s='Product Reviews'} + 56 +
    • +
+
+
+
{l s='Customers'}
+
    +
  • + {l s='New Customers'} + 42 +
    • +
  • + {l s='Online Visitor'} + 200 +
    • +
  • + + {l s='Active Shopping Carts'} +
    + {l s='In the last 30 minutes'} +     +     + 36 +
    • +
+
+
+
{l s='Newsletter'}
+
    +
  • + {l s='New Registrations'} + 125 +
    • +
  • + {l s='Total Subscribers'} + 13,500 +
    • +
+
+
+
{l s='Traffic'}
+
    +
  • + {l s='Visits'} + 10,000 +
    • +
  • + {l s='Unique Visitors'} + 3,500 +
    • +
  • + {l s='Traffic Sources'} +
      +
    • + {l s='Direct Link'} + 120 +
      • +
    • + google.com + 75 +
      • +
    • + facebook.com + 32 +
      • +
    +
    + +
    +
    • +
+
+
diff --git a/modules/dashproducts/config.xml b/modules/dashproducts/config.xml index 688f0637f..f254ad48e 100644 --- a/modules/dashproducts/config.xml +++ b/modules/dashproducts/config.xml @@ -1,7 +1,7 @@ dashproducts - + diff --git a/modules/dashproducts/dashproducts.php b/modules/dashproducts/dashproducts.php index 0f89b19e3..faf139078 100644 --- a/modules/dashproducts/dashproducts.php +++ b/modules/dashproducts/dashproducts.php @@ -32,6 +32,7 @@ class Dashproducts extends Module public function __construct() { $this->name = 'dashproducts'; + $this->displayName = 'Dashboard Products'; $this->tab = ''; $this->version = '0.1'; $this->author = 'PrestaShop'; diff --git a/modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl b/modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl index 5e593ebe6..f79332e87 100644 --- a/modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl +++ b/modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl @@ -23,3 +23,103 @@ * International Registered Trademark & Property of PrestaShop SA *} +
+
+ {l s='Product and Sales'} + + + + + + + + +
+ + + +

Last 10 orders: Overall | Pending

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CustomerProductsTotalDate
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
John Smith10$1200July 8th, 2013 // 10:42 am Today
+
\ No newline at end of file diff --git a/modules/dashtrends/config.xml b/modules/dashtrends/config.xml index 522d89688..4469dd7da 100644 --- a/modules/dashtrends/config.xml +++ b/modules/dashtrends/config.xml @@ -1,7 +1,7 @@ dashtrends - + diff --git a/modules/dashtrends/dashtrends.php b/modules/dashtrends/dashtrends.php index 8de54688b..5be43735b 100644 --- a/modules/dashtrends/dashtrends.php +++ b/modules/dashtrends/dashtrends.php @@ -32,6 +32,7 @@ class Dashtrends extends Module public function __construct() { $this->name = 'dashtrends'; + $this->displayName = 'Dashboard Trends'; $this->tab = ''; $this->version = '0.1'; $this->author = 'PrestaShop'; diff --git a/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl b/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl index 5e593ebe6..1d66d642f 100644 --- a/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl +++ b/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl @@ -23,3 +23,53 @@ * International Registered Trademark & Property of PrestaShop SA *} + \ No newline at end of file